From 338e705db764ef2d69d389081a82e7e297bffbc6 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 9 Sep 2018 09:44:27 +1200 Subject: [PATCH 01/26] Upgrade elastic search gems --- Gemfile | 6 +++--- Gemfile.lock | 23 +++++++++++------------ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Gemfile b/Gemfile index c55d5e70f..fe88dd742 100644 --- a/Gemfile +++ b/Gemfile @@ -86,9 +86,9 @@ gem "chartkick" # Project does not use semver, so we want to be in sync with the version of # elasticsearch we use # See https://github.com/elastic/elasticsearch-ruby#compatibility -gem "elasticsearch-api", "~> 2.0.0" -gem "elasticsearch-model", ">= 5.0.0" -gem "elasticsearch-rails", ">= 5.0.0" +gem "elasticsearch-api", ">= 6.0.0" +gem "elasticsearch-model", ">= 6.0.0" +gem "elasticsearch-rails", ">= 6.0.0" gem "hashie", ">= 3.5.3" gem 'rake', '>= 10.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 845f43e44..305bdb6f4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -147,17 +147,17 @@ GEM easy_translate (0.5.1) thread thread_safe - elasticsearch (2.0.2) - elasticsearch-api (= 2.0.2) - elasticsearch-transport (= 2.0.2) - elasticsearch-api (2.0.2) + elasticsearch (6.1.0) + elasticsearch-api (= 6.1.0) + elasticsearch-transport (= 6.1.0) + elasticsearch-api (6.1.0) multi_json - elasticsearch-model (5.0.0) + elasticsearch-model (6.0.0) activesupport (> 3) elasticsearch (> 1) hashie - elasticsearch-rails (5.0.2) - elasticsearch-transport (2.0.2) + elasticsearch-rails (6.0.0) + elasticsearch-transport (6.1.0) faraday multi_json erubis (2.7.0) @@ -561,9 +561,9 @@ DEPENDENCIES dalli database_cleaner devise - elasticsearch-api (~> 2.0.0) - elasticsearch-model (>= 5.0.0) - elasticsearch-rails (>= 5.0.0) + elasticsearch-api (>= 6.0.0) + elasticsearch-model (>= 6.0.0) + elasticsearch-rails (>= 6.0.0) factory_bot_rails faker figaro @@ -622,9 +622,8 @@ DEPENDENCIES will_paginate xmlrpc - RUBY VERSION ruby 2.4.1p111 BUNDLED WITH - 1.16.1 + 1.16.4 From d629203570ef33c7c559b2e394949ea5ecb5bab7 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 9 Sep 2018 09:44:43 +1200 Subject: [PATCH 02/26] Remove custom elastic search installer in travis --- .travis.yml | 4 ++-- script/install_elasticsearch.sh | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100755 script/install_elasticsearch.sh diff --git a/.travis.yml b/.travis.yml index 323d3a097..96cb81b39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ sudo: required language: ruby +services: + - elasticsearch cache: bundler: true directories: @@ -19,8 +21,6 @@ before_install: - export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH - ./script/install_codeclimate.sh - ./script/install_linters.sh - # Force Travis to use Elastic Search 2.4.0 - - ./script/install_elasticsearch.sh script: - set -e - > diff --git a/script/install_elasticsearch.sh b/script/install_elasticsearch.sh deleted file mode 100755 index 1543a71bc..000000000 --- a/script/install_elasticsearch.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -if [ "${GROWSTUFF_ELASTICSEARCH}" = "true" ]; then - set -euv - sudo dpkg -r elasticsearch - curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.4.0/elasticsearch-2.4.0.deb - sudo dpkg -i --force-confnew elasticsearch-2.4.0.deb - sudo service elasticsearch start - sleep 10 - curl -v localhost:9200 -fi \ No newline at end of file From f69f0861d2fb58beb3ab41a52065c58dc2ddf9fb Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 9 Sep 2018 09:55:43 +1200 Subject: [PATCH 03/26] Style fix up --- spec/factories/member.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/factories/member.rb b/spec/factories/member.rb index 828c2f5aa..70aaaaab8 100644 --- a/spec/factories/member.rb +++ b/spec/factories/member.rb @@ -55,8 +55,8 @@ FactoryBot.define do factory :south_pole_member do sequence(:login_name) { |n| "ScottRF#{n}" } location 'Amundsen-Scott Base, Antarctica' - latitude -90 - longitude 0 + latitude { -90 } + longitude { 0 } end factory :admin_member do From 5563b183dca7a0d6068b29456fda39230acb555d Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 9 Sep 2018 10:52:20 +1200 Subject: [PATCH 04/26] Revert "Remove custom elastic search installer in travis" This reverts commit d629203570ef33c7c559b2e394949ea5ecb5bab7. --- .travis.yml | 4 ++-- script/install_elasticsearch.sh | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100755 script/install_elasticsearch.sh diff --git a/.travis.yml b/.travis.yml index 96cb81b39..323d3a097 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ sudo: required language: ruby -services: - - elasticsearch cache: bundler: true directories: @@ -21,6 +19,8 @@ before_install: - export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH - ./script/install_codeclimate.sh - ./script/install_linters.sh + # Force Travis to use Elastic Search 2.4.0 + - ./script/install_elasticsearch.sh script: - set -e - > diff --git a/script/install_elasticsearch.sh b/script/install_elasticsearch.sh new file mode 100755 index 000000000..1543a71bc --- /dev/null +++ b/script/install_elasticsearch.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +if [ "${GROWSTUFF_ELASTICSEARCH}" = "true" ]; then + set -euv + sudo dpkg -r elasticsearch + curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.4.0/elasticsearch-2.4.0.deb + sudo dpkg -i --force-confnew elasticsearch-2.4.0.deb + sudo service elasticsearch start + sleep 10 + curl -v localhost:9200 +fi \ No newline at end of file From a05152335471a3b5193a31393b904dbd0ee9ebc9 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 9 Sep 2018 10:56:21 +1200 Subject: [PATCH 05/26] Upgrade to elasticsearch 6.2.3 --- script/install_elasticsearch.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/script/install_elasticsearch.sh b/script/install_elasticsearch.sh index 1543a71bc..2b1926aea 100755 --- a/script/install_elasticsearch.sh +++ b/script/install_elasticsearch.sh @@ -1,10 +1,14 @@ #!/bin/bash if [ "${GROWSTUFF_ELASTICSEARCH}" = "true" ]; then + VERSION="6.2.3" set -euv sudo dpkg -r elasticsearch - curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.4.0/elasticsearch-2.4.0.deb - sudo dpkg -i --force-confnew elasticsearch-2.4.0.deb + wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${VERSION}.deb + wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${VERSION}.deb.sha512 + shasum -a 512 -c elasticsearch-${VERSION}.deb.sha512 + sudo dpkg -i elasticsearch-${VERSION}.deb + sudo service elasticsearch start sleep 10 curl -v localhost:9200 From 53b08422ce697fef581d11284d9c740a47a62060 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 9 Sep 2018 11:08:34 +1200 Subject: [PATCH 06/26] Force new config when installing elasticsearch --- script/install_elasticsearch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/install_elasticsearch.sh b/script/install_elasticsearch.sh index 2b1926aea..70a2ef1ed 100755 --- a/script/install_elasticsearch.sh +++ b/script/install_elasticsearch.sh @@ -7,7 +7,7 @@ if [ "${GROWSTUFF_ELASTICSEARCH}" = "true" ]; then wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${VERSION}.deb wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${VERSION}.deb.sha512 shasum -a 512 -c elasticsearch-${VERSION}.deb.sha512 - sudo dpkg -i elasticsearch-${VERSION}.deb + sudo dpkg -i --force-confnew elasticsearch-${VERSION}.deb sudo service elasticsearch start sleep 10 From ea1fb90279de6e317943bb808798a796133a50ca Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 9 Sep 2018 11:55:19 +1200 Subject: [PATCH 07/26] Create the search index --- .travis.yml | 2 +- lib/tasks/search.rake | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 lib/tasks/search.rake diff --git a/.travis.yml b/.travis.yml index 323d3a097..1194ab1e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,8 @@ before_install: - export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH - ./script/install_codeclimate.sh - ./script/install_linters.sh - # Force Travis to use Elastic Search 2.4.0 - ./script/install_elasticsearch.sh + - RAILS_ENV=test bundle exec rake search:create script: - set -e - > diff --git a/lib/tasks/search.rake b/lib/tasks/search.rake new file mode 100644 index 000000000..00e377688 --- /dev/null +++ b/lib/tasks/search.rake @@ -0,0 +1,7 @@ + +namespace :search do + desc "Create elastic search index" + task create: :environment do + Crop.__elasticsearch__.create_index! force: true + end +end From 7197843ac37fe92f5407623fa8aeaa795b9b396c Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 9 Sep 2018 11:56:37 +1200 Subject: [PATCH 08/26] Reindex elasticsearch rake task --- lib/tasks/search.rake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/tasks/search.rake b/lib/tasks/search.rake index 00e377688..6831efc18 100644 --- a/lib/tasks/search.rake +++ b/lib/tasks/search.rake @@ -4,4 +4,9 @@ namespace :search do task create: :environment do Crop.__elasticsearch__.create_index! force: true end + + desc 'Refresh elastic search index' + task refresh: :environment do + Crop.__elasticsearch__.refresh_index! + end end From 835e277f49b0721962f990c4a4c9b319affc3f32 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 9 Sep 2018 11:58:43 +1200 Subject: [PATCH 09/26] whitepace fix up --- lib/tasks/search.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/search.rake b/lib/tasks/search.rake index 6831efc18..09eec632e 100644 --- a/lib/tasks/search.rake +++ b/lib/tasks/search.rake @@ -7,6 +7,6 @@ namespace :search do desc 'Refresh elastic search index' task refresh: :environment do - Crop.__elasticsearch__.refresh_index! + Crop.__elasticsearch__.refresh_index! end end From a326f92210e71d4a8afe18bd3c72d2cdb8618309 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 9 Sep 2018 11:59:50 +1200 Subject: [PATCH 10/26] Move elastic search index create to same line as db:create --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1194ab1e1..179b4ca66 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,6 @@ before_install: - ./script/install_codeclimate.sh - ./script/install_linters.sh - ./script/install_elasticsearch.sh - - RAILS_ENV=test bundle exec rake search:create script: - set -e - > @@ -28,7 +27,7 @@ script: ./script/check_static.rb else set +e; - RAILS_ENV=test bundle exec rake db:create db:migrate; + RAILS_ENV=test bundle exec rake db:create db:migrate search:create; bundle exec rake assets:precompile; bundle exec rspec --tag $RSPEC_TAG spec/; fi; From 4867c68984b41ae28ae500e05ed29fa188ef4369 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 9 Sep 2018 12:11:10 +1200 Subject: [PATCH 11/26] Added stdout print when creating/refreshing elasticsearch index --- lib/tasks/search.rake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/tasks/search.rake b/lib/tasks/search.rake index 09eec632e..e0280b6ad 100644 --- a/lib/tasks/search.rake +++ b/lib/tasks/search.rake @@ -2,11 +2,11 @@ namespace :search do desc "Create elastic search index" task create: :environment do - Crop.__elasticsearch__.create_index! force: true + puts Crop.__elasticsearch__.create_index! force: true end desc 'Refresh elastic search index' task refresh: :environment do - Crop.__elasticsearch__.refresh_index! + puts Crop.__elasticsearch__.refresh_index! end end From 27c4dbedf220f2a5212cd73bf84b9f5f75227bbd Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 9 Sep 2018 12:18:50 +1200 Subject: [PATCH 12/26] Elasticsearch has dropped the string type and is now using text --- app/models/crop.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/crop.rb b/app/models/crop.rb index b1d492353..9710952a0 100644 --- a/app/models/crop.rb +++ b/app/models/crop.rb @@ -78,18 +78,18 @@ class Crop < ActiveRecord::Base } do mappings dynamic: 'false' do indexes :id, type: 'long' - indexes :name, type: 'string', analyzer: 'gs_edgeNGram_analyzer' - indexes :approval_status, type: 'string' + indexes :name, type: 'text', analyzer: 'gs_edgeNGram_analyzer' + indexes :approval_status, type: 'text' indexes :scientific_names do indexes :name, - type: 'string', + type: 'text', analyzer: 'gs_edgeNGram_analyzer', # Disabling field-length norm (norm). If the norm option is turned on(by default), # higher weigh would be given for shorter fields, which in our case is irrelevant. norms: { enabled: false } end indexes :alternate_names do - indexes :name, type: 'string', analyzer: 'gs_edgeNGram_analyzer' + indexes :name, type: 'text', analyzer: 'gs_edgeNGram_analyzer' end end end From 913ac451279d5b39f66e9c138033dcaae66a7ecc Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 9 Sep 2018 12:40:40 +1200 Subject: [PATCH 13/26] Changed query syntax for elasticsearch --- app/services/crop_search_service.rb | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/app/services/crop_search_service.rb b/app/services/crop_search_service.rb index af6085737..b63076375 100644 --- a/app/services/crop_search_service.rb +++ b/app/services/crop_search_service.rb @@ -3,21 +3,19 @@ class CropSearchService def self.search(query) if ENV['GROWSTUFF_ELASTICSEARCH'] == "true" search_str = query.nil? ? "" : query.downcase - response = Crop.__elasticsearch__.search( # Finds documents which match any field, but uses the _score from - # the best field insead of adding up _score from each field. + response = Crop.__elasticsearch__.search( query: { - multi_match: { - query: search_str.to_s, - analyzer: "standard", - fields: ["name", - "scientific_names.scientific_name", - "alternate_names.name"] - } + bool: { + filter: { + term: {"approval_status" => "approved"} + }, + must: { + query_string: { + query: "*#{search_str}*" + } + } + }, }, - filter: { - term: { approval_status: "approved" } - }, - size: 50 ) response.records.to_a else From 857c9e9d7a0f4d958d851013df2bf380c6f58488 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 9 Sep 2018 12:44:52 +1200 Subject: [PATCH 14/26] whitespace fixups --- app/services/crop_search_service.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/services/crop_search_service.rb b/app/services/crop_search_service.rb index b63076375..fb7716019 100644 --- a/app/services/crop_search_service.rb +++ b/app/services/crop_search_service.rb @@ -7,15 +7,15 @@ class CropSearchService query: { bool: { filter: { - term: {"approval_status" => "approved"} + term: { "approval_status" => "approved" } }, must: { query_string: { query: "*#{search_str}*" } } - }, - }, + } + } ) response.records.to_a else From d0b785bcd37563e3edf3632703464400863e0794 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 9 Sep 2018 13:33:20 +1200 Subject: [PATCH 15/26] Pass elasticsearch version from travis.yaml --- .travis.yml | 2 +- script/install_elasticsearch.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 179b4ca66..638e1dbbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ before_install: - export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH - ./script/install_codeclimate.sh - ./script/install_linters.sh - - ./script/install_elasticsearch.sh + - VERSION="6.2.3" ./script/install_elasticsearch.sh script: - set -e - > diff --git a/script/install_elasticsearch.sh b/script/install_elasticsearch.sh index 70a2ef1ed..59a988fac 100755 --- a/script/install_elasticsearch.sh +++ b/script/install_elasticsearch.sh @@ -1,7 +1,7 @@ #!/bin/bash if [ "${GROWSTUFF_ELASTICSEARCH}" = "true" ]; then - VERSION="6.2.3" + [[ -z "$VERSION" ]] && VERSION="6.2.3" set -euv sudo dpkg -r elasticsearch wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${VERSION}.deb From 612bfcffcbf274dc98b661caa6fbc1d090720b8f Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 9 Sep 2018 13:48:17 +1200 Subject: [PATCH 16/26] Adding codeclimate to env --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 638e1dbbe..48e345245 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,9 @@ env: - GROWSTUFF_ELASTICSEARCH=false RSPEC_TAG=~elasticsearch COVERAGE=false - STATIC_CHECKS=true global: + - secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4=" - GROWSTUFF_SITE_NAME="Growstuff (travis)" - RAILS_SECRET_TOKEN='xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' - - secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4=" before_install: - ./script/install_phantomjs.sh - export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH From 03837e193ea9745f31c66be41d868a8ca2c02f14 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 9 Sep 2018 14:23:34 +1200 Subject: [PATCH 17/26] Test coverage --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 48e345245..cf2a27a7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,11 @@ before_install: - ./script/install_codeclimate.sh - ./script/install_linters.sh - VERSION="6.2.3" ./script/install_elasticsearch.sh +before_script: + - > + if [ "${COVERAGE}" = "true" ]; then + ./cc-test-reporter before-build + fi script: - set -e - > From 4ec327f705445b2456c7d9712cc428e3c33ba8c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Sun, 9 Sep 2018 08:35:44 +0000 Subject: [PATCH 18/26] [Security] Bump rubyzip from 1.2.1 to 1.2.2 Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.1 to 1.2.2. **This update includes security fixes.** - [Release notes](https://github.com/rubyzip/rubyzip/releases) - [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md) - [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.1...v1.2.2) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 305bdb6f4..00f381168 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -454,7 +454,7 @@ GEM ruby_dep (1.5.0) ruby_parser (3.11.0) sexp_processor (~> 4.9) - rubyzip (1.2.1) + rubyzip (1.2.2) sass (3.5.6) sass-listen (~> 4.0.0) sass-listen (4.0.0) From 31744491ea46d1ca57a3dccd27c532101bf2464a Mon Sep 17 00:00:00 2001 From: Awesome Code Date: Sun, 9 Sep 2018 21:53:57 +0000 Subject: [PATCH 19/26] Auto corrected by following Ruby FactoryBot/AttributeDefinedStatically --- spec/factories/alternate_names.rb | 4 +-- spec/factories/authentications.rb | 12 +++---- spec/factories/crop.rb | 52 ++++++++++++++--------------- spec/factories/forums.rb | 4 +-- spec/factories/garden.rb | 16 ++++----- spec/factories/harvests.rb | 16 ++++----- spec/factories/member.rb | 54 +++++++++++++++---------------- spec/factories/notifications.rb | 6 ++-- spec/factories/photos.rb | 10 +++--- spec/factories/planting.rb | 22 ++++++------- spec/factories/post.rb | 8 ++--- spec/factories/roles.rb | 10 +++--- spec/factories/scientific_name.rb | 6 ++-- spec/factories/seeds.rb | 30 ++++++++--------- 14 files changed, 125 insertions(+), 125 deletions(-) diff --git a/spec/factories/alternate_names.rb b/spec/factories/alternate_names.rb index 32c609cc3..44cee8a21 100644 --- a/spec/factories/alternate_names.rb +++ b/spec/factories/alternate_names.rb @@ -2,13 +2,13 @@ FactoryBot.define do factory :alternate_name do - name "alternate name" + name { "alternate name" } crop creator factory :alternate_eggplant do association :crop, factory: :eggplant - name "aubergine" + name { "aubergine" } end end end diff --git a/spec/factories/authentications.rb b/spec/factories/authentications.rb index 0f385f680..97a34f6c4 100644 --- a/spec/factories/authentications.rb +++ b/spec/factories/authentications.rb @@ -3,14 +3,14 @@ FactoryBot.define do factory :authentication do member - provider 'twitter' - uid 'foo' - secret 'bar' - name 'baz' + provider { 'twitter' } + uid { 'foo' } + secret { 'bar' } + name { 'baz' } factory :flickr_authentication do - provider 'flickr' - uid 'blah@blah' + provider { 'flickr' } + uid { 'blah@blah' } end end end diff --git a/spec/factories/crop.rb b/spec/factories/crop.rb index 2a8c6b656..b1c23a95b 100644 --- a/spec/factories/crop.rb +++ b/spec/factories/crop.rb @@ -1,83 +1,83 @@ FactoryBot.define do factory :crop do - name "magic bean" - en_wikipedia_url "http://en.wikipedia.org/wiki/Magic_bean" - approval_status "approved" + name { "magic bean" } + en_wikipedia_url { "http://en.wikipedia.org/wiki/Magic_bean" } + approval_status { "approved" } creator factory :annual_crop, parent: :crop do - perennial false + perennial { false } end factory :perennial_crop, parent: :crop do - perennial true + perennial { true } end factory :tomato do - name "tomato" - en_wikipedia_url "http://en.wikipedia.org/wiki/Tomato" + name { "tomato" } + en_wikipedia_url { "http://en.wikipedia.org/wiki/Tomato" } end factory :maize do - name "maize" - en_wikipedia_url "http://en.wikipedia.org/wiki/Maize" + name { "maize" } + en_wikipedia_url { "http://en.wikipedia.org/wiki/Maize" } end factory :chard do - name "chard" + name { "chard" } end factory :walnut do - name "walnut" + name { "walnut" } end factory :apple do - name "apple" + name { "apple" } end factory :pear do - name "pear" + name { "pear" } end # for testing varieties factory :roma do - name "roma tomato" + name { "roma tomato" } end factory :popcorn do - name "popcorn" + name { "popcorn" } end factory :eggplant do - name "eggplant" + name { "eggplant" } end # This should have a name that is alphabetically earlier than :uppercase # crop to ensure that the ordering tests work. factory :lowercasecrop do - name "ffrench bean" + name { "ffrench bean" } end factory :uppercasecrop do - name "Swiss chard" + name { "Swiss chard" } end factory :autoloaded_crop do - creator "cropbot" + creator { "cropbot" } end # for testing crop request factory :crop_request do - name "Ultra berry" - en_wikipedia_url "" - approval_status "pending" + name { "Ultra berry" } + en_wikipedia_url { "" } + approval_status { "pending" } association :requester, factory: :member - request_notes "Please approve this even though it's fake." + request_notes { "Please approve this even though it's fake." } end factory :rejected_crop do - name "Fail bean" - approval_status "rejected" - reason_for_rejection "Totally fake" + name { "Fail bean" } + approval_status { "rejected" } + reason_for_rejection { "Totally fake" } end end end diff --git a/spec/factories/forums.rb b/spec/factories/forums.rb index 5636981fb..ba1e6cf82 100644 --- a/spec/factories/forums.rb +++ b/spec/factories/forums.rb @@ -2,8 +2,8 @@ FactoryBot.define do factory :forum do - name "Permaculture" - description "*Everything* about permaculture!" + name { "Permaculture" } + description { "*Everything* about permaculture!" } owner end end diff --git a/spec/factories/garden.rb b/spec/factories/garden.rb index f93107361..d11dcd0d7 100644 --- a/spec/factories/garden.rb +++ b/spec/factories/garden.rb @@ -1,24 +1,24 @@ FactoryBot.define do factory :garden do name { Faker::Vehicle.vin } - description "This is a **totally** cool garden" + description { "This is a **totally** cool garden" } owner - active true - area 23 - area_unit "acre" - location "Greenwich, UK" + active { true } + area { 23 } + area_unit { "acre" } + location { "Greenwich, UK" } factory :inactive_garden do - active false + active { false } end # the following are used for testing alphabetical ordering factory :garden_a do - name 'A garden starting with A' + name { 'A garden starting with A' } end factory :garden_z do - name 'Zzzz this garden makes me sleepy' + name { 'Zzzz this garden makes me sleepy' } end end end diff --git a/spec/factories/harvests.rb b/spec/factories/harvests.rb index 7ed88375a..426c3d24c 100644 --- a/spec/factories/harvests.rb +++ b/spec/factories/harvests.rb @@ -4,14 +4,14 @@ FactoryBot.define do factory :harvest do crop { planting.present? ? planting.crop : FactoryBot.create(:crop) } plant_part { FactoryBot.create :plant_part } - planting nil + planting { nil } owner { planting.present? ? planting.owner : FactoryBot.create(:member) } harvested_at { Time.zone.local(2015, 9, 17) } - quantity "3" - unit "individual" - weight_quantity 6 - weight_unit "kg" - description "A lovely harvest" + quantity { "3" } + unit { "individual" } + weight_quantity { 6 } + weight_unit { "kg" } + description { "A lovely harvest" } factory :harvest_with_planting do planting @@ -19,10 +19,10 @@ FactoryBot.define do end trait :long_description do - description "This is a very long description that is so very long that it will need to be cut off" + description { "This is a very long description that is so very long that it will need to be cut off" } end trait :no_description do - description "" + description { "" } end end diff --git a/spec/factories/member.rb b/spec/factories/member.rb index 70aaaaab8..295d1a408 100644 --- a/spec/factories/member.rb +++ b/spec/factories/member.rb @@ -4,57 +4,57 @@ FactoryBot.define do factory :member, aliases: %i(author owner sender recipient creator) do login_name { generate(:login_name) } - password 'password1' + password { 'password1' } email { generate(:email) } - tos_agreement true + tos_agreement { true } confirmed_at { Time.now } - show_email false - bio 'I love seeds' + show_email { false } + bio { 'I love seeds' } # cropbot is needed for certain tests, eg. Crop.create_from_csv factory :cropbot do - login_name 'cropbot' + login_name { 'cropbot' } end factory :no_tos_member do - tos_agreement false + tos_agreement { false } end factory :newsletter_recipient_member do - newsletter true + newsletter { true } end factory :no_bio_member do - bio nil + bio { nil } end factory :unconfirmed_member do - confirmed_at nil + confirmed_at { nil } end # this member has very loose privacy settings factory :public_member do - login_name 'NothingToHide' - show_email true + login_name { 'NothingToHide' } + show_email { true } end factory :london_member do sequence(:login_name) { |n| "JohnH#{n}" } # for the astronomer who figured out longitude - location 'Greenwich, UK' + location { 'Greenwich, UK' } # including lat/long explicitly because geocoder doesn't work with FG - latitude 51.483 - longitude 0.004 + latitude { 51.483 } + longitude { 0.004 } end factory :edinburgh_member do - location 'Edinburgh' - latitude 55.953252 - longitude -3.188267 + location { 'Edinburgh' } + latitude { 55.953252 } + longitude { -3.188267 } end factory :south_pole_member do sequence(:login_name) { |n| "ScottRF#{n}" } - location 'Amundsen-Scott Base, Antarctica' + location { 'Amundsen-Scott Base, Antarctica' } latitude { -90 } longitude { 0 } end @@ -69,39 +69,39 @@ FactoryBot.define do end factory :invalid_member_shortname do - login_name 'a' + login_name { 'a' } end factory :invalid_member_longname do - login_name 'MarmadukeBlundellHollinsheadBlundellTolemachePlantagenetWhistlebinkie3rdDukeofMarmoset' + login_name { 'MarmadukeBlundellHollinsheadBlundellTolemachePlantagenetWhistlebinkie3rdDukeofMarmoset' } end factory :invalid_member_spaces do - login_name "a b" + login_name { "a b" } end factory :invalid_member_badchars do - login_name 'aa%$' + login_name { 'aa%$' } end factory :invalid_member_badname do - login_name 'admin' + login_name { 'admin' } end factory :valid_member_alphanumeric do - login_name 'abc123' + login_name { 'abc123' } end factory :valid_member_uppercase do - login_name 'ABC123' + login_name { 'ABC123' } end factory :valid_member_underscore do - login_name 'abc_123' + login_name { 'abc_123' } end factory :no_email_notifications_member do - send_notification_email false + send_notification_email { false } end end end diff --git a/spec/factories/notifications.rb b/spec/factories/notifications.rb index b893fcc1b..7903035d2 100644 --- a/spec/factories/notifications.rb +++ b/spec/factories/notifications.rb @@ -4,9 +4,9 @@ FactoryBot.define do factory :notification, aliases: [:message] do sender recipient - subject "MyString" - body "MyText" - read false + subject { "MyString" } + body { "MyText" } + read { false } post factory :no_email_notification do diff --git a/spec/factories/photos.rb b/spec/factories/photos.rb index 455d721c7..5d3ef467c 100644 --- a/spec/factories/photos.rb +++ b/spec/factories/photos.rb @@ -3,17 +3,17 @@ FactoryBot.define do factory :photo do owner - flickr_photo_id 1 + flickr_photo_id { 1 } title { Faker::HarryPotter.quote } - license_name "CC-BY" - license_url "http://example.com/license.html" + license_name { "CC-BY" } + license_url { "http://example.com/license.html" } thumbnail_url { "http://example.com/#{Faker::File.file_name}.jpg" } fullsize_url { "http://example.com/#{Faker::File.file_name}.jpg" } link_url { Faker::Internet.url } factory :unlicensed_photo do - license_name "All rights reserved" - license_url "" + license_name { "All rights reserved" } + license_url { "" } end end end diff --git a/spec/factories/planting.rb b/spec/factories/planting.rb index 27a2b179d..24c092f82 100644 --- a/spec/factories/planting.rb +++ b/spec/factories/planting.rb @@ -4,37 +4,37 @@ FactoryBot.define do garden { FactoryBot.create :garden, owner: owner } crop planted_at { Time.zone.local(2014, 7, 30) } - quantity 33 - description "This is a *really* good plant." - finished false - finished_at nil + quantity { 33 } + description { "This is a *really* good plant." } + finished { false } + finished_at { nil } factory :seed_planting do - planted_from 'seed' + planted_from { 'seed' } end factory :seedling_planting do - planted_from 'seedling' + planted_from { 'seedling' } end factory :cutting_planting do - planted_from 'cutting' + planted_from { 'cutting' } end factory :sunny_planting do - sunniness 'sun' + sunniness { 'sun' } end factory :semi_shady_planting do - sunniness 'semi-shade' + sunniness { 'semi-shade' } end factory :shady_planting do - sunniness 'shade' + sunniness { 'shade' } end factory :finished_planting do - finished true + finished { true } planted_at { Time.zone.local(2014, 7, 30) } finished_at { Time.zone.local(2014, 8, 30) } end diff --git a/spec/factories/post.rb b/spec/factories/post.rb index da6390ef8..6a955b95a 100644 --- a/spec/factories/post.rb +++ b/spec/factories/post.rb @@ -1,18 +1,18 @@ FactoryBot.define do factory :post do - subject "A Post" - body "This is some text." + subject { "A Post" } + body { "This is some text." } author created_at { Time.now } # Markdown is allowed in posts factory :markdown_post do - body "This is some **strong** text." + body { "This is some **strong** text." } end # HTML isn't allowed in posts factory :html_post do - body 'EVIL' + body { 'EVIL' } end factory :forum_post do diff --git a/spec/factories/roles.rb b/spec/factories/roles.rb index fed5e5e00..3e33d9720 100644 --- a/spec/factories/roles.rb +++ b/spec/factories/roles.rb @@ -2,17 +2,17 @@ FactoryBot.define do factory :role do - name "Moderator" - description "These people moderate the forums" + name { "Moderator" } + description { "These people moderate the forums" } initialize_with { Role.find_or_create_by(name: name) } factory :admin do - name "admin" + name { "admin" } end factory :crop_wrangler do - name "Crop Wrangler" - description "they wrangle crops" + name { "Crop Wrangler" } + description { "they wrangle crops" } end end end diff --git a/spec/factories/scientific_name.rb b/spec/factories/scientific_name.rb index aa0911504..7e0e04462 100644 --- a/spec/factories/scientific_name.rb +++ b/spec/factories/scientific_name.rb @@ -1,17 +1,17 @@ FactoryBot.define do factory :scientific_name do association :crop, factory: :crop - name "Beanus Magicus" + name { "Beanus Magicus" } creator factory :zea_mays do association :crop, factory: :maize - name "Zea mays" + name { "Zea mays" } end factory :solanum_lycopersicum do association :crop, factory: :tomato - name "Solanum lycopersicum" + name { "Solanum lycopersicum" } end end end diff --git a/spec/factories/seeds.rb b/spec/factories/seeds.rb index b58193671..2f5238591 100644 --- a/spec/factories/seeds.rb +++ b/spec/factories/seeds.rb @@ -4,30 +4,30 @@ FactoryBot.define do factory :seed do owner crop - description "MyText" - quantity 1 - plant_before "2013-07-15" - tradable_to 'nowhere' - organic 'unknown' - gmo 'unknown' - heirloom 'unknown' - days_until_maturity_min nil - days_until_maturity_max nil - finished_at nil + description { "MyText" } + quantity { 1 } + plant_before { "2013-07-15" } + tradable_to { 'nowhere' } + organic { 'unknown' } + gmo { 'unknown' } + heirloom { 'unknown' } + days_until_maturity_min { nil } + days_until_maturity_max { nil } + finished_at { nil } factory :finished_seed do - finished true + finished { true } finished_at { Date.new } end factory :tradable_seed do - tradable_to "locally" - finished false - finished_at nil + tradable_to { "locally" } + finished { false } + finished_at { nil } end factory :untradable_seed do - tradable_to "nowhere" + tradable_to { "nowhere" } end end end From 90f4db4853d5863bfe7a7495c545d3737d981738 Mon Sep 17 00:00:00 2001 From: Awesome Code Date: Mon, 10 Sep 2018 22:20:12 +0000 Subject: [PATCH 20/26] Auto corrected by following Ruby rspec layout --- .../charts/gardens_controller_spec.rb | 5 +++++ spec/controllers/comments_controller_spec.rb | 4 ++++ spec/controllers/crops_controller_spec.rb | 4 ++++ spec/controllers/gardens_controller_spec.rb | 17 ++++++++++++++++ spec/controllers/harvests_controller_spec.rb | 9 +++++++++ spec/controllers/likes_controller_spec.rb | 2 ++ spec/controllers/photos_controller_spec.rb | 6 ++++++ spec/controllers/plantings_controller_spec.rb | 14 +++++++++++++ spec/controllers/seeds_controller_spec.rb | 3 +++ spec/factories/notifications.rb | 1 + spec/factories/post.rb | 1 + spec/features/crops/crop_detail_page_spec.rb | 5 +++++ spec/features/crops/crop_photos_spec.rb | 5 +++++ spec/features/gardens/actions_spec.rb | 9 ++++++++- spec/features/gardens/gardens_index_spec.rb | 6 ++++++ .../features/harvests/browse_harvests_spec.rb | 5 ++++- spec/features/home/home_spec.rb | 7 ++++++- spec/features/seeds/seed_photos.rb | 4 ++++ spec/helpers/application_helper_spec.rb | 5 +++++ spec/helpers/photos_helper_spec.rb | 11 ++++++++++ spec/models/crop_spec.rb | 4 ++++ spec/models/member_spec.rb | 2 ++ spec/models/planting_spec.rb | 20 +++++++++++++++++++ spec/models/role_spec.rb | 1 + spec/models/seed_spec.rb | 3 +++ spec/requests/api/v1/crop_request_spec.rb | 6 ++++++ spec/requests/api/v1/gardens_request_spec.rb | 1 + spec/requests/api/v1/harvest_request_spec.rb | 6 ++++++ spec/requests/api/v1/member_request_spec.rb | 6 ++++++ spec/requests/api/v1/photos_request_spec.rb | 6 ++++++ .../requests/api/v1/plantings_request_spec.rb | 1 + spec/requests/api/v1/seeds_request_spec.rb | 6 ++++++ .../crops/_planting_advice.html.haml_spec.rb | 5 +++++ spec/views/devise/registrations/edit_spec.rb | 4 ++++ spec/views/harvests/show.html.haml_spec.rb | 1 + spec/views/members/show.rss.haml_spec.rb | 3 ++- spec/views/photos/show.html.haml_spec.rb | 4 ++++ spec/views/posts/show.html.haml_spec.rb | 5 +++++ 38 files changed, 203 insertions(+), 4 deletions(-) diff --git a/spec/controllers/charts/gardens_controller_spec.rb b/spec/controllers/charts/gardens_controller_spec.rb index daa50a811..c42c043f0 100644 --- a/spec/controllers/charts/gardens_controller_spec.rb +++ b/spec/controllers/charts/gardens_controller_spec.rb @@ -5,18 +5,23 @@ describe Charts::GardensController do let(:valid_params) { { name: 'My second Garden' } } let(:garden) { FactoryBot.create :garden } + context "when not signed in" do describe 'GET timeline' do before { get :timeline, garden_id: garden.to_param } + it { expect(response).to be_success } end end + context "when signed in" do before(:each) { sign_in member } let!(:member) { FactoryBot.create(:member) } + describe 'GET timeline' do before { get :timeline, garden_id: garden.to_param } + it { expect(response).to be_success } end end diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb index 2d265de5f..beee82b33 100644 --- a/spec/controllers/comments_controller_spec.rb +++ b/spec/controllers/comments_controller_spec.rb @@ -2,6 +2,7 @@ require 'rails_helper' describe CommentsController do subject { response } + let(:member) { FactoryBot.create(:member) } before(:each) do @@ -20,6 +21,7 @@ describe CommentsController do describe "returns an RSS feed" do before { get :index, format: "rss" } + it { is_expected.to be_success } it { is_expected.to render_template("comments/index") } it { expect(response.content_type).to eq("application/rss+xml") } @@ -81,11 +83,13 @@ describe CommentsController do expect(response).to redirect_to(comment.post) end end + describe "not my comment" do let(:comment) { FactoryBot.create :comment } it { expect(response).not_to be_success } end + describe "attempting to change post_id" do let(:post) { FactoryBot.create :post, subject: 'our post' } let(:other_post) { FactoryBot.create :post, subject: 'the other post' } diff --git a/spec/controllers/crops_controller_spec.rb b/spec/controllers/crops_controller_spec.rb index 5b682f6c2..afdea715c 100644 --- a/spec/controllers/crops_controller_spec.rb +++ b/spec/controllers/crops_controller_spec.rb @@ -16,6 +16,7 @@ describe CropsController do describe "GET crop wrangler homepage" do describe 'fetches the crop wrangler homepage' do before { get :wrangle } + it { is_expected.to be_success } it { is_expected.to render_template("crops/wrangle") } it { expect(assigns[:crop_wranglers]).to eq(Role.crop_wranglers) } @@ -25,6 +26,7 @@ describe CropsController do describe "GET crop hierarchy " do describe 'fetches the crop hierarchy page' do before { get :hierarchy } + it { is_expected.to be_success } it { is_expected.to render_template("crops/hierarchy") } end @@ -33,6 +35,7 @@ describe CropsController do describe "GET crop search" do describe 'fetches the crop search page' do before { get :search } + it { is_expected.to be_success } it { is_expected.to render_template("crops/search") } end @@ -41,6 +44,7 @@ describe CropsController do describe "GET RSS feed" do describe "returns an RSS feed" do before { get :index, format: "rss" } + it { is_expected.to be_success } it { is_expected.to render_template("crops/index") } it { expect(response.content_type).to eq("application/rss+xml") } diff --git a/spec/controllers/gardens_controller_spec.rb b/spec/controllers/gardens_controller_spec.rb index 2e31f2d78..a5620eb01 100644 --- a/spec/controllers/gardens_controller_spec.rb +++ b/spec/controllers/gardens_controller_spec.rb @@ -5,15 +5,20 @@ RSpec.describe GardensController, type: :controller do let(:valid_params) { { name: 'My second Garden' } } let(:garden) { FactoryBot.create :garden } + context "when not signed in" do describe 'GET new' do before { get :new, id: garden.to_param } + it { expect(response).to redirect_to(new_member_session_path) } end + describe 'PUT create' do before { put :create, garden: valid_params } + it { expect(response).to redirect_to(new_member_session_path) } end + describe 'changing existing records' do before do allow(Garden).to receive(:find).and_return(:garden) @@ -23,20 +28,27 @@ RSpec.describe GardensController, type: :controller do expect(garden).not_to receive(:update!) expect(garden).not_to receive(:destroy) end + describe 'GET edit' do before { get :edit, id: garden.to_param } + it { expect(response).to redirect_to(new_member_session_path) } end + describe 'POST update' do before { post :update, id: garden.to_param, garden: valid_params } + it { expect(response).to redirect_to(new_member_session_path) } end + describe 'DELETE' do before { delete :destroy, id: garden.to_param, params: { garden: valid_params } } + it { expect(response).to redirect_to(new_member_session_path) } end end end + context "when signed in" do before(:each) { sign_in member } @@ -56,14 +68,19 @@ RSpec.describe GardensController, type: :controller do describe 'GET edit' do before { get :edit, id: not_my_garden.to_param } + it { expect(response).to redirect_to(root_path) } end + describe 'POST update' do before { post :update, id: not_my_garden.to_param, garden: valid_params } + it { expect(response).to redirect_to(root_path) } end + describe 'DELETE' do before { delete :destroy, id: not_my_garden.to_param, params: { garden: valid_params } } + it { expect(response).to redirect_to(root_path) } end end diff --git a/spec/controllers/harvests_controller_spec.rb b/spec/controllers/harvests_controller_spec.rb index 705f954b5..08f5bb1e4 100644 --- a/spec/controllers/harvests_controller_spec.rb +++ b/spec/controllers/harvests_controller_spec.rb @@ -22,23 +22,27 @@ describe HarvestsController do describe "assigns all harvests as @harvests" do before { get :index, {} } + it { assigns(:harvests).should =~ [harvest1, harvest2] } end describe "picks up owner from params and shows owner's harvests only" do before { get :index, owner: member1.slug } + it { expect(assigns(:owner)).to eq member1 } it { expect(assigns(:harvests)).to eq [harvest1] } end describe "picks up crop from params and shows the harvests for the crop only" do before { get :index, crop: maize.name } + it { expect(assigns(:crop)).to eq maize } it { expect(assigns(:harvests)).to eq [harvest2] } end describe "generates a csv" do before { get :index, format: "csv" } + it { expect(response.status).to eq 200 } end end @@ -48,6 +52,7 @@ describe HarvestsController do describe "assigns the requested harvest as @harvest" do before { get :show, id: harvest.to_param } + it { expect(assigns(:harvest)).to eq(harvest) } end end @@ -69,6 +74,7 @@ describe HarvestsController do describe "assigns the requested harvest as @harvest" do before { get :edit, id: harvest.to_param } + it { expect(assigns(:harvest)).to eq(harvest) } end end @@ -96,6 +102,7 @@ describe HarvestsController do let(:planting) { FactoryBot.create(:planting, owner_id: member.id, garden: member.gardens.first) } before { post :create, harvest: valid_attributes.merge(planting_id: planting.id) } + it { expect(Harvest.last.planting.id).to eq(planting.id) } end end @@ -124,6 +131,7 @@ describe HarvestsController do allow(Harvest).to receive(:new).and_return(harvest) post :create, harvest: valid_attributes.merge(planting_id: not_my_planting.id) end + it { expect(harvest.planting_id).not_to eq(not_my_planting.id) } end end @@ -179,6 +187,7 @@ describe HarvestsController do put :update, id: harvest.to_param, harvest: valid_attributes.merge(planting_id: not_my_planting.id) end + it { expect(harvest.planting_id).to eq(nil) } end end diff --git a/spec/controllers/likes_controller_spec.rb b/spec/controllers/likes_controller_spec.rb index a80fc0d56..0e9b8ae6b 100644 --- a/spec/controllers/likes_controller_spec.rb +++ b/spec/controllers/likes_controller_spec.rb @@ -11,6 +11,7 @@ describe LikesController do describe "POST create" do it { expect(response.content_type).to eq "application/json" } before { post :create, post_id: blogpost.id, format: :json } + it { expect(Like.last.likeable_id).to eq(blogpost.id) } it { expect(Like.last.likeable_type).to eq('Post') } it { JSON.parse(response.body)["description"] == "1 like" } @@ -26,6 +27,7 @@ describe LikesController do describe "DELETE destroy" do before { delete :destroy, id: like.id, format: :json } + it { expect(response.content_type).to eq "application/json" } describe "un-liking something i liked before" do diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb index 76869ebf3..4be3aec7f 100644 --- a/spec/controllers/photos_controller_spec.rb +++ b/spec/controllers/photos_controller_spec.rb @@ -39,6 +39,7 @@ describe PhotosController do describe "planting photos" do before(:each) { get :new, type: "planting", id: planting.id } + it { assigns(:flickr_auth).should be_an_instance_of(Authentication) } it { assigns(:item).should eq planting } it { expect(flash[:alert]).not_to be_present } @@ -47,12 +48,14 @@ describe PhotosController do describe "harvest photos" do before { get :new, type: "harvest", id: harvest.id } + it { assigns(:item).should eq harvest } it { expect(flash[:alert]).not_to be_present } end describe "garden photos" do before { get :new, type: "garden", id: garden.id } + it { assigns(:item).should eq garden } it { expect(flash[:alert]).not_to be_present } end @@ -76,6 +79,7 @@ describe PhotosController do describe "with valid params" do before { controller.stub(:current_member) { member } } + it "attaches the photo to a planting" do post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: planting.id expect(flash[:alert]).not_to be_present @@ -87,6 +91,7 @@ describe PhotosController do post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: planting.id post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: planting.id end + it { expect(flash[:alert]).not_to be_present } it { expect(Photo.last.plantings.size).to eq 1 } end @@ -127,6 +132,7 @@ describe PhotosController do describe "with matching owners" do before { controller.stub(:current_member) { member } } + it "creates the planting/photo link" do planting = FactoryBot.create(:planting, garden: garden, owner: member) photo = FactoryBot.create(:photo, owner: member) diff --git a/spec/controllers/plantings_controller_spec.rb b/spec/controllers/plantings_controller_spec.rb index c4fe2396f..1d0fbe64f 100644 --- a/spec/controllers/plantings_controller_spec.rb +++ b/spec/controllers/plantings_controller_spec.rb @@ -20,17 +20,20 @@ describe PlantingsController do describe "assigns all plantings as @plantings" do before { get :index, {} } + it { expect(assigns(:plantings)).to match [planting1, planting2] } end describe "picks up owner from params and shows owner's plantings only" do before { get :index, owner: member1.slug } + it { expect(assigns(:owner)).to eq member1 } it { expect(assigns(:plantings)).to eq [planting1] } end describe "picks up crop from params and shows the plantings for the crop only" do before { get :index, crop: maize.name } + it { expect(assigns(:crop)).to eq maize } it { expect(assigns(:plantings)).to eq [planting2] } end @@ -41,11 +44,13 @@ describe PlantingsController do let(:crop) { FactoryBot.create(:crop) } before { get :new, crop_id: crop.id } + it { expect(assigns(:crop)).to eq(crop) } end describe "doesn't die if no crop specified" do before { get :new, {} } + it { expect(assigns(:crop)).to be_a_new(Crop) } end @@ -53,6 +58,7 @@ describe PlantingsController do let(:garden) { FactoryBot.create(:garden, owner: member) } before { get :new, garden_id: garden.id } + it { expect(assigns(:garden)).to eq(garden) } end @@ -61,6 +67,7 @@ describe PlantingsController do let(:garden) { FactoryBot.create(:garden, owner: another_member) } before { get :new, garden_id: garden.id } + it { expect(assigns(:garden)).not_to eq(garden) } end @@ -69,6 +76,7 @@ describe PlantingsController do let!(:garden) { FactoryBot.create(:garden, owner: member) } before { get :new, crop_id: crop.id } + it { expect(assigns(:crop)).not_to eq(crop) } end @@ -77,22 +85,27 @@ describe PlantingsController do let!(:garden) { FactoryBot.create(:garden, owner: member) } before { get :new, crop_id: crop.id } + it { expect(assigns(:crop)).not_to eq(crop) } end describe "doesn't die if no garden specified" do before { get :new, {} } + it { expect(assigns(:garden)).to be_a_new(Garden) } end describe "sets the date of the planting to today" do before { get :new, {} } + it { expect(assigns(:planting).planted_at).to eq Time.zone.today } end context 'with parent seed' do let(:seed) { FactoryBot.create :seed, owner: member } + before { get :new, seed_id: seed.to_param } + it { expect(assigns(:seed)).to eq(seed) } end end @@ -100,6 +113,7 @@ describe PlantingsController do describe 'POST :create' do describe "sets the owner automatically" do before { post :create, planting: valid_attributes } + it { expect(assigns(:planting).owner).to eq subject.current_member } end end diff --git a/spec/controllers/seeds_controller_spec.rb b/spec/controllers/seeds_controller_spec.rb index a803d8688..073c3ba99 100644 --- a/spec/controllers/seeds_controller_spec.rb +++ b/spec/controllers/seeds_controller_spec.rb @@ -5,6 +5,7 @@ describe SeedsController do describe "GET index" do before { get :index, owner: owner.slug } + it "picks up owner from params" do assigns(:owner).should eq(owner) end @@ -21,7 +22,9 @@ describe SeedsController do context 'with parent planting' do let(:planting) { FactoryBot.create :planting, owner: owner } + before { get :new, planting_id: planting.to_param } + it { expect(assigns(:planting)).to eq(planting) } end end diff --git a/spec/factories/notifications.rb b/spec/factories/notifications.rb index 7903035d2..186c7b905 100644 --- a/spec/factories/notifications.rb +++ b/spec/factories/notifications.rb @@ -5,6 +5,7 @@ FactoryBot.define do sender recipient subject { "MyString" } + body { "MyText" } read { false } post diff --git a/spec/factories/post.rb b/spec/factories/post.rb index 6a955b95a..f88a123be 100644 --- a/spec/factories/post.rb +++ b/spec/factories/post.rb @@ -1,6 +1,7 @@ FactoryBot.define do factory :post do subject { "A Post" } + body { "This is some text." } author created_at { Time.now } diff --git a/spec/features/crops/crop_detail_page_spec.rb b/spec/features/crops/crop_detail_page_spec.rb index b7dca2e8d..62f80d37f 100644 --- a/spec/features/crops/crop_detail_page_spec.rb +++ b/spec/features/crops/crop_detail_page_spec.rb @@ -10,6 +10,7 @@ feature "crop detail page", js: true do visit crop_path(crop) page end + let(:crop) { create :crop } context "varieties" do @@ -190,6 +191,7 @@ feature "crop detail page", js: true do planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop: crop)) planting.crop.update_medians end + it "predicts harvest" do is_expected.to have_text("First harvest expected 20 days after planting") end @@ -254,18 +256,21 @@ feature "crop detail page", js: true do context 'annual and perennial' do before { visit crop_path(crop) } + context 'crop is an annual' do let(:crop) { FactoryBot.create :annual_crop } it { expect(page).to have_text 'annual crop (living and reproducing in a single year or less)' } it { expect(page).not_to have_text 'perennial crop (living more than two years)' } end + context 'crop is perennial' do let(:crop) { FactoryBot.create :perennial_crop } it { expect(page).to have_text 'perennial crop (living more than two years)' } it { expect(page).not_to have_text 'annual crop (living and reproducing in a single year or less)' } end + context 'crop perennial value is null' do let(:crop) { FactoryBot.create :crop, perennial: nil } diff --git a/spec/features/crops/crop_photos_spec.rb b/spec/features/crops/crop_photos_spec.rb index ccc5288f0..03e2bc853 100644 --- a/spec/features/crops/crop_photos_spec.rb +++ b/spec/features/crops/crop_photos_spec.rb @@ -2,6 +2,7 @@ require 'rails_helper' feature "crop detail page", js: true do subject { page } + let(:member) { create :member } let(:crop) { create :crop, plantings: [planting], harvests: [harvest] } @@ -34,10 +35,12 @@ feature "crop detail page", js: true do it { is_expected.to have_xpath("//img[contains(@src,'#{photo1.thumbnail_url}')]") } it { is_expected.to have_xpath("//img[contains(@src,'#{photo2.thumbnail_url}')]") } end + describe "show harvest photos" do it { is_expected.to have_xpath("//img[contains(@src,'#{photo3.thumbnail_url}')]") } it { is_expected.to have_xpath("//img[contains(@src,'#{photo4.thumbnail_url}')]") } end + describe "link to more photos" do it { is_expected.to have_link "more photos" } end @@ -47,10 +50,12 @@ feature "crop detail page", js: true do background { login_as(create(:member)) } include_examples "shows photos" end + context "when signed in as photos owner" do background { login_as(member) } include_examples "shows photos" end + context "when not signed in " do include_examples "shows photos" end diff --git a/spec/features/gardens/actions_spec.rb b/spec/features/gardens/actions_spec.rb index 7342fe55e..a22ab6886 100644 --- a/spec/features/gardens/actions_spec.rb +++ b/spec/features/gardens/actions_spec.rb @@ -3,9 +3,11 @@ require 'custom_matchers' feature "Gardens" do context 'logged in' do + subject { page } + let(:member) { FactoryBot.create :member } background { login_as member } - subject { page } + let(:garden) { member.gardens.first } describe '#index' do @@ -21,6 +23,7 @@ feature "Gardens" do context 'my gardens' do before { visit gardens_path(owner: member) } + include_examples "has buttons bar at top" it "has actions on garden" do within '.garden-actions' do @@ -32,12 +35,16 @@ feature "Gardens" do end end end + context 'all gardens' do before { visit gardens_path } + include_examples "has buttons bar at top" end + context "other member's garden" do before { visit gardens_path(owner: FactoryBot.create(:member)) } + include_examples "has buttons bar at top" it 'does not show actions on other member garden' do is_expected.not_to have_link 'Plant something' diff --git a/spec/features/gardens/gardens_index_spec.rb b/spec/features/gardens/gardens_index_spec.rb index 0a973e305..03fc28447 100644 --- a/spec/features/gardens/gardens_index_spec.rb +++ b/spec/features/gardens/gardens_index_spec.rb @@ -4,6 +4,7 @@ require 'custom_matchers' feature "Gardens#index", :js do context "Logged in as member" do let(:member) { FactoryBot.create :member, login_name: 'shadow' } + background { login_as member } context "with 10 gardens" do @@ -58,6 +59,7 @@ feature "Gardens#index", :js do before do visit gardens_path(member: member) end + it "shows planting in garden" do expect(page).to have_link(planting.crop.name, href: planting_path(planting)) end @@ -71,6 +73,7 @@ feature "Gardens#index", :js do let(:garden) { member.gardens.first } let(:member) { FactoryBot.create :member, login_name: 'robbieburns' } let(:crop) { FactoryBot.create :crop } + before(:each) do # time to harvest = 50 day # time to finished = 90 days @@ -98,6 +101,7 @@ feature "Gardens#index", :js do garden: garden, planted_at: Time.zone.today end + it { expect(page).to have_link href: planting_path(planting) } it { expect(page).to have_link href: garden_path(planting.garden) } it { expect(page).to have_text '50 days until harvest' } @@ -112,6 +116,7 @@ feature "Gardens#index", :js do owner: member, garden: garden, planted_at: 51.days.ago end + it { expect(crop.median_days_to_first_harvest).to eq 50 } it { expect(crop.median_lifespan).to eq 90 } @@ -126,6 +131,7 @@ feature "Gardens#index", :js do crop: crop, owner: member, garden: garden, planted_at: 260.days.ago end + it { expect(page).to have_text 'super late' } it { expect(page).not_to have_text 'harvesting now' } it { expect(page).not_to have_text 'days until harvest' } diff --git a/spec/features/harvests/browse_harvests_spec.rb b/spec/features/harvests/browse_harvests_spec.rb index c51be9f41..010433be2 100644 --- a/spec/features/harvests/browse_harvests_spec.rb +++ b/spec/features/harvests/browse_harvests_spec.rb @@ -1,13 +1,16 @@ require 'rails_helper' feature "browse harvests" do + subject { page } + let!(:member) { create :member } let!(:harvest) { create :harvest, owner: member } background { login_as member } - subject { page } + feature 'blank optional fields' do let!(:harvest) { create :harvest, :no_description } + before { visit harvests_path } scenario 'read more' do diff --git a/spec/features/home/home_spec.rb b/spec/features/home/home_spec.rb index 4137b5e5a..c8759d48b 100644 --- a/spec/features/home/home_spec.rb +++ b/spec/features/home/home_spec.rb @@ -1,6 +1,8 @@ require 'rails_helper' feature "home page" do + subject { page } + let(:member) { FactoryBot.create :member } # let(:seed_photo) { FactoryBot.create :photo } let(:photo) { FactoryBot.create :photo } @@ -13,6 +15,7 @@ feature "home page" do let!(:tradable_seed) { FactoryBot.create :tradable_seed, finished: false } let!(:finished_seed) { FactoryBot.create :tradable_seed, finished: true } let!(:untradable_seed) { FactoryBot.create :untradable_seed } + background do # Add photos, so they can appear on home page planting.photos << photo @@ -20,7 +23,7 @@ feature "home page" do harvest.photos << photo end - subject { page } + before { visit root_path } shared_examples 'shows seeds' do @@ -55,12 +58,14 @@ feature "home page" do it { is_expected.to have_text 'Some of our crops' } it { is_expected.to have_link href: crop_path(crop) } end + describe 'shows recently added crops' do it { is_expected.to have_text 'Recently Added' } it 'link to newest crops' do is_expected.to have_link crop.name, href: crop_path(crop) end end + it 'includes a link to all crops' do is_expected.to have_link 'View all crops' end diff --git a/spec/features/seeds/seed_photos.rb b/spec/features/seeds/seed_photos.rb index 7e26ece28..ff8fd1db0 100644 --- a/spec/features/seeds/seed_photos.rb +++ b/spec/features/seeds/seed_photos.rb @@ -7,6 +7,7 @@ feature "Seeds", :js do visit seed_path(seed) page end + let(:member) { FactoryBot.create :member } let!(:seed) { FactoryBot.create :seed, owner: member } @@ -17,13 +18,16 @@ feature "Seeds", :js do # end context 'has one photo' do before { seed.photos = [photo] } + let!(:photo) { FactoryBot.create :photo, title: 'hello photo' } it { is_expected.to have_xpath("//img[contains(@src,'#{photo.thumbnail_url}')]") } it { is_expected.to have_xpath("//a[contains(@href,'#{photo_path(photo)}')]") } end + context 'has 50 photos' do before { seed.photos = photos } + let!(:photos) { FactoryBot.create_list :photo, 50 } it "shows newest photo" do diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index d1eae5cf6..5c1d11d9e 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -20,6 +20,7 @@ describe ApplicationHelper do before :each do @member = FactoryBot.build(:member, email: 'example@example.com', preferred_avatar_uri: nil) end + it 'should render a gravatar uri' do expect(avatar_uri(@member)).to eq 'http://www.gravatar.com/avatar/23463b99b62a72f26ed677cc556c44e8?size=150&default=identicon' end @@ -33,6 +34,7 @@ describe ApplicationHelper do before :each do @member = FactoryBot.build(:member, email: 'example@example.com', preferred_avatar_uri: 'http://media.catmoji.com/post/ujg/cat-in-hat.jpg') end + it 'should render a the specified uri' do expect(avatar_uri(@member)).to eq 'http://media.catmoji.com/post/ujg/cat-in-hat.jpg' end @@ -87,6 +89,7 @@ describe ApplicationHelper do expect(build_alert_classes(:info)).not_to include ' alert-danger' end end + context 'warning' do it 'works when :warning' do expect(build_alert_classes(:warning)).to include 'alert-warning' @@ -101,6 +104,7 @@ describe ApplicationHelper do expect(build_alert_classes(:info)).not_to include ' alert-warning' end end + context 'success' do it 'works when :notice' do expect(build_alert_classes(:notice)).to include 'alert-success' @@ -115,6 +119,7 @@ describe ApplicationHelper do expect(build_alert_classes(:info)).not_to include ' alert-success' end end + context 'info' do it 'works when :info' do expect(build_alert_classes(:info)).to include 'alert-info' diff --git a/spec/helpers/photos_helper_spec.rb b/spec/helpers/photos_helper_spec.rb index 589cf8104..63a45a548 100644 --- a/spec/helpers/photos_helper_spec.rb +++ b/spec/helpers/photos_helper_spec.rb @@ -19,6 +19,7 @@ describe PhotosHelper do describe "with a planting" do before { planting.photos << planting_photo } + it "uses planting photos" do is_expected.to eq planting_photo.thumbnail_url end @@ -26,6 +27,7 @@ describe PhotosHelper do describe "with a harvest photos" do before { harvest.photos << harvest_photo } + it "uses harvest photos" do is_expected.to eq harvest_photo.thumbnail_url end @@ -33,6 +35,7 @@ describe PhotosHelper do describe "uses seed photo" do before { seed.photos << seed_photo } + it "uses seed photos" do is_expected.to eq seed_photo.thumbnail_url end @@ -41,38 +44,46 @@ describe PhotosHelper do describe "gardens" do subject { garden_image_path(garden) } + it { is_expected.to eq 'placeholder_150.png' } describe "uses garden's own photo" do before { garden.photos << garden_photo } + it { is_expected.to eq garden_photo.thumbnail_url } end end describe 'plantings' do subject { planting_image_path(planting) } + it { is_expected.to eq 'placeholder_150.png' } describe "uses planting's own photo" do before { planting.photos << planting_photo } + it { is_expected.to eq planting_photo.thumbnail_url } end end describe 'harvests' do subject { harvest_image_path(harvest) } + it { is_expected.to eq 'placeholder_150.png' } describe "uses harvest's own photo" do before { harvest.photos << harvest_photo } + it { is_expected.to eq harvest_photo.thumbnail_url } end end describe 'seeds' do subject { seed_image_path(seed) } + it { is_expected.to eq 'placeholder_150.png' } describe "uses seed's own photo" do before { seed.photos << seed_photo } + it { is_expected.to eq seed_photo.thumbnail_url } end end diff --git a/spec/models/crop_spec.rb b/spec/models/crop_spec.rb index 3f49a249d..ec4ae63c5 100644 --- a/spec/models/crop_spec.rb +++ b/spec/models/crop_spec.rb @@ -142,6 +142,7 @@ describe Crop do before :each do @crop = FactoryBot.create(:tomato) end + context 'with a planting photo' do before :each do @planting = FactoryBot.create(:planting, crop: @crop) @@ -277,6 +278,7 @@ describe Crop do context 'interesting' do subject { Crop.interesting } + let(:photo) { FactoryBot.create :photo } # first, a couple of candidate crops let(:crop1) { FactoryBot.create(:crop) } @@ -307,6 +309,7 @@ describe Crop do # ... and photos crop1_planting.photos = FactoryBot.create_list(:photo, 3) end + it { is_expected.to include crop1 } it { is_expected.not_to include crop2 } it { expect(subject.size).to eq 1 } @@ -321,6 +324,7 @@ describe Crop do # but only crop1 has photos crop1_planting.photos = FactoryBot.create_list(:photo, 3) end + it { is_expected.to include crop1 } it { is_expected.not_to include crop2 } it { expect(subject.size).to eq 1 } diff --git a/spec/models/member_spec.rb b/spec/models/member_spec.rb index eb4e105b1..5f278c32c 100644 --- a/spec/models/member_spec.rb +++ b/spec/models/member_spec.rb @@ -341,6 +341,7 @@ describe 'member' do context 'queries a scope' do before { member.destroy } + it { expect(Member.all).not_to include(member) } it { expect(Member.confirmed).not_to include(member) } it { expect(Member.located).not_to include(member) } @@ -350,6 +351,7 @@ describe 'member' do it { expect(Member.interesting).not_to include(member) } it { expect(Member.has_plantings).not_to include(member) } end + it "unsubscribes from mailing list" do expect(member).to receive(:newsletter_unsubscribe).and_return(true) member.destroy diff --git a/spec/models/planting_spec.rb b/spec/models/planting_spec.rb index 6b49f1c0a..7d4a94221 100644 --- a/spec/models/planting_spec.rb +++ b/spec/models/planting_spec.rb @@ -19,6 +19,7 @@ describe Planting do it { expect(planting.days_since_planted).to eq(30) } it { expect(planting.percentage_grown).to eq(nil) } end + describe 'planting not planted yet' do let(:planting) { FactoryBot.create :planting, planted_at: nil, finished_at: nil, finished: false } @@ -27,6 +28,7 @@ describe Planting do it { expect(planting.days_since_planted).to eq(nil) } it { expect(planting.percentage_grown).to eq(nil) } end + describe 'planting finished, no planted_at' do let(:planting) { FactoryBot.create :planting, planted_at: nil, finished_at: 1.day.ago, finished: true } @@ -35,6 +37,7 @@ describe Planting do it { expect(planting.days_since_planted).to eq(nil) } it { expect(planting.percentage_grown).to eq(100) } end + describe 'planting all finished' do let(:planting) { FactoryBot.create :planting, planted_at: 30.days.ago, finished_at: 1.day.ago, finished: true } @@ -90,6 +93,7 @@ describe Planting do describe 'planting finished 10 days, but was never planted' do let(:planting) { FactoryBot.create :planting, planted_at: nil, finished_at: 10.days.ago } + it { expect(planting.percentage_grown).to eq 100 } end @@ -112,9 +116,11 @@ describe Planting do it { expect(planting.days_to_last_harvest).to eq(nil) } it { expect(planting.expected_lifespan).to eq(nil) } end + context 'lots of data' do let(:crop) { FactoryBot.create :crop } # this is a method so it creates a new one each time + def one_hundred_day_old_planting FactoryBot.create(:planting, crop: crop, planted_at: 100.days.ago) end @@ -133,33 +139,42 @@ describe Planting do planting.crop.update_lifespan_medians planting.crop.update_harvest_medians end + it { expect(crop.median_days_to_first_harvest).to eq(20) } describe 'sets median time to harvest' do let(:planting) { FactoryBot.create :planting, crop: crop, planted_at: Time.zone.today } + it { expect(planting.first_harvest_predicted_at).to eq(Time.zone.today + 20.days) } end describe 'harvest still growing' do let(:planting) { FactoryBot.create :planting, crop: crop, planted_at: Time.zone.today } + it { expect(planting.before_harvest_time?).to eq true } it { expect(planting.harvest_time?).to eq false } end + describe 'harvesting ready now' do let(:planting) { FactoryBot.create :planting, crop: crop, planted_at: 21.days.ago } + it { expect(planting.first_harvest_predicted_at).to eq(1.day.ago.to_date) } it { expect(planting.before_harvest_time?).to eq false } it { expect(planting.harvest_time?).to eq true } end end + describe 'planting has no harvests' do let(:planting) { FactoryBot.create :planting } + before do planting.update_harvest_days! planting.crop.update_harvest_medians end + it { expect(planting.days_to_first_harvest).to eq(nil) } it { expect(planting.days_to_last_harvest).to eq(nil) } end + describe 'planting has first harvest' do let(:planting) { FactoryBot.create :planting, planted_at: 100.days.ago } @@ -171,11 +186,13 @@ describe Planting do planting.update_harvest_days! planting.crop.update_harvest_medians end + it { expect(planting.days_to_first_harvest).to eq(90) } it { expect(planting.days_to_last_harvest).to eq(nil) } it { expect(planting.crop.median_days_to_first_harvest).to eq(90) } it { expect(planting.crop.median_days_to_last_harvest).to eq(nil) } end + describe 'planting has last harvest' do let(:planting) { FactoryBot.create :planting, planted_at: 100.days.ago, finished_at: 1.day.ago, finished: true } @@ -185,6 +202,7 @@ describe Planting do planting.update_harvest_days! planting.crop.update_harvest_medians end + it { expect(planting.days_to_first_harvest).to eq(10) } it { expect(planting.days_to_last_harvest).to eq(90) } it { expect(planting.crop.median_days_to_first_harvest).to eq(10) } @@ -463,6 +481,7 @@ describe Planting do context 'ancestry' do let(:parent_seed) { FactoryBot.create :seed } let(:planting) { FactoryBot.create :planting, parent_seed: parent_seed } + it "planting has a parent seed" do expect(planting.parent_seed).to eq(parent_seed) end @@ -471,6 +490,7 @@ describe Planting do end describe 'grandchildren' do let(:grandchild_seed) { FactoryBot.create :seed, parent_planting: planting } + it { expect(grandchild_seed.parent_planting).to eq planting } it { expect(grandchild_seed.parent_planting.parent_seed).to eq parent_seed } end diff --git a/spec/models/role_spec.rb b/spec/models/role_spec.rb index 76e309aa0..0fc5f92b7 100644 --- a/spec/models/role_spec.rb +++ b/spec/models/role_spec.rb @@ -6,6 +6,7 @@ describe Role do role.members << member role end + let(:member) { FactoryBot.create(:member) } it 'has members' do diff --git a/spec/models/seed_spec.rb b/spec/models/seed_spec.rb index 269cb888f..f15a57398 100644 --- a/spec/models/seed_spec.rb +++ b/spec/models/seed_spec.rb @@ -153,6 +153,7 @@ describe Seed do let(:seed) { FactoryBot.create :seed } before { seed.photos << FactoryBot.create(:photo) } + it 'is found in has_photos scope' do Seed.has_photos.should include(seed) end @@ -161,6 +162,7 @@ describe Seed do context 'ancestry' do let(:parent_planting) { FactoryBot.create :planting } let(:seed) { FactoryBot.create :seed, parent_planting: parent_planting } + it "seed has a parent planting" do expect(seed.parent_planting).to eq(parent_planting) end @@ -172,6 +174,7 @@ describe Seed do context "finished" do describe 'has finished fields' do let(:seed) { FactoryBot.create(:finished_seed) } + it { expect(seed.finished).to eq true } it { expect(seed.finished_at).to be_an_instance_of Date } end diff --git a/spec/requests/api/v1/crop_request_spec.rb b/spec/requests/api/v1/crop_request_spec.rb index 6a392eb74..f6cc2d4a5 100644 --- a/spec/requests/api/v1/crop_request_spec.rb +++ b/spec/requests/api/v1/crop_request_spec.rb @@ -2,6 +2,7 @@ require 'rails_helper' RSpec.describe 'Plantings', type: :request do subject { JSON.parse response.body } + let(:headers) { { 'Accept' => 'application/vnd.api+json' } } let!(:crop) { FactoryBot.create :crop } let(:crop_encoded_as_json_api) do @@ -57,11 +58,13 @@ RSpec.describe 'Plantings', type: :request do describe '#index' do before { get '/api/v1/crops', {}, headers } + it { expect(subject['data']).to include(crop_encoded_as_json_api) } end describe '#show' do before { get "/api/v1/crops/#{crop.id}", {}, headers } + it { expect(subject['data']['attributes']).to eq(attributes) } it { expect(subject['data']['relationships']).to include("plantings" => plantings_as_json_api) } it { expect(subject['data']['relationships']).to include("harvests" => harvests_as_json_api) } @@ -72,16 +75,19 @@ RSpec.describe 'Plantings', type: :request do describe '#create' do before { post '/api/v1/crops', { 'crop' => { 'name' => 'can i make this' } }, headers } + it { expect(response.code).to eq "404" } end describe '#update' do before { post "/api/v1/crops/#{crop.id}", { 'crop' => { 'name' => 'can i modify this' } }, headers } + it { expect(response.code).to eq "404" } end describe '#delete' do before { delete "/api/v1/crops/#{crop.id}", {}, headers } + it { expect(response.code).to eq "404" } end end diff --git a/spec/requests/api/v1/gardens_request_spec.rb b/spec/requests/api/v1/gardens_request_spec.rb index d6005e286..c0c33c363 100644 --- a/spec/requests/api/v1/gardens_request_spec.rb +++ b/spec/requests/api/v1/gardens_request_spec.rb @@ -2,6 +2,7 @@ require 'rails_helper' RSpec.describe 'Gardens', type: :request do subject { JSON.parse response.body } + let(:headers) { { 'Accept' => 'application/vnd.api+json' } } let!(:garden) { FactoryBot.create :garden } let(:garden_encoded_as_json_api) do diff --git a/spec/requests/api/v1/harvest_request_spec.rb b/spec/requests/api/v1/harvest_request_spec.rb index af2d4201e..48094de1b 100644 --- a/spec/requests/api/v1/harvest_request_spec.rb +++ b/spec/requests/api/v1/harvest_request_spec.rb @@ -2,6 +2,7 @@ require 'rails_helper' RSpec.describe 'Harvests', type: :request do subject { JSON.parse response.body } + let(:headers) { { 'Accept' => 'application/vnd.api+json' } } let!(:harvest) { FactoryBot.create :harvest } let(:harvest_encoded_as_json_api) do @@ -58,11 +59,13 @@ RSpec.describe 'Harvests', type: :request do describe '#index' do before { get '/api/v1/harvests', {}, headers } + it { expect(subject['data']).to include(harvest_encoded_as_json_api) } end describe '#show' do before { get "/api/v1/harvests/#{harvest.id}", {}, headers } + it { expect(subject['data']['attributes']).to eq(attributes) } it { expect(subject['data']['relationships']).to include("planting" => planting_as_json_api) } it { expect(subject['data']['relationships']).to include("crop" => crop_as_json_api) } @@ -73,16 +76,19 @@ RSpec.describe 'Harvests', type: :request do describe '#create' do before { post '/api/v1/harvests', { 'harvest' => { 'description' => 'can i make this' } }, headers } + it { expect(response.code).to eq "404" } end describe '#update' do before { post "/api/v1/harvests/#{harvest.id}", { 'harvest' => { 'description' => 'can i modify this' } }, headers } + it { expect(response.code).to eq "404" } end describe '#delete' do before { delete "/api/v1/harvests/#{harvest.id}", {}, headers } + it { expect(response.code).to eq "404" } end end diff --git a/spec/requests/api/v1/member_request_spec.rb b/spec/requests/api/v1/member_request_spec.rb index 6067e59b6..3767f8a43 100644 --- a/spec/requests/api/v1/member_request_spec.rb +++ b/spec/requests/api/v1/member_request_spec.rb @@ -2,6 +2,7 @@ require 'rails_helper' RSpec.describe 'Members', type: :request do subject { JSON.parse response.body } + let(:headers) { { 'Accept' => 'application/vnd.api+json' } } let!(:member) { FactoryBot.create :member } let(:member_encoded_as_json_api) do @@ -58,11 +59,13 @@ RSpec.describe 'Members', type: :request do describe '#index' do before { get '/api/v1/members', {}, headers } + it { expect(subject['data']).to include(member_encoded_as_json_api) } end describe '#show' do before { get "/api/v1/members/#{member.id}", {}, headers } + it { expect(subject['data']['relationships']).to include("gardens" => gardens_as_json_api) } it { expect(subject['data']['relationships']).to include("plantings" => plantings_as_json_api) } it { expect(subject['data']['relationships']).to include("seeds" => seeds_as_json_api) } @@ -73,16 +76,19 @@ RSpec.describe 'Members', type: :request do describe '#create' do before { post '/api/v1/members', { 'member' => { 'login_name' => 'can i make this' } }, headers } + it { expect(response.code).to eq "404" } end describe '#update' do before { post "/api/v1/members/#{member.id}", { 'member' => { 'login_name' => 'can i modify this' } }, headers } + it { expect(response.code).to eq "404" } end describe '#delete' do before { delete "/api/v1/members/#{member.id}", {}, headers } + it { expect(response.code).to eq "404" } end end diff --git a/spec/requests/api/v1/photos_request_spec.rb b/spec/requests/api/v1/photos_request_spec.rb index e9e584a60..ed16505f6 100644 --- a/spec/requests/api/v1/photos_request_spec.rb +++ b/spec/requests/api/v1/photos_request_spec.rb @@ -2,6 +2,7 @@ require 'rails_helper' RSpec.describe 'Photos', type: :request do subject { JSON.parse response.body } + let(:headers) { { 'Accept' => 'application/vnd.api+json' } } let!(:photo) { FactoryBot.create :photo } let(:photo_encoded_as_json_api) do @@ -56,11 +57,13 @@ RSpec.describe 'Photos', type: :request do describe '#index' do before { get '/api/v1/photos', {}, headers } + it { expect(subject['data']).to include(photo_encoded_as_json_api) } end describe '#show' do before { get "/api/v1/photos/#{photo.id}", {}, headers } + it { expect(subject['data']['attributes']).to eq(attributes) } it { expect(subject['data']['relationships']).to include("plantings" => plantings_as_json_api) } it { expect(subject['data']['relationships']).to include("harvests" => harvests_as_json_api) } @@ -70,16 +73,19 @@ RSpec.describe 'Photos', type: :request do describe '#create' do before { post '/api/v1/photos', { 'photo' => { 'name' => 'can i make this' } }, headers } + it { expect(response.code).to eq "404" } end describe '#update' do before { post "/api/v1/photos/#{photo.id}", { 'photo' => { 'name' => 'can i modify this' } }, headers } + it { expect(response.code).to eq "404" } end describe '#delete' do before { delete "/api/v1/photos/#{photo.id}", {}, headers } + it { expect(response.code).to eq "404" } end end diff --git a/spec/requests/api/v1/plantings_request_spec.rb b/spec/requests/api/v1/plantings_request_spec.rb index 4e96cefb4..81bc06a14 100644 --- a/spec/requests/api/v1/plantings_request_spec.rb +++ b/spec/requests/api/v1/plantings_request_spec.rb @@ -2,6 +2,7 @@ require 'rails_helper' RSpec.describe 'Plantings', type: :request do subject { JSON.parse response.body } + let(:headers) { { 'Accept' => 'application/vnd.api+json' } } let!(:planting) { FactoryBot.create :planting } let(:planting_encoded_as_json_api) do diff --git a/spec/requests/api/v1/seeds_request_spec.rb b/spec/requests/api/v1/seeds_request_spec.rb index f518e91de..406412dc8 100644 --- a/spec/requests/api/v1/seeds_request_spec.rb +++ b/spec/requests/api/v1/seeds_request_spec.rb @@ -2,6 +2,7 @@ require 'rails_helper' RSpec.describe 'Photos', type: :request do subject { JSON.parse response.body } + let(:headers) { { 'Accept' => 'application/vnd.api+json' } } let!(:seed) { FactoryBot.create :seed } let(:seed_encoded_as_json_api) do @@ -45,11 +46,13 @@ RSpec.describe 'Photos', type: :request do describe '#index' do before { get '/api/v1/seeds', {}, headers } + it { expect(subject['data']).to include(seed_encoded_as_json_api) } end describe '#show' do before { get "/api/v1/seeds/#{seed.id}", {}, headers } + it { expect(subject['data']['attributes']).to eq(attributes) } it { expect(subject['data']['relationships']).to include("owner" => owner_as_json_api) } it { expect(subject['data']['relationships']).to include("crop" => crop_as_json_api) } @@ -58,16 +61,19 @@ RSpec.describe 'Photos', type: :request do describe '#create' do before { post '/api/v1/seeds', { 'seed' => { 'name' => 'can i make this' } }, headers } + it { expect(response.code).to eq "404" } end describe '#update' do before { post "/api/v1/seeds/#{seed.id}", { 'seed' => { 'name' => 'can i modify this' } }, headers } + it { expect(response.code).to eq "404" } end describe '#delete' do before { delete "/api/v1/seeds/#{seed.id}", {}, headers } + it { expect(response.code).to eq "404" } end end diff --git a/spec/views/crops/_planting_advice.html.haml_spec.rb b/spec/views/crops/_planting_advice.html.haml_spec.rb index 12064a1b8..f5adc5b29 100644 --- a/spec/views/crops/_planting_advice.html.haml_spec.rb +++ b/spec/views/crops/_planting_advice.html.haml_spec.rb @@ -2,6 +2,7 @@ require 'rails_helper' describe "crops/_planting_advice" do subject { rendered } + let(:planting) { FactoryBot.create(:planting) } shared_examples "render planting_advice" do @@ -18,6 +19,7 @@ describe "crops/_planting_advice" do context "with sunniness frequencies" do before { FactoryBot.create(:sunny_planting, crop: planting.crop) } + include_examples "render planting_advice" it { is_expected.to have_content "Plant in:" } it { is_expected.to have_content "sun (1)" } @@ -28,6 +30,7 @@ describe "crops/_planting_advice" do FactoryBot.create_list(:sunny_planting, 2, crop: planting.crop) FactoryBot.create(:shady_planting, crop: planting.crop) end + include_examples "render planting_advice" it { is_expected.to have_content "Plant in:" } it { is_expected.to have_content "sun (2), shade (1)" } @@ -44,6 +47,7 @@ describe "crops/_planting_advice" do context "with planted_from frequencies" do before { FactoryBot.create(:seed_planting, crop: planting.crop) } + include_examples "render planting_advice" it { is_expected.to have_content "Plant from:" } it { is_expected.to have_content "seed (1)" } @@ -54,6 +58,7 @@ describe "crops/_planting_advice" do FactoryBot.create_list(:seed_planting, 2, crop: planting.crop) FactoryBot.create(:cutting_planting, crop: planting.crop) end + include_examples "render planting_advice" it { is_expected.to have_content "Plant from:" } it { is_expected.to have_content "seed (2), cutting (1)" } diff --git a/spec/views/devise/registrations/edit_spec.rb b/spec/views/devise/registrations/edit_spec.rb index 3d9dae906..64af90017 100644 --- a/spec/views/devise/registrations/edit_spec.rb +++ b/spec/views/devise/registrations/edit_spec.rb @@ -64,11 +64,13 @@ describe 'devise/registrations/edit.html.haml', type: "view" do assert_select "a", "Connect to Twitter" end end + context 'connected to twitter' do before(:each) do @twitter_auth = FactoryBot.create(:authentication, member: @member) render end + it 'has a link to twitter profile' do assert_select "a", href: "http://twitter.com/#{@twitter_auth.name}" end @@ -84,11 +86,13 @@ describe 'devise/registrations/edit.html.haml', type: "view" do assert_select "a", "Connect to Flickr" end end + context 'connected to flickr' do before(:each) do @flickr_auth = FactoryBot.create(:flickr_authentication, member: @member) render end + it 'has a link to flickr photostream' do assert_select "a", href: "http://flickr.com/photos/#{@flickr_auth.uid}" end diff --git a/spec/views/harvests/show.html.haml_spec.rb b/spec/views/harvests/show.html.haml_spec.rb index 4aec453ff..f3c17f2b5 100644 --- a/spec/views/harvests/show.html.haml_spec.rb +++ b/spec/views/harvests/show.html.haml_spec.rb @@ -2,6 +2,7 @@ require 'rails_helper' describe "harvests/show" do subject { render } + let!(:harvest) { FactoryBot.create(:harvest) } before do diff --git a/spec/views/members/show.rss.haml_spec.rb b/spec/views/members/show.rss.haml_spec.rb index 23366a9a8..46a986ae3 100644 --- a/spec/views/members/show.rss.haml_spec.rb +++ b/spec/views/members/show.rss.haml_spec.rb @@ -1,6 +1,8 @@ require 'rails_helper' describe 'members/show.rss.haml', type: "view" do + subject { rendered } + before(:each) do @member = assign(:member, FactoryBot.create(:member)) @post1 = FactoryBot.create(:post, id: 1, author: @member) @@ -9,7 +11,6 @@ describe 'members/show.rss.haml', type: "view" do render end - subject { rendered } it 'shows RSS feed title' do is_expected.to match(/member\d+'s recent posts/) diff --git a/spec/views/photos/show.html.haml_spec.rb b/spec/views/photos/show.html.haml_spec.rb index cecb0008b..d727be8a4 100644 --- a/spec/views/photos/show.html.haml_spec.rb +++ b/spec/views/photos/show.html.haml_spec.rb @@ -49,6 +49,7 @@ describe "photos/show" do controller.stub(:current_user) { member } render end + include_examples "photo data renders" it "has a delete button" do @@ -61,6 +62,7 @@ describe "photos/show" do controller.stub(:current_user) { FactoryBot.create :member } render end + include_examples "photo data renders" include_examples "No links to change data" end @@ -70,6 +72,7 @@ describe "photos/show" do controller.stub(:current_user) { nil } render end + include_examples "photo data renders" include_examples "No links to change data" end @@ -84,6 +87,7 @@ describe "photos/show" do @photo.gardens << garden render end + it "links to the CC license" do assert_select "a", href: @photo.license_url, text: @photo.license_name diff --git a/spec/views/posts/show.html.haml_spec.rb b/spec/views/posts/show.html.haml_spec.rb index ba6921e4e..ffdabfa36 100644 --- a/spec/views/posts/show.html.haml_spec.rb +++ b/spec/views/posts/show.html.haml_spec.rb @@ -2,6 +2,7 @@ require 'rails_helper' describe "posts/show" do subject { rendered } + let(:author) { FactoryBot.create(:member) } before(:each) do @@ -11,6 +12,7 @@ describe "posts/show" do describe 'render post' do before { render } + describe "basic post" do let(:post) { FactoryBot.create(:post, author: author) } @@ -35,11 +37,13 @@ describe "posts/show" do it { is_expected.to have_content('EVIL') } it { is_expected.not_to have_link("http://evil.com") } end + describe 'script tag in post body' do let(:post) { FactoryBot.create(:post, author: author, body: "") } it { is_expected.not_to have_selector('script') } end + describe 'script tag in post title' do let(:post) { FactoryBot.create(:post, author: author, subject: "") } @@ -99,6 +103,7 @@ describe "posts/show" do let(:post) { FactoryBot.create(:forum_post, author: author) } before { render } + it "shows forum name" do is_expected.to have_content "in #{post.forum.name}" end From 34470a84576302ed12a283c8913e6c3787ca898d Mon Sep 17 00:00:00 2001 From: Awesome Code Date: Mon, 10 Sep 2018 22:20:19 +0000 Subject: [PATCH 21/26] Auto corrected by following Ruby Layout/LeadingBlankLines --- lib/tasks/search.rake | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/tasks/search.rake b/lib/tasks/search.rake index e0280b6ad..7097e029c 100644 --- a/lib/tasks/search.rake +++ b/lib/tasks/search.rake @@ -1,4 +1,3 @@ - namespace :search do desc "Create elastic search index" task create: :environment do From 7301c6cd6cb3881c3c994938a4bc9a8fc09350b9 Mon Sep 17 00:00:00 2001 From: Awesome Code Date: Tue, 11 Sep 2018 03:02:54 +0000 Subject: [PATCH 22/26] Auto corrected by following Ruby RSpec/HooksBeforeExamples --- spec/controllers/likes_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/controllers/likes_controller_spec.rb b/spec/controllers/likes_controller_spec.rb index 0e9b8ae6b..f256e6ce3 100644 --- a/spec/controllers/likes_controller_spec.rb +++ b/spec/controllers/likes_controller_spec.rb @@ -9,8 +9,8 @@ describe LikesController do before { sign_in member } describe "POST create" do - it { expect(response.content_type).to eq "application/json" } before { post :create, post_id: blogpost.id, format: :json } + it { expect(response.content_type).to eq "application/json" } it { expect(Like.last.likeable_id).to eq(blogpost.id) } it { expect(Like.last.likeable_type).to eq('Post') } From d248f992098863398cef00c19a5208d0ee659016 Mon Sep 17 00:00:00 2001 From: Awesome Code Date: Tue, 11 Sep 2018 03:29:48 +0000 Subject: [PATCH 23/26] Auto corrected by following Ruby rspec layout --- spec/controllers/likes_controller_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/controllers/likes_controller_spec.rb b/spec/controllers/likes_controller_spec.rb index f256e6ce3..bee2ab192 100644 --- a/spec/controllers/likes_controller_spec.rb +++ b/spec/controllers/likes_controller_spec.rb @@ -10,6 +10,7 @@ describe LikesController do describe "POST create" do before { post :create, post_id: blogpost.id, format: :json } + it { expect(response.content_type).to eq "application/json" } it { expect(Like.last.likeable_id).to eq(blogpost.id) } From ef60f74624ea3db3d2b2070fb569a424e22a2dab Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Tue, 11 Sep 2018 15:57:09 +1200 Subject: [PATCH 24/26] Removed extra blank lines --- spec/features/home/home_spec.rb | 1 - spec/views/members/show.rss.haml_spec.rb | 1 - 2 files changed, 2 deletions(-) diff --git a/spec/features/home/home_spec.rb b/spec/features/home/home_spec.rb index c8759d48b..caf3a6b90 100644 --- a/spec/features/home/home_spec.rb +++ b/spec/features/home/home_spec.rb @@ -23,7 +23,6 @@ feature "home page" do harvest.photos << photo end - before { visit root_path } shared_examples 'shows seeds' do diff --git a/spec/views/members/show.rss.haml_spec.rb b/spec/views/members/show.rss.haml_spec.rb index 46a986ae3..bb74e1526 100644 --- a/spec/views/members/show.rss.haml_spec.rb +++ b/spec/views/members/show.rss.haml_spec.rb @@ -11,7 +11,6 @@ describe 'members/show.rss.haml', type: "view" do render end - it 'shows RSS feed title' do is_expected.to match(/member\d+'s recent posts/) end From b69759754fd1930fa00cc6b8450f6731513569f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 11 Sep 2018 04:12:12 +0000 Subject: [PATCH 25/26] Bump sidekiq from 5.1.3 to 5.2.1 Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.1.3 to 5.2.1. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md) - [Commits](https://github.com/mperham/sidekiq/compare/v5.1.3...v5.2.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 00f381168..106f5d901 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -123,7 +123,7 @@ GEM rails-i18n (>= 4.0.0) sass-rails (>= 4.0.3) concurrent-ruby (1.0.5) - connection_pool (2.2.1) + connection_pool (2.2.2) coveralls (0.8.19) json (>= 1.8, < 3) simplecov (~> 0.12.0) @@ -413,7 +413,7 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) - redis (4.0.1) + redis (4.0.2) responders (2.4.0) actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) @@ -474,9 +474,8 @@ GEM rubyzip (~> 1.2) sexp_processor (4.11.0) shellany (0.0.1) - sidekiq (5.1.3) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) + sidekiq (5.2.1) + connection_pool (~> 2.2, >= 2.2.2) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) simplecov (0.12.0) From ea67df0da3a96fca030ab1e2268fc6035ce98f61 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Wed, 12 Sep 2018 10:59:13 +1200 Subject: [PATCH 26/26] Added dependabot to contributors again --- CONTRIBUTORS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 6a768ee85..fba00e2c3 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -90,5 +90,5 @@ submit the change with your pull request. ### Security and Dependency Updates - DeppBot / [deppbot](https://github.com/deppbot) -- dependabot[bot] / [dependabot-bot](https://github.com/dependabot-bot) +- dependabot[bot] / [dependabot-bot] / [dependabot] (https://github.com/dependabot-bot) - dependabot / [dependabot](https://github.com/dependabot)