From 9a24bb2fc30402798b4848f68f63f0324abea8b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 26 Feb 2019 07:24:40 +0000 Subject: [PATCH 01/23] Bump capybara from 3.13.2 to 3.14.0 Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.13.2 to 3.14.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.13.2...3.14.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 30c309ce2..524d17366 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -80,7 +80,7 @@ GEM uniform_notifier (~> 1.11) byebug (10.0.2) cancancan (2.3.0) - capybara (3.13.2) + capybara (3.14.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) From da32a2caf163edb33314a67406e0403b86543eec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 6 Mar 2019 04:49:06 +0000 Subject: [PATCH 02/23] Bump newrelic_rpm from 6.0.0.351 to 6.1.0.352 Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 6.0.0.351 to 6.1.0.352. - [Release notes](https://github.com/newrelic/rpm/releases) - [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md) - [Commits](https://github.com/newrelic/rpm/compare/6.0.0.351...6.1.0.352) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 524d17366..2fbb57c03 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -294,7 +294,7 @@ GEM multi_json (1.11.3) multi_xml (0.6.0) multipart-post (2.0.0) - newrelic_rpm (6.0.0.351) + newrelic_rpm (6.1.0.352) nio4r (2.3.1) nokogiri (1.10.1) mini_portile2 (~> 2.4.0) From ea5b622225a04b5264fd49e8be897bbd6f53fb35 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 11 Mar 2019 10:43:45 +0000 Subject: [PATCH 03/23] Bump byebug from 10.0.2 to 11.0.0 Bumps [byebug](https://github.com/deivid-rodriguez/byebug) from 10.0.2 to 11.0.0. - [Release notes](https://github.com/deivid-rodriguez/byebug/releases) - [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md) - [Commits](https://github.com/deivid-rodriguez/byebug/compare/v10.0.2...v11.0.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2fbb57c03..1a0f6367c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,7 +78,7 @@ GEM bullet (5.9.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) - byebug (10.0.2) + byebug (11.0.0) cancancan (2.3.0) capybara (3.14.0) addressable From b49a59bf72b7df8d423c584dedc299bc72ca4d6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 11 Mar 2019 11:10:14 +0000 Subject: [PATCH 04/23] Bump haml-rails from 1.0.0 to 2.0.0 Bumps [haml-rails](https://github.com/indirect/haml-rails) from 1.0.0 to 2.0.0. - [Release notes](https://github.com/indirect/haml-rails/releases) - [Commits](https://github.com/indirect/haml-rails/compare/v1.0.0...v2.0.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1a0f6367c..b15dbff9d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -194,12 +194,12 @@ GEM highline tilt trollop (= 1.16.2) - haml-rails (1.0.0) - actionpack (>= 4.0.1) - activesupport (>= 4.0.1) + haml-rails (2.0.0) + actionpack (>= 5.1) + activesupport (>= 5.1) haml (>= 4.0.6, < 6.0) html2haml (>= 1.0.1) - railties (>= 4.0.1) + railties (>= 5.1) haml_lint (0.28.0) haml (>= 4.0, < 5.1) rainbow @@ -467,7 +467,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sysexits (1.2.0) - temple (0.8.0) + temple (0.8.1) term-ansicolor (1.7.0) tins (~> 1.0) terminal-table (1.8.0) From cbf4e0a61a043cf47ba44af330cddf46852d7fa5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 12 Mar 2019 08:23:58 +0000 Subject: [PATCH 05/23] Bump faker from 1.9.2 to 1.9.3 Bumps [faker](https://github.com/stympy/faker) from 1.9.2 to 1.9.3. - [Release notes](https://github.com/stympy/faker/releases) - [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/stympy/faker/compare/v1.9.2...v1.9.3) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b15dbff9d..f48b25d97 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -164,7 +164,7 @@ GEM factory_bot_rails (4.11.1) factory_bot (~> 4.11.1) railties (>= 3.0.0) - faker (1.9.2) + faker (1.9.3) i18n (>= 0.7) faraday (0.15.4) multipart-post (>= 1.2, < 3) From da997ae5384db10f128ec571e44e15ba76979b93 Mon Sep 17 00:00:00 2001 From: Awesome Code Date: Tue, 12 Mar 2019 22:23:34 +0000 Subject: [PATCH 06/23] Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace --- spec/controllers/comments_controller_spec.rb | 8 ++++---- spec/controllers/harvests_controller_spec.rb | 12 ++++++------ spec/controllers/likes_controller_spec.rb | 6 +++--- .../photo_associations_controller_spec.rb | 2 +- spec/controllers/photos_controller_spec.rb | 18 +++++++++--------- spec/controllers/plantings_controller_spec.rb | 8 ++++---- spec/features/admin/forums_spec.rb | 2 +- spec/features/cms_spec.rb | 2 +- .../comments/commenting_a_comment_spec.rb | 2 +- spec/features/crops/alternate_name_spec.rb | 2 +- spec/features/crops/browse_crops_spec.rb | 6 +++--- spec/features/crops/creating_a_crop_spec.rb | 2 +- spec/features/crops/crop_detail_page_spec.rb | 2 +- spec/features/crops/crop_photos_spec.rb | 4 ++-- spec/features/crops/crop_wranglers_spec.rb | 6 +++--- .../crops/crop_wrangling_button_spec.rb | 2 +- spec/features/crops/delete_crop_spec.rb | 4 ++-- spec/features/crops/request_new_crop_spec.rb | 4 ++-- spec/features/crops/requested_crops_spec.rb | 2 +- spec/features/crops/show_spec.rb | 6 +++--- spec/features/gardens/gardens_index_spec.rb | 2 +- spec/features/gardens_spec.rb | 6 +++--- spec/features/harvests/browse_harvests_spec.rb | 2 +- .../harvests/harvesting_a_crop_spec.rb | 8 ++++---- spec/features/home/home_spec.rb | 4 ++-- spec/features/likeable_spec.rb | 4 ++-- spec/features/member_profile_spec.rb | 4 ++-- spec/features/members/deletion_spec.rb | 18 +++++++++--------- spec/features/notifications_spec.rb | 2 +- spec/features/places/searching_a_place_spec.rb | 8 ++++---- spec/features/planting_reminder_spec.rb | 2 +- spec/features/scientific_name_spec.rb | 2 +- spec/features/seeds/seed_photos.rb | 2 +- spec/features/shared_examples/append_date.rb | 2 +- spec/features/shared_examples/crop_suggest.rb | 6 +++--- spec/features/signin_spec.rb | 6 +++--- spec/features/unsubscribing_spec.rb | 2 +- spec/helpers/buttons_helper_spec.rb | 6 +++--- spec/helpers/photos_helper_spec.rb | 12 ++++++------ spec/mailers/notifier_spec.rb | 2 +- spec/models/ability_spec.rb | 2 +- spec/models/alternate_name_spec.rb | 2 +- spec/models/crop_spec.rb | 18 +++++++++--------- spec/models/garden_spec.rb | 10 +++++----- spec/models/like_spec.rb | 2 +- spec/models/member_spec.rb | 2 +- spec/models/photo_spec.rb | 10 +++++----- spec/models/planting_spec.rb | 8 ++++---- spec/models/post_spec.rb | 2 +- spec/models/seed_spec.rb | 6 +++--- spec/requests/api/v1/crop_request_spec.rb | 2 +- spec/requests/api/v1/harvest_request_spec.rb | 2 +- spec/requests/api/v1/photos_request_spec.rb | 2 +- spec/requests/api/v1/plantings_request_spec.rb | 2 +- spec/requests/api/v1/seeds_request_spec.rb | 2 +- spec/views/crops/_grown_for.html.haml_spec.rb | 2 +- spec/views/photos/show.html.haml_spec.rb | 6 +++--- spec/views/plantings/show.html.haml_spec.rb | 2 +- .../scientific_names/edit.html.haml_spec.rb | 2 +- spec/views/seeds/new.html.haml_spec.rb | 2 +- spec/views/seeds/show.html.haml_spec.rb | 2 +- 61 files changed, 144 insertions(+), 144 deletions(-) diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb index 2961288dc..3454f33f6 100644 --- a/spec/controllers/comments_controller_spec.rb +++ b/spec/controllers/comments_controller_spec.rb @@ -57,7 +57,7 @@ describe CommentsController do before { get :edit, params: { id: comment.to_param } } describe "my comment" do - let!(:comment) { FactoryBot.create :comment, author: member, post: post } + let!(:comment) { FactoryBot.create :comment, author: member, post: post } let!(:old_comment) { FactoryBot.create(:comment, post: post, created_at: Time.zone.yesterday) } it "assigns previous comments as @comments" do @@ -90,10 +90,10 @@ describe CommentsController do 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' } + let(:post) { FactoryBot.create :post, subject: 'our post' } + let(:other_post) { FactoryBot.create :post, subject: 'the other post' } let(:valid_attributes) { { post_id: other_post.id, body: "kōrero" } } - let(:comment) { FactoryBot.create :comment, author: member, post: post } + let(:comment) { FactoryBot.create :comment, author: member, post: post } it "does not change post_id" do comment.reload diff --git a/spec/controllers/harvests_controller_spec.rb b/spec/controllers/harvests_controller_spec.rb index 6853ff477..5e393c59a 100644 --- a/spec/controllers/harvests_controller_spec.rb +++ b/spec/controllers/harvests_controller_spec.rb @@ -13,10 +13,10 @@ describe HarvestsController do end describe "GET index" do - let!(:member1) { FactoryBot.create(:member) } - let(:member2) { FactoryBot.create(:member) } - let(:tomato) { FactoryBot.create(:tomato) } - let(:maize) { FactoryBot.create(:maize) } + let!(:member1) { FactoryBot.create(:member) } + let(:member2) { FactoryBot.create(:member) } + let(:tomato) { FactoryBot.create(:tomato) } + let(:maize) { FactoryBot.create(:maize) } let!(:harvest1) { FactoryBot.create(:harvest, owner_id: member1.id, crop_id: tomato.id) } let!(:harvest2) { FactoryBot.create(:harvest, owner_id: member2.id, crop_id: maize.id) } @@ -127,7 +127,7 @@ describe HarvestsController do describe "not my planting" do let(:not_my_planting) { FactoryBot.create(:planting) } - let(:harvest) { FactoryBot.create(:harvest) } + let(:harvest) { FactoryBot.create(:harvest) } describe "does not save planting_id" do before do @@ -183,7 +183,7 @@ describe HarvestsController do describe "not my planting" do let(:not_my_planting) { FactoryBot.create(:planting) } - let(:harvest) { FactoryBot.create(:harvest) } + let(:harvest) { FactoryBot.create(:harvest) } describe "does not save planting_id" do before do diff --git a/spec/controllers/likes_controller_spec.rb b/spec/controllers/likes_controller_spec.rb index a62c8a9cb..e16d5669d 100644 --- a/spec/controllers/likes_controller_spec.rb +++ b/spec/controllers/likes_controller_spec.rb @@ -1,10 +1,10 @@ require 'rails_helper' describe LikesController do - let(:like) { FactoryBot.create :like, member: member } - let(:member) { FactoryBot.create(:member) } + let(:like) { FactoryBot.create :like, member: member } + let(:member) { FactoryBot.create(:member) } let(:blogpost) { FactoryBot.create(:post) } - let(:mypost) { FactoryBot.create(:post, author: member) } + let(:mypost) { FactoryBot.create(:post, author: member) } before { sign_in member } diff --git a/spec/controllers/photo_associations_controller_spec.rb b/spec/controllers/photo_associations_controller_spec.rb index 269e90079..311fa01c3 100644 --- a/spec/controllers/photo_associations_controller_spec.rb +++ b/spec/controllers/photo_associations_controller_spec.rb @@ -16,7 +16,7 @@ describe PhotoAssociationsController do describe "my harvest my photo" do let(:harvest) { FactoryBot.create :harvest, owner: member } - let(:photo) { FactoryBot.create :photo, owner: member } + let(:photo) { FactoryBot.create :photo, owner: member } it "removes link" do expect { delete :destroy, params: valid_params }.to change { photo.harvests.count }.by(-1) diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb index d81f775f1..18a4d720a 100644 --- a/spec/controllers/photos_controller_spec.rb +++ b/spec/controllers/photos_controller_spec.rb @@ -15,8 +15,8 @@ describe PhotosController do describe 'crop photos' do let!(:photo) { FactoryBot.create :photo, owner: member } let!(:crop_photo) { FactoryBot.create :photo, owner: member } - let!(:planting) { FactoryBot.create :planting, crop: crop, owner: member } - let!(:crop) { FactoryBot.create :crop } + let!(:planting) { FactoryBot.create :planting, crop: crop, owner: member } + let!(:crop) { FactoryBot.create :crop } before do planting.photos << crop_photo @@ -30,10 +30,10 @@ describe PhotosController do describe "GET new" do let(:tomato) { FactoryBot.create(:tomato) } let(:planting) { FactoryBot.create(:planting, crop: tomato, owner: member) } - let(:garden) { FactoryBot.create(:garden, owner: member) } - let(:harvest) { FactoryBot.create(:harvest, owner: member) } - let(:member) { FactoryBot.create(:member) } - let!(:auth) { FactoryBot.create(:flickr_authentication, member: member) } + let(:garden) { FactoryBot.create(:garden, owner: member) } + let(:harvest) { FactoryBot.create(:harvest, owner: member) } + let(:member) { FactoryBot.create(:member) } + let!(:auth) { FactoryBot.create(:flickr_authentication, member: member) } before do sign_in member @@ -77,10 +77,10 @@ describe PhotosController do end let(:member) { FactoryBot.create(:member) } - let(:garden) { FactoryBot.create(:garden, owner: member) } + let(:garden) { FactoryBot.create(:garden, owner: member) } let(:planting) { FactoryBot.create(:planting, garden: garden, owner: member) } - let(:harvest) { FactoryBot.create(:harvest, owner: member) } - let(:photo) { FactoryBot.create(:photo, owner: member) } + let(:harvest) { FactoryBot.create(:harvest, owner: member) } + let(:photo) { FactoryBot.create(:photo, owner: member) } describe "with valid params" do before { controller.stub(:current_member) { member } } diff --git a/spec/controllers/plantings_controller_spec.rb b/spec/controllers/plantings_controller_spec.rb index d0a5c11a6..4efe2356c 100644 --- a/spec/controllers/plantings_controller_spec.rb +++ b/spec/controllers/plantings_controller_spec.rb @@ -11,10 +11,10 @@ describe PlantingsController do end describe "GET index" do - let!(:member1) { FactoryBot.create(:member) } - let!(:member2) { FactoryBot.create(:member) } - let!(:tomato) { FactoryBot.create(:tomato) } - let!(:maize) { FactoryBot.create(:maize) } + let!(:member1) { FactoryBot.create(:member) } + let!(:member2) { FactoryBot.create(:member) } + let!(:tomato) { FactoryBot.create(:tomato) } + let!(:maize) { FactoryBot.create(:maize) } let!(:planting1) { FactoryBot.create :planting, crop: tomato, owner: member1, created_at: 1.day.ago } let!(:planting2) { FactoryBot.create :planting, crop: maize, owner: member2, created_at: 5.days.ago } diff --git a/spec/features/admin/forums_spec.rb b/spec/features/admin/forums_spec.rb index 87f44f26d..988d4462e 100644 --- a/spec/features/admin/forums_spec.rb +++ b/spec/features/admin/forums_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' feature "forums", js: true do context "as an admin user" do let(:member) { create :admin_member } - let(:forum) { create :forum } + let(:forum) { create :forum } background do login_as member diff --git a/spec/features/cms_spec.rb b/spec/features/cms_spec.rb index 176c531a8..b3370cfbd 100644 --- a/spec/features/cms_spec.rb +++ b/spec/features/cms_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' feature "cms admin" do - let(:member) { create :member } + let(:member) { create :member } let(:admin_member) { create :admin_member } scenario "can't view CMS admin if not signed in" do diff --git a/spec/features/comments/commenting_a_comment_spec.rb b/spec/features/comments/commenting_a_comment_spec.rb index 75024ffb6..67856f9e0 100644 --- a/spec/features/comments/commenting_a_comment_spec.rb +++ b/spec/features/comments/commenting_a_comment_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' feature 'Commenting on a post' do let(:member) { create :member } - let(:post) { create :post, author: member } + let(:post) { create :post, author: member } background do login_as member diff --git a/spec/features/crops/alternate_name_spec.rb b/spec/features/crops/alternate_name_spec.rb index e3b36c4a8..89780154d 100644 --- a/spec/features/crops/alternate_name_spec.rb +++ b/spec/features/crops/alternate_name_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' feature "Alternate names", js: true do let!(:alternate_eggplant) { create :alternate_eggplant } - let(:crop) { alternate_eggplant.crop } + let(:crop) { alternate_eggplant.crop } scenario "Display alternate names on crop page" do visit crop_path(alternate_eggplant.crop) diff --git a/spec/features/crops/browse_crops_spec.rb b/spec/features/crops/browse_crops_spec.rb index 72e63c8fd..1b945c058 100644 --- a/spec/features/crops/browse_crops_spec.rb +++ b/spec/features/crops/browse_crops_spec.rb @@ -1,9 +1,9 @@ require 'rails_helper' feature "browse crops" do - let(:tomato) { create :tomato } - let(:maize) { create :maize } - let(:pending_crop) { create :crop_request } + let(:tomato) { create :tomato } + let(:maize) { create :maize } + let(:pending_crop) { create :crop_request } let(:rejected_crop) { create :rejected_crop } scenario "has a form for sorting by" do diff --git a/spec/features/crops/creating_a_crop_spec.rb b/spec/features/crops/creating_a_crop_spec.rb index e03179933..d1c4a9eee 100644 --- a/spec/features/crops/creating_a_crop_spec.rb +++ b/spec/features/crops/creating_a_crop_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' feature "Crop - " do let!(:crop_wrangler) { FactoryBot.create :crop_wrangling_member } - let!(:member) { FactoryBot.create :member } + let!(:member) { FactoryBot.create :member } background do login_as member diff --git a/spec/features/crops/crop_detail_page_spec.rb b/spec/features/crops/crop_detail_page_spec.rb index 6f9cba615..7a3155403 100644 --- a/spec/features/crops/crop_detail_page_spec.rb +++ b/spec/features/crops/crop_detail_page_spec.rb @@ -153,7 +153,7 @@ feature "crop detail page", js: true do context "seed quantity for a crop" do let(:member) { create :member } - let(:seed) { create :seed, crop: crop, quantity: 20, owner: member } + let(:seed) { create :seed, crop: crop, quantity: 20, owner: member } scenario "User not signed in" do visit crop_path(seed.crop) diff --git a/spec/features/crops/crop_photos_spec.rb b/spec/features/crops/crop_photos_spec.rb index fae5f84fe..f84442358 100644 --- a/spec/features/crops/crop_photos_spec.rb +++ b/spec/features/crops/crop_photos_spec.rb @@ -8,8 +8,8 @@ feature "crop detail page", js: true do let!(:crop) { FactoryBot.create :crop } let!(:planting) { FactoryBot.create :planting, crop: crop, owner: member } - let!(:harvest) { FactoryBot.create :harvest, crop: crop, owner: member } - let!(:seed) { FactoryBot.create :seed, crop: crop, owner: member } + let!(:harvest) { FactoryBot.create :harvest, crop: crop, owner: member } + let!(:seed) { FactoryBot.create :seed, crop: crop, owner: member } let!(:photo1) { FactoryBot.create(:photo, owner: member) } let!(:photo2) { FactoryBot.create(:photo, owner: member) } diff --git a/spec/features/crops/crop_wranglers_spec.rb b/spec/features/crops/crop_wranglers_spec.rb index 4dc8633ac..8cd5018f3 100644 --- a/spec/features/crops/crop_wranglers_spec.rb +++ b/spec/features/crops/crop_wranglers_spec.rb @@ -3,10 +3,10 @@ require 'rails_helper' feature "crop wranglers", js: true do context "signed in wrangler" do let!(:crop_wranglers) { create_list :crop_wrangling_member, 3 } - let(:wrangler) { crop_wranglers.first } - let!(:crops) { create_list :crop, 2 } + let(:wrangler) { crop_wranglers.first } + let!(:crops) { create_list :crop, 2 } let!(:requested_crop) { create :crop_request } - let!(:rejected_crop) { create :rejected_crop } + let!(:rejected_crop) { create :rejected_crop } background { login_as wrangler } diff --git a/spec/features/crops/crop_wrangling_button_spec.rb b/spec/features/crops/crop_wrangling_button_spec.rb index ede88f003..50be98988 100644 --- a/spec/features/crops/crop_wrangling_button_spec.rb +++ b/spec/features/crops/crop_wrangling_button_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' feature "crop wrangling button" do let(:crop_wrangler) { create :crop_wrangling_member } - let(:member) { create :member } + let(:member) { create :member } context "crop wrangling button" do background do diff --git a/spec/features/crops/delete_crop_spec.rb b/spec/features/crops/delete_crop_spec.rb index 6890c07f8..117e2de3e 100644 --- a/spec/features/crops/delete_crop_spec.rb +++ b/spec/features/crops/delete_crop_spec.rb @@ -2,8 +2,8 @@ require 'rails_helper' feature "Delete crop spec" do context "As a crop wrangler" do - let(:wrangler) { FactoryBot.create :crop_wrangling_member } - let!(:pending_crop) { FactoryBot.create :crop_request } + let(:wrangler) { FactoryBot.create :crop_wrangling_member } + let!(:pending_crop) { FactoryBot.create :crop_request } let!(:approved_crop) { FactoryBot.create :crop } background { login_as wrangler } diff --git a/spec/features/crops/request_new_crop_spec.rb b/spec/features/crops/request_new_crop_spec.rb index 9cccac4f8..6d4061f7e 100644 --- a/spec/features/crops/request_new_crop_spec.rb +++ b/spec/features/crops/request_new_crop_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' feature "Requesting a new crop" do context "As a regular member" do - let(:member) { create :member } + let(:member) { create :member } let!(:wrangler) { create :crop_wrangling_member } background do @@ -21,7 +21,7 @@ feature "Requesting a new crop" do context "As a crop wrangler" do let(:wrangler) { create :crop_wrangling_member } - let!(:crop) { create :crop_request } + let!(:crop) { create :crop_request } let!(:already_approved) { create :crop } background { login_as wrangler } diff --git a/spec/features/crops/requested_crops_spec.rb b/spec/features/crops/requested_crops_spec.rb index 15226efe4..042a3dff7 100644 --- a/spec/features/crops/requested_crops_spec.rb +++ b/spec/features/crops/requested_crops_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' feature "Crop - " do - let(:member) { create :member } + let(:member) { create :member } let!(:requested_crop) { create :crop, requester: member, approval_status: 'pending', name: 'puha for dinner' } background do diff --git a/spec/features/crops/show_spec.rb b/spec/features/crops/show_spec.rb index e7bfc0358..90c675211 100644 --- a/spec/features/crops/show_spec.rb +++ b/spec/features/crops/show_spec.rb @@ -1,9 +1,9 @@ require 'rails_helper' feature "browse crops" do - let(:tomato) { create :tomato } - let(:maize) { create :maize } - let(:pending_crop) { create :crop_request } + let(:tomato) { create :tomato } + let(:maize) { create :maize } + let(:pending_crop) { create :crop_request } let(:rejected_crop) { create :rejected_crop } scenario "Show crop info" do diff --git a/spec/features/gardens/gardens_index_spec.rb b/spec/features/gardens/gardens_index_spec.rb index 0c29e3df6..2e559cd50 100644 --- a/spec/features/gardens/gardens_index_spec.rb +++ b/spec/features/gardens/gardens_index_spec.rb @@ -72,7 +72,7 @@ feature "Gardens#index", :js do describe 'badges' do let(:garden) { member.gardens.first } let(:member) { FactoryBot.create :member, login_name: 'robbieburns' } - let(:crop) { FactoryBot.create :crop } + let(:crop) { FactoryBot.create :crop } before do # time to harvest = 50 day diff --git a/spec/features/gardens_spec.rb b/spec/features/gardens_spec.rb index ab88ea9ea..b436e947c 100644 --- a/spec/features/gardens_spec.rb +++ b/spec/features/gardens_spec.rb @@ -2,9 +2,9 @@ require 'rails_helper' feature "Planting a crop", js: true do # name is aaa to ensure it is ordered first - let!(:garden) { create :garden, name: 'aaa' } - let!(:planting) { create :planting, garden: garden, owner: garden.owner, planted_at: Date.parse("2013-3-10") } - let!(:tomato) { create :tomato } + let!(:garden) { create :garden, name: 'aaa' } + let!(:planting) { create :planting, garden: garden, owner: garden.owner, planted_at: Date.parse("2013-3-10") } + let!(:tomato) { create :tomato } let!(:finished_planting) { create :finished_planting, owner: garden.owner, garden: garden, crop: tomato } background do diff --git a/spec/features/harvests/browse_harvests_spec.rb b/spec/features/harvests/browse_harvests_spec.rb index cadbc19e7..597565aed 100644 --- a/spec/features/harvests/browse_harvests_spec.rb +++ b/spec/features/harvests/browse_harvests_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' feature "browse harvests" do subject { page } - let!(:member) { create :member } + let!(:member) { create :member } let!(:harvest) { create :harvest, owner: member } background { login_as member } diff --git a/spec/features/harvests/harvesting_a_crop_spec.rb b/spec/features/harvests/harvesting_a_crop_spec.rb index a39c54c8a..7173658bb 100644 --- a/spec/features/harvests/harvesting_a_crop_spec.rb +++ b/spec/features/harvests/harvesting_a_crop_spec.rb @@ -2,10 +2,10 @@ require 'rails_helper' require 'custom_matchers' feature "Harvesting a crop", :js, :elasticsearch do - let(:member) { create :member } - let!(:maize) { create :maize } + let(:member) { create :member } + let!(:maize) { create :maize } let!(:plant_part) { create :plant_part } - let(:planting) { create :planting, crop: maize, owner: member } + let(:planting) { create :planting, crop: maize, owner: member } background do login_as member @@ -93,7 +93,7 @@ feature "Harvesting a crop", :js, :elasticsearch do end context "Editing a harvest" do - let(:existing_harvest) { create :harvest, crop: maize, owner: member } + let(:existing_harvest) { create :harvest, crop: maize, owner: member } let!(:other_plant_part) { create :plant_part, name: 'chocolate' } background do diff --git a/spec/features/home/home_spec.rb b/spec/features/home/home_spec.rb index 812f84710..4036cb957 100644 --- a/spec/features/home/home_spec.rb +++ b/spec/features/home/home_spec.rb @@ -9,11 +9,11 @@ feature "home page" do let(:crop) { FactoryBot.create :crop, created_at: 1.day.ago } let(:planting) { FactoryBot.create :planting, owner: member, crop: crop } - let(:seed) { FactoryBot.create :tradable_seed, owner: member, crop: crop } + let(:seed) { FactoryBot.create :tradable_seed, owner: member, crop: crop } let(:harvest) { FactoryBot.create :harvest, owner: member, crop: crop } let!(:tradable_seed) { FactoryBot.create :tradable_seed, finished: false } - let!(:finished_seed) { FactoryBot.create :tradable_seed, finished: true } + let!(:finished_seed) { FactoryBot.create :tradable_seed, finished: true } let!(:untradable_seed) { FactoryBot.create :untradable_seed } background do diff --git a/spec/features/likeable_spec.rb b/spec/features/likeable_spec.rb index f0bfd15a8..a45b9a1d8 100644 --- a/spec/features/likeable_spec.rb +++ b/spec/features/likeable_spec.rb @@ -1,9 +1,9 @@ require 'rails_helper' feature 'Likeable', js: true do - let(:member) { FactoryBot.create(:member) } + let(:member) { FactoryBot.create(:member) } let(:another_member) { FactoryBot.create(:london_member) } - let(:post) { FactoryBot.create(:post) } + let(:post) { FactoryBot.create(:post) } context 'logged in member' do background do diff --git a/spec/features/member_profile_spec.rb b/spec/features/member_profile_spec.rb index ab1a1fdbc..56d7d1fae 100644 --- a/spec/features/member_profile_spec.rb +++ b/spec/features/member_profile_spec.rb @@ -103,8 +103,8 @@ feature "member profile", js: true do context "signed in member" do let(:member) { create :member } - let(:other_member) { create :member } - let(:admin_member) { create :admin_member } + let(:other_member) { create :member } + let(:admin_member) { create :admin_member } let(:crop_wrangler) { create :crop_wrangling_member } background do diff --git a/spec/features/members/deletion_spec.rb b/spec/features/members/deletion_spec.rb index 3e5cb2e88..65570e1ca 100644 --- a/spec/features/members/deletion_spec.rb +++ b/spec/features/members/deletion_spec.rb @@ -2,15 +2,15 @@ require 'rails_helper' feature "member deletion" do context "with activity and followers" do - let(:member) { FactoryBot.create(:member) } - let(:other_member) { FactoryBot.create(:member) } - let(:memberpost) { FactoryBot.create(:post, author: member) } + let(:member) { FactoryBot.create(:member) } + let(:other_member) { FactoryBot.create(:member) } + let(:memberpost) { FactoryBot.create(:post, author: member) } let(:othermemberpost) { FactoryBot.create(:post, author: other_member) } - let!(:planting) { FactoryBot.create(:planting, owner: member) } - let!(:harvest) { FactoryBot.create(:harvest, owner: member) } - let!(:seed) { FactoryBot.create(:seed, owner: member) } - let!(:secondgarden) { FactoryBot.create(:garden, owner: member) } - let(:admin) { FactoryBot.create(:admin_member) } + let!(:planting) { FactoryBot.create(:planting, owner: member) } + let!(:harvest) { FactoryBot.create(:harvest, owner: member) } + let!(:seed) { FactoryBot.create(:seed, owner: member) } + let!(:secondgarden) { FactoryBot.create(:garden, owner: member) } + let(:admin) { FactoryBot.create(:admin_member) } background do login_as(member) @@ -141,7 +141,7 @@ feature "member deletion" do context "for a crop wrangler" do let(:member) { FactoryBot.create(:crop_wrangling_member) } let(:otherwrangler) { FactoryBot.create(:crop_wrangling_member) } - let(:crop) { FactoryBot.create(:crop, creator: member) } + let(:crop) { FactoryBot.create(:crop, creator: member) } FactoryBot.create(:cropbot) let!(:ex_wrangler) { FactoryBot.create(:crop_wrangling_member, login_name: "ex_wrangler") } diff --git a/spec/features/notifications_spec.rb b/spec/features/notifications_spec.rb index 05e6e2b9a..b0ed36c6e 100644 --- a/spec/features/notifications_spec.rb +++ b/spec/features/notifications_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' feature "Notifications", :js do - let(:sender) { create :member } + let(:sender) { create :member } let(:recipient) { create :member, login_name: 'beyonce' } context "On existing notification" do diff --git a/spec/features/places/searching_a_place_spec.rb b/spec/features/places/searching_a_place_spec.rb index fb11308b5..bec7cde68 100644 --- a/spec/features/places/searching_a_place_spec.rb +++ b/spec/features/places/searching_a_place_spec.rb @@ -1,10 +1,10 @@ require "rails_helper" feature "User searches" do - let(:member) { create :member, location: "Philippines" } - let!(:maize) { create :maize } - let(:garden) { create :garden, owner: member } - let!(:seed1) { create :seed, owner: member } + let(:member) { create :member, location: "Philippines" } + let!(:maize) { create :maize } + let(:garden) { create :garden, owner: member } + let!(:seed1) { create :seed, owner: member } let!(:planting) { create :planting, garden: garden, owner: member, planted_at: Date.parse("2013-3-10") } scenario "with a valid place" do diff --git a/spec/features/planting_reminder_spec.rb b/spec/features/planting_reminder_spec.rb index 3b407c3df..53f0993da 100644 --- a/spec/features/planting_reminder_spec.rb +++ b/spec/features/planting_reminder_spec.rb @@ -3,7 +3,7 @@ require 'capybara/email/rspec' feature "Planting reminder email", :js do let(:member) { create :member } - let(:mail) { Notifier.planting_reminder(member) } + let(:mail) { Notifier.planting_reminder(member) } # Unfortunately, we can't use the default url options for ActionMailer as configured in # test.rb, since this isn't a mailer spec. diff --git a/spec/features/scientific_name_spec.rb b/spec/features/scientific_name_spec.rb index d6daf709b..009d9d3f7 100644 --- a/spec/features/scientific_name_spec.rb +++ b/spec/features/scientific_name_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' feature "Scientific names", js: true do let!(:zea_mays) { create :zea_mays } - let(:crop) { zea_mays.crop } + let(:crop) { zea_mays.crop } scenario "Display scientific names on crop page" do visit crop_path(zea_mays.crop) diff --git a/spec/features/seeds/seed_photos.rb b/spec/features/seeds/seed_photos.rb index ff8fd1db0..089d4b181 100644 --- a/spec/features/seeds/seed_photos.rb +++ b/spec/features/seeds/seed_photos.rb @@ -9,7 +9,7 @@ feature "Seeds", :js do end let(:member) { FactoryBot.create :member } - let!(:seed) { FactoryBot.create :seed, owner: member } + let!(:seed) { FactoryBot.create :seed, owner: member } it { is_expected.to have_content 'Add photo' } diff --git a/spec/features/shared_examples/append_date.rb b/spec/features/shared_examples/append_date.rb index fcb6d515b..843730ff7 100644 --- a/spec/features/shared_examples/append_date.rb +++ b/spec/features/shared_examples/append_date.rb @@ -1,6 +1,6 @@ shared_examples "append date" do let(:this_month) { Time.zone.today.strftime("%B") } - let(:this_year) { Time.zone.today.strftime("%Y") } + let(:this_year) { Time.zone.today.strftime("%Y") } background { visit path } diff --git a/spec/features/shared_examples/crop_suggest.rb b/spec/features/shared_examples/crop_suggest.rb index 0d2e688a1..2c86fea0d 100644 --- a/spec/features/shared_examples/crop_suggest.rb +++ b/spec/features/shared_examples/crop_suggest.rb @@ -1,10 +1,10 @@ require 'rails_helper' shared_examples "crop suggest" do |resource| - let!(:pea) { create :crop, name: 'pea' } - let!(:pear) { create :pear } + let!(:pea) { create :crop, name: 'pea' } + let!(:pear) { create :pear } let!(:tomato) { create :tomato } - let!(:roma) { create :roma } + let!(:roma) { create :roma } background { sync_elasticsearch [pea, pear, maize, tomato] } diff --git a/spec/features/signin_spec.rb b/spec/features/signin_spec.rb index 7f362abf3..2f9f1c1c7 100644 --- a/spec/features/signin_spec.rb +++ b/spec/features/signin_spec.rb @@ -1,9 +1,9 @@ require 'rails_helper' feature "signin", js: true do - let(:member) { FactoryBot.create :member } - let(:recipient) { FactoryBot.create :member } - let(:wrangler) { FactoryBot.create :crop_wrangling_member } + let(:member) { FactoryBot.create :member } + let(:recipient) { FactoryBot.create :member } + let(:wrangler) { FactoryBot.create :crop_wrangling_member } let(:notification) { FactoryBot.create :notification, recipient: recipient } def login diff --git a/spec/features/unsubscribing_spec.rb b/spec/features/unsubscribing_spec.rb index 8244d207a..812dc8266 100644 --- a/spec/features/unsubscribing_spec.rb +++ b/spec/features/unsubscribing_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' require 'capybara/email/rspec' feature "unsubscribe" do - let(:member) { create :member } + let(:member) { create :member } let(:notification) { create :notification } background do diff --git a/spec/helpers/buttons_helper_spec.rb b/spec/helpers/buttons_helper_spec.rb index d16d01f0e..b2112740e 100644 --- a/spec/helpers/buttons_helper_spec.rb +++ b/spec/helpers/buttons_helper_spec.rb @@ -13,10 +13,10 @@ require 'rails_helper' RSpec.describe ButtonsHelper, type: :helper do before { allow(self).to receive(:can?).and_return(true) } - let(:garden) { FactoryBot.create :garden } + let(:garden) { FactoryBot.create :garden } let(:planting) { FactoryBot.create :planting } - let(:harvest) { FactoryBot.create :harvest } - let(:seed) { FactoryBot.create :seed } + let(:harvest) { FactoryBot.create :harvest } + let(:seed) { FactoryBot.create :seed } describe 'add_photo_button' do it { expect(add_photo_button(garden)).to include "/photos/new?id=#{garden.id}&type=garden" } diff --git a/spec/helpers/photos_helper_spec.rb b/spec/helpers/photos_helper_spec.rb index 0533b6058..d52bf74c9 100644 --- a/spec/helpers/photos_helper_spec.rb +++ b/spec/helpers/photos_helper_spec.rb @@ -5,13 +5,13 @@ describe PhotosHelper do let(:garden) { FactoryBot.create :garden } - let(:garden_photo) { FactoryBot.create(:photo, thumbnail_url: 'garden.jpg', owner: garden.owner) } - let(:planting) { FactoryBot.create :planting, crop: crop, owner: garden.owner } + let(:garden_photo) { FactoryBot.create(:photo, thumbnail_url: 'garden.jpg', owner: garden.owner) } + let(:planting) { FactoryBot.create :planting, crop: crop, owner: garden.owner } let(:planting_photo) { FactoryBot.create(:photo, thumbnail_url: 'planting.jpg', owner: garden.owner) } - let(:harvest) { FactoryBot.create :harvest, crop: crop, owner: garden.owner } - let(:harvest_photo) { FactoryBot.create(:photo, thumbnail_url: 'harvest.jpg', owner: garden.owner) } - let(:seed) { FactoryBot.create :seed, crop: crop, owner: garden.owner } - let(:seed_photo) { FactoryBot.create(:photo, thumbnail_url: 'seed.jpg', owner: garden.owner) } + let(:harvest) { FactoryBot.create :harvest, crop: crop, owner: garden.owner } + let(:harvest_photo) { FactoryBot.create(:photo, thumbnail_url: 'harvest.jpg', owner: garden.owner) } + let(:seed) { FactoryBot.create :seed, crop: crop, owner: garden.owner } + let(:seed_photo) { FactoryBot.create(:photo, thumbnail_url: 'seed.jpg', owner: garden.owner) } describe "crops" do subject { crop_image_path(crop) } diff --git a/spec/mailers/notifier_spec.rb b/spec/mailers/notifier_spec.rb index 27677eab6..8b1494c0b 100644 --- a/spec/mailers/notifier_spec.rb +++ b/spec/mailers/notifier_spec.rb @@ -3,7 +3,7 @@ require "rails_helper" describe Notifier do describe "notifications" do let(:notification) { FactoryBot.create(:notification) } - let(:mail) { Notifier.notify(notification) } + let(:mail) { Notifier.notify(notification) } it 'sets the subject correctly' do mail.subject.should == notification.subject diff --git a/spec/models/ability_spec.rb b/spec/models/ability_spec.rb index 7fa8bf9c6..e6fc1c709 100644 --- a/spec/models/ability_spec.rb +++ b/spec/models/ability_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' require 'cancan/matchers' describe Ability do - let(:member) { FactoryBot.create(:member) } + let(:member) { FactoryBot.create(:member) } let(:ability) { Ability.new(member) } context "notifications" do diff --git a/spec/models/alternate_name_spec.rb b/spec/models/alternate_name_spec.rb index b7c4303e9..380904164 100644 --- a/spec/models/alternate_name_spec.rb +++ b/spec/models/alternate_name_spec.rb @@ -21,7 +21,7 @@ describe AlternateName do describe 'relationships' do let(:alternate_name) { FactoryBot.create :alternate_name, crop: crop, creator: member } - let(:crop) { FactoryBot.create :crop } + let(:crop) { FactoryBot.create :crop } let(:member) { FactoryBot.create :member } it { expect(alternate_name.crop).to eq crop } diff --git a/spec/models/crop_spec.rb b/spec/models/crop_spec.rb index 35a429656..f035bcdbf 100644 --- a/spec/models/crop_spec.rb +++ b/spec/models/crop_spec.rb @@ -1,8 +1,8 @@ require 'rails_helper' describe Crop do - let(:pp2) { FactoryBot.create(:plant_part) } - let(:pp1) { FactoryBot.create(:plant_part) } + let(:pp2) { FactoryBot.create(:plant_part) } + let(:pp1) { FactoryBot.create(:plant_part) } let(:maize) { FactoryBot.create(:maize) } context 'all fields present' do let(:crop) { FactoryBot.create(:tomato) } @@ -48,8 +48,8 @@ describe Crop do end context 'popularity' do - let(:tomato) { FactoryBot.create(:tomato) } - let(:maize) { FactoryBot.create(:maize) } + let(:tomato) { FactoryBot.create(:tomato) } + let(:maize) { FactoryBot.create(:maize) } let(:cucumber) { FactoryBot.create(:crop, name: 'cucumber') } before do @@ -337,9 +337,9 @@ describe Crop do end context "harvests" do - let(:h1) { FactoryBot.create(:harvest, crop: maize, plant_part: pp1) } - let(:h2) { FactoryBot.create(:harvest, crop: maize, plant_part: pp2) } - let!(:crop) { FactoryBot.create(:crop) } + let(:h1) { FactoryBot.create(:harvest, crop: maize, plant_part: pp1) } + let(:h2) { FactoryBot.create(:harvest, crop: maize, plant_part: pp2) } + let!(:crop) { FactoryBot.create(:crop) } let!(:harvest) { FactoryBot.create(:harvest, crop: crop) } it "has harvests" do @@ -544,8 +544,8 @@ describe Crop do context "crop-post association" do let!(:tomato) { FactoryBot.create(:tomato) } - let!(:maize) { FactoryBot.create(:maize) } - let!(:post) { FactoryBot.create(:post, body: "[maize](crop)[tomato](crop)[tomato](crop)") } + let!(:maize) { FactoryBot.create(:maize) } + let!(:post) { FactoryBot.create(:post, body: "[maize](crop)[tomato](crop)[tomato](crop)") } describe "destroying a crop" do before do diff --git a/spec/models/garden_spec.rb b/spec/models/garden_spec.rb index 67c462bb6..9ebcbdfb8 100644 --- a/spec/models/garden_spec.rb +++ b/spec/models/garden_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' describe Garden do - let(:owner) { FactoryBot.create(:member, login_name: 'hatupatu') } + let(:owner) { FactoryBot.create(:member, login_name: 'hatupatu') } let(:garden) { FactoryBot.create(:garden, owner: owner, name: 'Springfield Community Garden') } it "has a slug" do @@ -57,10 +57,10 @@ describe Garden do context "featured plantings" do let(:tomato) { FactoryBot.create(:tomato) } - let(:maize) { FactoryBot.create(:maize) } - let(:chard) { FactoryBot.create(:chard) } - let(:apple) { FactoryBot.create(:apple) } - let(:pear) { FactoryBot.create(:pear) } + let(:maize) { FactoryBot.create(:maize) } + let(:chard) { FactoryBot.create(:chard) } + let(:apple) { FactoryBot.create(:apple) } + let(:pear) { FactoryBot.create(:pear) } let(:walnut) { FactoryBot.create(:walnut) } it "fetches < 4 featured plantings if insufficient exist" do diff --git a/spec/models/like_spec.rb b/spec/models/like_spec.rb index 6c47dcddb..7a199e584 100644 --- a/spec/models/like_spec.rb +++ b/spec/models/like_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' describe 'like' do let(:member) { FactoryBot.create(:member) } - let(:post) { FactoryBot.create(:post) } + let(:post) { FactoryBot.create(:post) } context 'existing like' do before do diff --git a/spec/models/member_spec.rb b/spec/models/member_spec.rb index 0f015ae3f..ffe4f7544 100644 --- a/spec/models/member_spec.rb +++ b/spec/models/member_spec.rb @@ -175,7 +175,7 @@ describe 'member' do context 'roles' do let(:member) { FactoryBot.create(:member) } - let(:role) { FactoryBot.create(:role) } + let(:role) { FactoryBot.create(:role) } before do member.roles << role diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb index a839b6758..c262c473a 100644 --- a/spec/models/photo_spec.rb +++ b/spec/models/photo_spec.rb @@ -1,13 +1,13 @@ require 'rails_helper' describe Photo do - let(:photo) { FactoryBot.create(:photo, owner: member) } + let(:photo) { FactoryBot.create(:photo, owner: member) } let(:member) { FactoryBot.create(:member) } describe 'add/delete functionality' do let(:planting) { FactoryBot.create(:planting, owner: member) } let(:harvest) { FactoryBot.create(:harvest, owner: member) } - let(:garden) { FactoryBot.create(:garden, owner: member) } + let(:garden) { FactoryBot.create(:garden, owner: member) } context "adds photos" do it 'to a planting' do @@ -129,15 +129,15 @@ describe Photo do describe 'scopes' do let(:harvest_crop) { FactoryBot.create :crop } - let!(:harvest) { FactoryBot.create :harvest, owner: member, crop: harvest_crop } + let!(:harvest) { FactoryBot.create :harvest, owner: member, crop: harvest_crop } let!(:harvest_photo) { FactoryBot.create :photo, owner: member } let(:planting_crop) { FactoryBot.create :crop } - let!(:planting) { FactoryBot.create :planting, owner: member, crop: planting_crop } + let!(:planting) { FactoryBot.create :planting, owner: member, crop: planting_crop } let!(:planting_photo) { FactoryBot.create :photo, owner: member } let(:seed_crop) { FactoryBot.create :crop } - let!(:seed) { FactoryBot.create :seed, owner: member, crop: seed_crop } + let!(:seed) { FactoryBot.create :seed, owner: member, crop: seed_crop } let!(:seed_photo) { FactoryBot.create :photo, owner: member } before do harvest.photos << harvest_photo diff --git a/spec/models/planting_spec.rb b/spec/models/planting_spec.rb index 1ff33dccd..9c5b02eaf 100644 --- a/spec/models/planting_spec.rb +++ b/spec/models/planting_spec.rb @@ -1,10 +1,10 @@ require 'rails_helper' describe Planting do - let(:crop) { FactoryBot.create(:tomato) } + let(:crop) { FactoryBot.create(:tomato) } let(:garden_owner) { FactoryBot.create(:member, login_name: 'hatupatu') } - let(:garden) { FactoryBot.create(:garden, owner: garden_owner, name: 'Springfield Community Garden') } - let(:planting) { FactoryBot.create(:planting, crop: crop, garden: garden, owner: garden.owner) } + let(:garden) { FactoryBot.create(:garden, owner: garden_owner, name: 'Springfield Community Garden') } + let(:planting) { FactoryBot.create(:planting, crop: crop, garden: garden, owner: garden.owner) } let(:finished_planting) do FactoryBot.create :planting, planted_at: 4.days.ago, finished_at: 2.days.ago, finished: true end @@ -72,7 +72,7 @@ describe Planting do end describe 'child crop uses parent data' do - let(:child_crop) { FactoryBot.create :crop, parent: crop, name: 'child' } + let(:child_crop) { FactoryBot.create :crop, parent: crop, name: 'child' } let(:child_planting) { FactoryBot.create :planting, crop: child_crop, planted_at: 30.days.ago } # not data for this crop diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb index 7d79a62a7..127f1ad7e 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_spec.rb @@ -134,7 +134,7 @@ describe Post do let!(:tomato) { FactoryBot.create(:tomato) } let!(:maize) { FactoryBot.create(:maize) } let!(:chard) { FactoryBot.create(:chard) } - let!(:post) { FactoryBot.create(:post, body: "[maize](crop)[tomato](crop)[tomato](crop)") } + let!(:post) { FactoryBot.create(:post, body: "[maize](crop)[tomato](crop)[tomato](crop)") } it "is generated" do expect(tomato.posts).to eq [post] diff --git a/spec/models/seed_spec.rb b/spec/models/seed_spec.rb index 5991d336b..83f3f1cb8 100644 --- a/spec/models/seed_spec.rb +++ b/spec/models/seed_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' describe Seed do let(:owner) { FactoryBot.create :owner, login_name: 'tamateapokaiwhenua' } - let(:seed) { FactoryBot.build(:seed, owner: owner) } + let(:seed) { FactoryBot.build(:seed, owner: owner) } it 'saves a basic seed' do seed.save.should be(true) @@ -162,7 +162,7 @@ describe Seed do context 'ancestry' do let(:parent_planting) { FactoryBot.create :planting } - let(:seed) { FactoryBot.create :seed, parent_planting: parent_planting, owner: parent_planting.owner } + let(:seed) { FactoryBot.create :seed, parent_planting: parent_planting, owner: parent_planting.owner } it "seed has a parent planting" do expect(seed.parent_planting).to eq(parent_planting) @@ -181,7 +181,7 @@ describe Seed do end describe 'scopes' do - let!(:seed) { FactoryBot.create(:seed) } + let!(:seed) { FactoryBot.create(:seed) } let!(:finished_seed) { FactoryBot.create(:finished_seed) } describe 'has finished scope' do diff --git a/spec/requests/api/v1/crop_request_spec.rb b/spec/requests/api/v1/crop_request_spec.rb index 662b27c46..6d8353d69 100644 --- a/spec/requests/api/v1/crop_request_spec.rb +++ b/spec/requests/api/v1/crop_request_spec.rb @@ -4,7 +4,7 @@ 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) { FactoryBot.create :crop } let(:crop_encoded_as_json_api) do { "id" => crop.id.to_s, "type" => "crops", diff --git a/spec/requests/api/v1/harvest_request_spec.rb b/spec/requests/api/v1/harvest_request_spec.rb index 5b1c9b0a8..597714060 100644 --- a/spec/requests/api/v1/harvest_request_spec.rb +++ b/spec/requests/api/v1/harvest_request_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' RSpec.describe 'Harvests', type: :request do subject { JSON.parse response.body } - let(:headers) { { 'Accept' => 'application/vnd.api+json' } } + let(:headers) { { 'Accept' => 'application/vnd.api+json' } } let!(:harvest) { FactoryBot.create :harvest } let(:harvest_encoded_as_json_api) do { "id" => harvest.id.to_s, diff --git a/spec/requests/api/v1/photos_request_spec.rb b/spec/requests/api/v1/photos_request_spec.rb index 833e5499c..118aa4fcc 100644 --- a/spec/requests/api/v1/photos_request_spec.rb +++ b/spec/requests/api/v1/photos_request_spec.rb @@ -4,7 +4,7 @@ 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) { FactoryBot.create :photo } let(:photo_encoded_as_json_api) do { "id" => photo.id.to_s, "type" => "photos", diff --git a/spec/requests/api/v1/plantings_request_spec.rb b/spec/requests/api/v1/plantings_request_spec.rb index 0a9ca54dc..2085fd85f 100644 --- a/spec/requests/api/v1/plantings_request_spec.rb +++ b/spec/requests/api/v1/plantings_request_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' RSpec.describe 'Plantings', type: :request do subject { JSON.parse response.body } - let(:headers) { { 'Accept' => 'application/vnd.api+json' } } + let(:headers) { { 'Accept' => 'application/vnd.api+json' } } let!(:planting) { FactoryBot.create :planting } let(:planting_encoded_as_json_api) do { "id" => planting.id.to_s, diff --git a/spec/requests/api/v1/seeds_request_spec.rb b/spec/requests/api/v1/seeds_request_spec.rb index 000d55e14..3bde1af9d 100644 --- a/spec/requests/api/v1/seeds_request_spec.rb +++ b/spec/requests/api/v1/seeds_request_spec.rb @@ -4,7 +4,7 @@ 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) { FactoryBot.create :seed } let(:seed_encoded_as_json_api) do { "id" => seed.id.to_s, "type" => "seeds", diff --git a/spec/views/crops/_grown_for.html.haml_spec.rb b/spec/views/crops/_grown_for.html.haml_spec.rb index ccb04b28d..0aef069c3 100644 --- a/spec/views/crops/_grown_for.html.haml_spec.rb +++ b/spec/views/crops/_grown_for.html.haml_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' describe "crops/_grown_for" do - let(:crop) { FactoryBot.create(:crop) } + let(:crop) { FactoryBot.create(:crop) } let(:plant_path) { FactoryBot.create(:plant_part) } let!(:harvest) do FactoryBot.create(:harvest, diff --git a/spec/views/photos/show.html.haml_spec.rb b/spec/views/photos/show.html.haml_spec.rb index 162477aa5..fb3ad8859 100644 --- a/spec/views/photos/show.html.haml_spec.rb +++ b/spec/views/photos/show.html.haml_spec.rb @@ -10,10 +10,10 @@ describe "photos/show" do let(:member) { FactoryBot.create :member } - let(:harvest) { FactoryBot.create :harvest, owner: member } + let(:harvest) { FactoryBot.create :harvest, owner: member } let(:planting) { FactoryBot.create :planting, owner: member } - let(:seed) { FactoryBot.create :seed, owner: member } - let(:garden) { FactoryBot.create :garden, owner: member } + let(:seed) { FactoryBot.create :seed, owner: member } + let(:garden) { FactoryBot.create :garden, owner: member } shared_examples "photo data renders" do it "shows the image" do diff --git a/spec/views/plantings/show.html.haml_spec.rb b/spec/views/plantings/show.html.haml_spec.rb index 1d12e6f6d..dfd503743 100644 --- a/spec/views/plantings/show.html.haml_spec.rb +++ b/spec/views/plantings/show.html.haml_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' describe "plantings/show" do - let(:crop) { FactoryBot.create(:tomato) } + let(:crop) { FactoryBot.create(:tomato) } let(:member) { FactoryBot.create(:member) } let(:garden) { FactoryBot.create(:garden, owner: member) } let(:planting) do diff --git a/spec/views/scientific_names/edit.html.haml_spec.rb b/spec/views/scientific_names/edit.html.haml_spec.rb index 5cf1b6fe6..7c2a9de1e 100644 --- a/spec/views/scientific_names/edit.html.haml_spec.rb +++ b/spec/views/scientific_names/edit.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' describe "scientific_names/edit" do context "logged in" do - let(:member) { FactoryBot.create(:member) } + let(:member) { FactoryBot.create(:member) } let(:scientific_name) { FactoryBot.create(:zea_mays, creator: member) } before do diff --git a/spec/views/seeds/new.html.haml_spec.rb b/spec/views/seeds/new.html.haml_spec.rb index 2a132c432..6b6d6e48d 100644 --- a/spec/views/seeds/new.html.haml_spec.rb +++ b/spec/views/seeds/new.html.haml_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' describe "seeds/new" do - let!(:seed) { FactoryBot.create(:seed, owner: member) } + let!(:seed) { FactoryBot.create(:seed, owner: member) } let!(:member) { FactoryBot.create(:member) } before do diff --git a/spec/views/seeds/show.html.haml_spec.rb b/spec/views/seeds/show.html.haml_spec.rb index 2426495be..cd7507601 100644 --- a/spec/views/seeds/show.html.haml_spec.rb +++ b/spec/views/seeds/show.html.haml_spec.rb @@ -17,7 +17,7 @@ describe "seeds/show" do context "tradable" do context 'with location' do let!(:owner) { FactoryBot.create(:london_member) } - let!(:seed) { FactoryBot.create(:tradable_seed, owner: owner) } + let!(:seed) { FactoryBot.create(:tradable_seed, owner: owner) } let!(:member) { FactoryBot.create(:member) } before do From 5145ead93b392aa68d2561a7a334508993aa8ff2 Mon Sep 17 00:00:00 2001 From: Awesome Code Date: Tue, 12 Mar 2019 22:51:12 +0000 Subject: [PATCH 07/23] Auto corrected by following Lint Ruby RSpecEmptyLine --- spec/controllers/comments_controller_spec.rb | 1 + spec/controllers/crops_controller_spec.rb | 8 ++++++++ spec/controllers/likes_controller_spec.rb | 1 + spec/controllers/photos_controller_spec.rb | 3 +++ spec/features/photos/show_photo_spec.rb | 4 ++++ spec/features/signout_spec.rb | 1 + spec/models/crop_spec.rb | 1 + spec/models/photo_spec.rb | 1 + 8 files changed, 20 insertions(+) diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb index 3454f33f6..07f5ad149 100644 --- a/spec/controllers/comments_controller_spec.rb +++ b/spec/controllers/comments_controller_spec.rb @@ -36,6 +36,7 @@ describe CommentsController do before { get :new, params: { post_id: post.id } } let(:old_comment) { FactoryBot.create(:comment, post: post) } + it "picks up post from params" do expect(assigns(:post)).to eq(post) end diff --git a/spec/controllers/crops_controller_spec.rb b/spec/controllers/crops_controller_spec.rb index 112d768cd..b683715a3 100644 --- a/spec/controllers/crops_controller_spec.rb +++ b/spec/controllers/crops_controller_spec.rb @@ -11,11 +11,14 @@ describe CropsController do describe 'fetches the crop wrangler homepage' do context 'anonymous' do before { get :wrangle } + it { is_expected.not_to be_success } end + context 'wrangler' do include_context 'login as wrangler' 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) } @@ -28,6 +31,7 @@ describe CropsController do context 'wrangler' do include_context 'login as wrangler' before { get :hierarchy } + it { is_expected.to be_success } it { is_expected.to render_template("crops/hierarchy") } end @@ -55,13 +59,17 @@ describe CropsController do describe 'DELETE destroy' do let!(:crop) { FactoryBot.create :crop } + subject { delete :destroy, params: { slug: crop.to_param } } + context 'not logged in' do it { expect { subject }.not_to change { Crop.count } } end + context 'logged in as member' do it { expect { subject }.not_to change { Crop.count } } end + context 'wrangler' do include_context 'login as wrangler' it { expect { subject }.to change { Crop.count }.by -1 } diff --git a/spec/controllers/likes_controller_spec.rb b/spec/controllers/likes_controller_spec.rb index e16d5669d..516cc368f 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, params: { 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) } diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb index 18a4d720a..5b5f5f23c 100644 --- a/spec/controllers/photos_controller_spec.rb +++ b/spec/controllers/photos_controller_spec.rb @@ -8,7 +8,9 @@ describe PhotosController do describe 'GET index' do describe 'all photos' do let!(:photo) { FactoryBot.create :photo } + before { get :index } + it { expect(assigns(:photos)).to eq [photo] } end @@ -22,6 +24,7 @@ describe PhotosController do planting.photos << crop_photo get :index, params: { crop_slug: crop.to_param } end + it { expect(assigns(:crop)).to eq crop } it { expect(assigns(:photos)).to eq [crop_photo] } end diff --git a/spec/features/photos/show_photo_spec.rb b/spec/features/photos/show_photo_spec.rb index c2a23f3a7..973aa349a 100644 --- a/spec/features/photos/show_photo_spec.rb +++ b/spec/features/photos/show_photo_spec.rb @@ -15,6 +15,7 @@ feature "show photo page" do planting.photos << photo visit photo_path(photo) end + it { expect(page).to have_link "#{planting.crop.name} planting in #{planting.garden.name} by #{planting.owner}", href: planting_path(planting) @@ -32,6 +33,7 @@ feature "show photo page" do harvest.photos << photo visit photo_path(photo) end + it { expect(page).to have_link "#{harvest.crop.name} harvest by #{harvest.owner}", href: harvest_path(harvest) } it { expect(page).to have_link harvest.crop.name } end @@ -46,6 +48,7 @@ feature "show photo page" do garden.photos << photo visit photo_path(photo) end + it { expect(page).to have_link "garden named \"#{garden.name}\" by #{garden.owner}", href: garden_path(garden) } end end @@ -59,6 +62,7 @@ feature "show photo page" do seed.photos << photo visit photo_path(photo) end + it { expect(page).to have_link "#{seed.crop.name} seeds belonging to #{seed.owner}", href: seed_path(seed) } it { expect(page).to have_link seed.crop.name } end diff --git a/spec/features/signout_spec.rb b/spec/features/signout_spec.rb index 2b020a4c2..2ccfd17dc 100644 --- a/spec/features/signout_spec.rb +++ b/spec/features/signout_spec.rb @@ -4,6 +4,7 @@ feature "signout" do let(:member) { create :member } let(:path) {} + scenario "redirect to previous page after signout" do visit crops_path # some random page click_link 'Sign in' diff --git a/spec/models/crop_spec.rb b/spec/models/crop_spec.rb index f035bcdbf..bb808fb68 100644 --- a/spec/models/crop_spec.rb +++ b/spec/models/crop_spec.rb @@ -4,6 +4,7 @@ describe Crop do let(:pp2) { FactoryBot.create(:plant_part) } let(:pp1) { FactoryBot.create(:plant_part) } let(:maize) { FactoryBot.create(:maize) } + context 'all fields present' do let(:crop) { FactoryBot.create(:tomato) } diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb index c262c473a..920d57f19 100644 --- a/spec/models/photo_spec.rb +++ b/spec/models/photo_spec.rb @@ -139,6 +139,7 @@ describe Photo do let(:seed_crop) { FactoryBot.create :crop } let!(:seed) { FactoryBot.create :seed, owner: member, crop: seed_crop } let!(:seed_photo) { FactoryBot.create :photo, owner: member } + before do harvest.photos << harvest_photo planting.photos << planting_photo From fca035e537dde326ab49472ab847aaea147b91b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 12 Mar 2019 22:47:44 +0000 Subject: [PATCH 08/23] Bump rubocop from 0.64.0 to 0.65.0 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.64.0 to 0.65.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.64.0...v0.65.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f48b25d97..348f90af0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -323,7 +323,7 @@ GEM omniauth-oauth (~> 1.1) rack orm_adapter (0.5.0) - parallel (1.13.0) + parallel (1.14.0) paranoia (2.4.1) activerecord (>= 4.0, < 5.3) parser (2.6.0.0) @@ -337,6 +337,7 @@ GEM cliver (~> 0.3.1) websocket-driver (>= 0.2.0) powerpack (0.1.2) + psych (3.1.0) public_suffix (3.0.3) puma (3.12.0) rack (2.0.6) @@ -415,11 +416,12 @@ GEM rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) rspec-support (3.8.0) - rubocop (0.64.0) + rubocop (0.65.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) powerpack (~> 0.1) + psych (>= 3.1.0) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.4.0) From f488e0aeb141200f048cf4960f3dd68520b0453f Mon Sep 17 00:00:00 2001 From: Awesome Code Date: Wed, 13 Mar 2019 00:47:26 +0000 Subject: [PATCH 09/23] Auto corrected by following Lint Ruby RSpec/ExpectChange --- spec/controllers/crops_controller_spec.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/controllers/crops_controller_spec.rb b/spec/controllers/crops_controller_spec.rb index b683715a3..d510ce92a 100644 --- a/spec/controllers/crops_controller_spec.rb +++ b/spec/controllers/crops_controller_spec.rb @@ -63,16 +63,16 @@ describe CropsController do subject { delete :destroy, params: { slug: crop.to_param } } context 'not logged in' do - it { expect { subject }.not_to change { Crop.count } } + it { expect { subject }.not_to change(Crop, :count) } end context 'logged in as member' do - it { expect { subject }.not_to change { Crop.count } } + it { expect { subject }.not_to change(Crop, :count) } end context 'wrangler' do include_context 'login as wrangler' - it { expect { subject }.to change { Crop.count }.by -1 } + it { expect { subject }.to change(Crop, :count).by -1 } end end end From e7713ab24bb746690132493faad2eb1a2a4b1c14 Mon Sep 17 00:00:00 2001 From: Awesome Code Date: Wed, 13 Mar 2019 00:47:15 +0000 Subject: [PATCH 10/23] Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace --- spec/controllers/comments_controller_spec.rb | 8 ++++---- spec/controllers/harvests_controller_spec.rb | 14 +++++++------- spec/controllers/likes_controller_spec.rb | 6 +++--- .../photo_associations_controller_spec.rb | 2 +- spec/controllers/photos_controller_spec.rb | 16 ++++++++-------- spec/controllers/plantings_controller_spec.rb | 8 ++++---- spec/controllers/robots_controller_spec.rb | 2 +- spec/features/admin/forums_spec.rb | 2 +- spec/features/cms_spec.rb | 2 +- .../comments/commenting_a_comment_spec.rb | 2 +- spec/features/crops/alternate_name_spec.rb | 2 +- spec/features/crops/browse_crops_spec.rb | 6 +++--- spec/features/crops/creating_a_crop_spec.rb | 2 +- spec/features/crops/crop_detail_page_spec.rb | 2 +- spec/features/crops/crop_photos_spec.rb | 4 ++-- spec/features/crops/crop_wranglers_spec.rb | 8 ++++---- .../features/crops/crop_wrangling_button_spec.rb | 2 +- spec/features/crops/delete_crop_spec.rb | 4 ++-- spec/features/crops/request_new_crop_spec.rb | 4 ++-- spec/features/crops/requested_crops_spec.rb | 2 +- spec/features/crops/show_spec.rb | 6 +++--- spec/features/gardens/gardens_index_spec.rb | 2 +- spec/features/gardens_spec.rb | 6 +++--- spec/features/harvests/browse_harvests_spec.rb | 2 +- spec/features/harvests/harvesting_a_crop_spec.rb | 8 ++++---- spec/features/home/home_spec.rb | 4 ++-- spec/features/likeable_spec.rb | 4 ++-- spec/features/member_profile_spec.rb | 4 ++-- spec/features/members/deletion_spec.rb | 16 ++++++++-------- spec/features/members_list_spec.rb | 2 +- spec/features/notifications_spec.rb | 2 +- spec/features/places/searching_a_place_spec.rb | 8 ++++---- spec/features/planting_reminder_spec.rb | 2 +- spec/features/plantings/planting_a_crop_spec.rb | 4 ++-- spec/features/scientific_name_spec.rb | 2 +- spec/features/seeds/adding_seeds_spec.rb | 2 +- spec/features/seeds/seed_photos.rb | 2 +- spec/features/shared_examples/crop_suggest.rb | 6 +++--- spec/features/signin_spec.rb | 6 +++--- spec/features/unsubscribing_spec.rb | 2 +- spec/helpers/buttons_helper_spec.rb | 6 +++--- spec/helpers/photos_helper_spec.rb | 12 ++++++------ spec/mailers/notifier_spec.rb | 8 ++++---- spec/models/ability_spec.rb | 2 +- spec/models/alternate_name_spec.rb | 2 +- spec/models/crop_spec.rb | 14 +++++++------- spec/models/garden_spec.rb | 10 +++++----- spec/models/like_spec.rb | 2 +- spec/models/member_spec.rb | 2 +- spec/models/photo_spec.rb | 10 +++++----- spec/models/planting_spec.rb | 8 ++++---- spec/models/post_spec.rb | 4 ++-- spec/models/seed_spec.rb | 6 +++--- spec/requests/api/v1/crop_request_spec.rb | 2 +- spec/requests/api/v1/gardens_request_spec.rb | 2 +- spec/requests/api/v1/harvest_request_spec.rb | 2 +- spec/requests/api/v1/member_request_spec.rb | 2 +- spec/requests/api/v1/photos_request_spec.rb | 2 +- spec/requests/api/v1/plantings_request_spec.rb | 2 +- spec/requests/api/v1/seeds_request_spec.rb | 2 +- spec/views/crops/_grown_for.html.haml_spec.rb | 2 +- spec/views/photos/show.html.haml_spec.rb | 8 ++++---- spec/views/plantings/index.html.haml_spec.rb | 6 +++--- spec/views/plantings/show.html.haml_spec.rb | 4 ++-- .../scientific_names/edit.html.haml_spec.rb | 2 +- spec/views/seeds/new.html.haml_spec.rb | 2 +- spec/views/seeds/show.html.haml_spec.rb | 2 +- 67 files changed, 157 insertions(+), 157 deletions(-) diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb index 07f5ad149..ed5b8ad86 100644 --- a/spec/controllers/comments_controller_spec.rb +++ b/spec/controllers/comments_controller_spec.rb @@ -58,7 +58,7 @@ describe CommentsController do before { get :edit, params: { id: comment.to_param } } describe "my comment" do - let!(:comment) { FactoryBot.create :comment, author: member, post: post } + let!(:comment) { FactoryBot.create :comment, author: member, post: post } let!(:old_comment) { FactoryBot.create(:comment, post: post, created_at: Time.zone.yesterday) } it "assigns previous comments as @comments" do @@ -91,9 +91,9 @@ describe CommentsController do 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' } - let(:valid_attributes) { { post_id: other_post.id, body: "kōrero" } } + let(:post) { FactoryBot.create :post, subject: 'our post' } + let(:other_post) { FactoryBot.create :post, subject: 'the other post' } + let(:valid_attributes) { { post_id: other_post.id, body: "kōrero" } } let(:comment) { FactoryBot.create :comment, author: member, post: post } it "does not change post_id" do diff --git a/spec/controllers/harvests_controller_spec.rb b/spec/controllers/harvests_controller_spec.rb index 5e393c59a..e45f2c4c2 100644 --- a/spec/controllers/harvests_controller_spec.rb +++ b/spec/controllers/harvests_controller_spec.rb @@ -13,12 +13,12 @@ describe HarvestsController do end describe "GET index" do - let!(:member1) { FactoryBot.create(:member) } - let(:member2) { FactoryBot.create(:member) } - let(:tomato) { FactoryBot.create(:tomato) } - let(:maize) { FactoryBot.create(:maize) } + let!(:member1) { FactoryBot.create(:member) } + let(:member2) { FactoryBot.create(:member) } + let(:tomato) { FactoryBot.create(:tomato) } + let(:maize) { FactoryBot.create(:maize) } let!(:harvest1) { FactoryBot.create(:harvest, owner_id: member1.id, crop_id: tomato.id) } - let!(:harvest2) { FactoryBot.create(:harvest, owner_id: member2.id, crop_id: maize.id) } + let!(:harvest2) { FactoryBot.create(:harvest, owner_id: member2.id, crop_id: maize.id) } describe "assigns all harvests as @harvests" do before { get :index, params: {} } @@ -127,7 +127,7 @@ describe HarvestsController do describe "not my planting" do let(:not_my_planting) { FactoryBot.create(:planting) } - let(:harvest) { FactoryBot.create(:harvest) } + let(:harvest) { FactoryBot.create(:harvest) } describe "does not save planting_id" do before do @@ -183,7 +183,7 @@ describe HarvestsController do describe "not my planting" do let(:not_my_planting) { FactoryBot.create(:planting) } - let(:harvest) { FactoryBot.create(:harvest) } + let(:harvest) { FactoryBot.create(:harvest) } describe "does not save planting_id" do before do diff --git a/spec/controllers/likes_controller_spec.rb b/spec/controllers/likes_controller_spec.rb index 516cc368f..5527a595e 100644 --- a/spec/controllers/likes_controller_spec.rb +++ b/spec/controllers/likes_controller_spec.rb @@ -1,9 +1,9 @@ require 'rails_helper' describe LikesController do - let(:like) { FactoryBot.create :like, member: member } - let(:member) { FactoryBot.create(:member) } - let(:blogpost) { FactoryBot.create(:post) } + let(:like) { FactoryBot.create :like, member: member } + let(:member) { FactoryBot.create(:member) } + let(:blogpost) { FactoryBot.create(:post) } let(:mypost) { FactoryBot.create(:post, author: member) } before { sign_in member } diff --git a/spec/controllers/photo_associations_controller_spec.rb b/spec/controllers/photo_associations_controller_spec.rb index 311fa01c3..9cfe11a96 100644 --- a/spec/controllers/photo_associations_controller_spec.rb +++ b/spec/controllers/photo_associations_controller_spec.rb @@ -16,7 +16,7 @@ describe PhotoAssociationsController do describe "my harvest my photo" do let(:harvest) { FactoryBot.create :harvest, owner: member } - let(:photo) { FactoryBot.create :photo, owner: member } + let(:photo) { FactoryBot.create :photo, owner: member } it "removes link" do expect { delete :destroy, params: valid_params }.to change { photo.harvests.count }.by(-1) diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb index 5b5f5f23c..c2848f528 100644 --- a/spec/controllers/photos_controller_spec.rb +++ b/spec/controllers/photos_controller_spec.rb @@ -16,9 +16,9 @@ describe PhotosController do describe 'crop photos' do let!(:photo) { FactoryBot.create :photo, owner: member } - let!(:crop_photo) { FactoryBot.create :photo, owner: member } + let!(:crop_photo) { FactoryBot.create :photo, owner: member } let!(:planting) { FactoryBot.create :planting, crop: crop, owner: member } - let!(:crop) { FactoryBot.create :crop } + let!(:crop) { FactoryBot.create :crop } before do planting.photos << crop_photo @@ -33,9 +33,9 @@ describe PhotosController do describe "GET new" do let(:tomato) { FactoryBot.create(:tomato) } let(:planting) { FactoryBot.create(:planting, crop: tomato, owner: member) } - let(:garden) { FactoryBot.create(:garden, owner: member) } - let(:harvest) { FactoryBot.create(:harvest, owner: member) } - let(:member) { FactoryBot.create(:member) } + let(:garden) { FactoryBot.create(:garden, owner: member) } + let(:harvest) { FactoryBot.create(:harvest, owner: member) } + let(:member) { FactoryBot.create(:member) } let!(:auth) { FactoryBot.create(:flickr_authentication, member: member) } before do @@ -80,10 +80,10 @@ describe PhotosController do end let(:member) { FactoryBot.create(:member) } - let(:garden) { FactoryBot.create(:garden, owner: member) } + let(:garden) { FactoryBot.create(:garden, owner: member) } let(:planting) { FactoryBot.create(:planting, garden: garden, owner: member) } - let(:harvest) { FactoryBot.create(:harvest, owner: member) } - let(:photo) { FactoryBot.create(:photo, owner: member) } + let(:harvest) { FactoryBot.create(:harvest, owner: member) } + let(:photo) { FactoryBot.create(:photo, owner: member) } describe "with valid params" do before { controller.stub(:current_member) { member } } diff --git a/spec/controllers/plantings_controller_spec.rb b/spec/controllers/plantings_controller_spec.rb index 4efe2356c..5438b109b 100644 --- a/spec/controllers/plantings_controller_spec.rb +++ b/spec/controllers/plantings_controller_spec.rb @@ -11,10 +11,10 @@ describe PlantingsController do end describe "GET index" do - let!(:member1) { FactoryBot.create(:member) } - let!(:member2) { FactoryBot.create(:member) } - let!(:tomato) { FactoryBot.create(:tomato) } - let!(:maize) { FactoryBot.create(:maize) } + let!(:member1) { FactoryBot.create(:member) } + let!(:member2) { FactoryBot.create(:member) } + let!(:tomato) { FactoryBot.create(:tomato) } + let!(:maize) { FactoryBot.create(:maize) } let!(:planting1) { FactoryBot.create :planting, crop: tomato, owner: member1, created_at: 1.day.ago } let!(:planting2) { FactoryBot.create :planting, crop: maize, owner: member2, created_at: 5.days.ago } diff --git a/spec/controllers/robots_controller_spec.rb b/spec/controllers/robots_controller_spec.rb index e8917aa29..15ab05d82 100644 --- a/spec/controllers/robots_controller_spec.rb +++ b/spec/controllers/robots_controller_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' describe RobotsController do describe '#robots' do - let(:production_filename) { 'config/robots.txt' } + let(:production_filename) { 'config/robots.txt' } let(:staging_filename) { 'config/robots.staging.txt' } before do diff --git a/spec/features/admin/forums_spec.rb b/spec/features/admin/forums_spec.rb index 988d4462e..8cfce4915 100644 --- a/spec/features/admin/forums_spec.rb +++ b/spec/features/admin/forums_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' feature "forums", js: true do context "as an admin user" do let(:member) { create :admin_member } - let(:forum) { create :forum } + let(:forum) { create :forum } background do login_as member diff --git a/spec/features/cms_spec.rb b/spec/features/cms_spec.rb index b3370cfbd..405f77f18 100644 --- a/spec/features/cms_spec.rb +++ b/spec/features/cms_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' feature "cms admin" do - let(:member) { create :member } + let(:member) { create :member } let(:admin_member) { create :admin_member } scenario "can't view CMS admin if not signed in" do diff --git a/spec/features/comments/commenting_a_comment_spec.rb b/spec/features/comments/commenting_a_comment_spec.rb index 67856f9e0..6c195e518 100644 --- a/spec/features/comments/commenting_a_comment_spec.rb +++ b/spec/features/comments/commenting_a_comment_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' feature 'Commenting on a post' do - let(:member) { create :member } + let(:member) { create :member } let(:post) { create :post, author: member } background do diff --git a/spec/features/crops/alternate_name_spec.rb b/spec/features/crops/alternate_name_spec.rb index 89780154d..716a26bc2 100644 --- a/spec/features/crops/alternate_name_spec.rb +++ b/spec/features/crops/alternate_name_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' feature "Alternate names", js: true do let!(:alternate_eggplant) { create :alternate_eggplant } - let(:crop) { alternate_eggplant.crop } + let(:crop) { alternate_eggplant.crop } scenario "Display alternate names on crop page" do visit crop_path(alternate_eggplant.crop) diff --git a/spec/features/crops/browse_crops_spec.rb b/spec/features/crops/browse_crops_spec.rb index 1b945c058..c9a6335ec 100644 --- a/spec/features/crops/browse_crops_spec.rb +++ b/spec/features/crops/browse_crops_spec.rb @@ -1,9 +1,9 @@ require 'rails_helper' feature "browse crops" do - let(:tomato) { create :tomato } - let(:maize) { create :maize } - let(:pending_crop) { create :crop_request } + let(:tomato) { create :tomato } + let(:maize) { create :maize } + let(:pending_crop) { create :crop_request } let(:rejected_crop) { create :rejected_crop } scenario "has a form for sorting by" do diff --git a/spec/features/crops/creating_a_crop_spec.rb b/spec/features/crops/creating_a_crop_spec.rb index d1c4a9eee..64eff3628 100644 --- a/spec/features/crops/creating_a_crop_spec.rb +++ b/spec/features/crops/creating_a_crop_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' feature "Crop - " do let!(:crop_wrangler) { FactoryBot.create :crop_wrangling_member } - let!(:member) { FactoryBot.create :member } + let!(:member) { FactoryBot.create :member } background do login_as member diff --git a/spec/features/crops/crop_detail_page_spec.rb b/spec/features/crops/crop_detail_page_spec.rb index 7a3155403..6386c7044 100644 --- a/spec/features/crops/crop_detail_page_spec.rb +++ b/spec/features/crops/crop_detail_page_spec.rb @@ -152,7 +152,7 @@ feature "crop detail page", js: true do end context "seed quantity for a crop" do - let(:member) { create :member } + let(:member) { create :member } let(:seed) { create :seed, crop: crop, quantity: 20, owner: member } scenario "User not signed in" do diff --git a/spec/features/crops/crop_photos_spec.rb b/spec/features/crops/crop_photos_spec.rb index f84442358..0d7d1fbee 100644 --- a/spec/features/crops/crop_photos_spec.rb +++ b/spec/features/crops/crop_photos_spec.rb @@ -8,8 +8,8 @@ feature "crop detail page", js: true do let!(:crop) { FactoryBot.create :crop } let!(:planting) { FactoryBot.create :planting, crop: crop, owner: member } - let!(:harvest) { FactoryBot.create :harvest, crop: crop, owner: member } - let!(:seed) { FactoryBot.create :seed, crop: crop, owner: member } + let!(:harvest) { FactoryBot.create :harvest, crop: crop, owner: member } + let!(:seed) { FactoryBot.create :seed, crop: crop, owner: member } let!(:photo1) { FactoryBot.create(:photo, owner: member) } let!(:photo2) { FactoryBot.create(:photo, owner: member) } diff --git a/spec/features/crops/crop_wranglers_spec.rb b/spec/features/crops/crop_wranglers_spec.rb index 8cd5018f3..f9db489b2 100644 --- a/spec/features/crops/crop_wranglers_spec.rb +++ b/spec/features/crops/crop_wranglers_spec.rb @@ -3,10 +3,10 @@ require 'rails_helper' feature "crop wranglers", js: true do context "signed in wrangler" do let!(:crop_wranglers) { create_list :crop_wrangling_member, 3 } - let(:wrangler) { crop_wranglers.first } - let!(:crops) { create_list :crop, 2 } - let!(:requested_crop) { create :crop_request } - let!(:rejected_crop) { create :rejected_crop } + let(:wrangler) { crop_wranglers.first } + let!(:crops) { create_list :crop, 2 } + let!(:requested_crop) { create :crop_request } + let!(:rejected_crop) { create :rejected_crop } background { login_as wrangler } diff --git a/spec/features/crops/crop_wrangling_button_spec.rb b/spec/features/crops/crop_wrangling_button_spec.rb index 50be98988..bf285ba66 100644 --- a/spec/features/crops/crop_wrangling_button_spec.rb +++ b/spec/features/crops/crop_wrangling_button_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' feature "crop wrangling button" do let(:crop_wrangler) { create :crop_wrangling_member } - let(:member) { create :member } + let(:member) { create :member } context "crop wrangling button" do background do diff --git a/spec/features/crops/delete_crop_spec.rb b/spec/features/crops/delete_crop_spec.rb index 117e2de3e..f1302c784 100644 --- a/spec/features/crops/delete_crop_spec.rb +++ b/spec/features/crops/delete_crop_spec.rb @@ -3,8 +3,8 @@ require 'rails_helper' feature "Delete crop spec" do context "As a crop wrangler" do let(:wrangler) { FactoryBot.create :crop_wrangling_member } - let!(:pending_crop) { FactoryBot.create :crop_request } - let!(:approved_crop) { FactoryBot.create :crop } + let!(:pending_crop) { FactoryBot.create :crop_request } + let!(:approved_crop) { FactoryBot.create :crop } background { login_as wrangler } diff --git a/spec/features/crops/request_new_crop_spec.rb b/spec/features/crops/request_new_crop_spec.rb index 6d4061f7e..1374d1176 100644 --- a/spec/features/crops/request_new_crop_spec.rb +++ b/spec/features/crops/request_new_crop_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' feature "Requesting a new crop" do context "As a regular member" do - let(:member) { create :member } + let(:member) { create :member } let!(:wrangler) { create :crop_wrangling_member } background do @@ -22,7 +22,7 @@ feature "Requesting a new crop" do context "As a crop wrangler" do let(:wrangler) { create :crop_wrangling_member } let!(:crop) { create :crop_request } - let!(:already_approved) { create :crop } + let!(:already_approved) { create :crop } background { login_as wrangler } diff --git a/spec/features/crops/requested_crops_spec.rb b/spec/features/crops/requested_crops_spec.rb index 042a3dff7..2ab750fe7 100644 --- a/spec/features/crops/requested_crops_spec.rb +++ b/spec/features/crops/requested_crops_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' feature "Crop - " do - let(:member) { create :member } + let(:member) { create :member } let!(:requested_crop) { create :crop, requester: member, approval_status: 'pending', name: 'puha for dinner' } background do diff --git a/spec/features/crops/show_spec.rb b/spec/features/crops/show_spec.rb index 90c675211..cc5ff75db 100644 --- a/spec/features/crops/show_spec.rb +++ b/spec/features/crops/show_spec.rb @@ -1,9 +1,9 @@ require 'rails_helper' feature "browse crops" do - let(:tomato) { create :tomato } - let(:maize) { create :maize } - let(:pending_crop) { create :crop_request } + let(:tomato) { create :tomato } + let(:maize) { create :maize } + let(:pending_crop) { create :crop_request } let(:rejected_crop) { create :rejected_crop } scenario "Show crop info" do diff --git a/spec/features/gardens/gardens_index_spec.rb b/spec/features/gardens/gardens_index_spec.rb index 2e559cd50..b5b929df1 100644 --- a/spec/features/gardens/gardens_index_spec.rb +++ b/spec/features/gardens/gardens_index_spec.rb @@ -72,7 +72,7 @@ feature "Gardens#index", :js do describe 'badges' do let(:garden) { member.gardens.first } let(:member) { FactoryBot.create :member, login_name: 'robbieburns' } - let(:crop) { FactoryBot.create :crop } + let(:crop) { FactoryBot.create :crop } before do # time to harvest = 50 day diff --git a/spec/features/gardens_spec.rb b/spec/features/gardens_spec.rb index b436e947c..504ecda49 100644 --- a/spec/features/gardens_spec.rb +++ b/spec/features/gardens_spec.rb @@ -2,10 +2,10 @@ require 'rails_helper' feature "Planting a crop", js: true do # name is aaa to ensure it is ordered first - let!(:garden) { create :garden, name: 'aaa' } + let!(:garden) { create :garden, name: 'aaa' } let!(:planting) { create :planting, garden: garden, owner: garden.owner, planted_at: Date.parse("2013-3-10") } - let!(:tomato) { create :tomato } - let!(:finished_planting) { create :finished_planting, owner: garden.owner, garden: garden, crop: tomato } + let!(:tomato) { create :tomato } + let!(:finished_planting) { create :finished_planting, owner: garden.owner, garden: garden, crop: tomato } background do login_as garden.owner diff --git a/spec/features/harvests/browse_harvests_spec.rb b/spec/features/harvests/browse_harvests_spec.rb index 597565aed..b2409c122 100644 --- a/spec/features/harvests/browse_harvests_spec.rb +++ b/spec/features/harvests/browse_harvests_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' feature "browse harvests" do subject { page } - let!(:member) { create :member } + let!(:member) { create :member } let!(:harvest) { create :harvest, owner: member } background { login_as member } diff --git a/spec/features/harvests/harvesting_a_crop_spec.rb b/spec/features/harvests/harvesting_a_crop_spec.rb index 7173658bb..f30d12baa 100644 --- a/spec/features/harvests/harvesting_a_crop_spec.rb +++ b/spec/features/harvests/harvesting_a_crop_spec.rb @@ -2,9 +2,9 @@ require 'rails_helper' require 'custom_matchers' feature "Harvesting a crop", :js, :elasticsearch do - let(:member) { create :member } - let!(:maize) { create :maize } - let!(:plant_part) { create :plant_part } + let(:member) { create :member } + let!(:maize) { create :maize } + let!(:plant_part) { create :plant_part } let(:planting) { create :planting, crop: maize, owner: member } background do @@ -94,7 +94,7 @@ feature "Harvesting a crop", :js, :elasticsearch do context "Editing a harvest" do let(:existing_harvest) { create :harvest, crop: maize, owner: member } - let!(:other_plant_part) { create :plant_part, name: 'chocolate' } + let!(:other_plant_part) { create :plant_part, name: 'chocolate' } background do visit harvest_path(existing_harvest) diff --git a/spec/features/home/home_spec.rb b/spec/features/home/home_spec.rb index 4036cb957..7376de882 100644 --- a/spec/features/home/home_spec.rb +++ b/spec/features/home/home_spec.rb @@ -10,11 +10,11 @@ feature "home page" do let(:planting) { FactoryBot.create :planting, owner: member, crop: crop } let(:seed) { FactoryBot.create :tradable_seed, owner: member, crop: crop } - let(:harvest) { FactoryBot.create :harvest, owner: member, crop: crop } + let(:harvest) { FactoryBot.create :harvest, owner: member, crop: crop } 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 } + let!(:untradable_seed) { FactoryBot.create :untradable_seed } background do # Add photos, so they can appear on home page diff --git a/spec/features/likeable_spec.rb b/spec/features/likeable_spec.rb index a45b9a1d8..d1b637e0d 100644 --- a/spec/features/likeable_spec.rb +++ b/spec/features/likeable_spec.rb @@ -1,9 +1,9 @@ require 'rails_helper' feature 'Likeable', js: true do - let(:member) { FactoryBot.create(:member) } + let(:member) { FactoryBot.create(:member) } let(:another_member) { FactoryBot.create(:london_member) } - let(:post) { FactoryBot.create(:post) } + let(:post) { FactoryBot.create(:post) } context 'logged in member' do background do diff --git a/spec/features/member_profile_spec.rb b/spec/features/member_profile_spec.rb index 56d7d1fae..a548c7eb0 100644 --- a/spec/features/member_profile_spec.rb +++ b/spec/features/member_profile_spec.rb @@ -103,8 +103,8 @@ feature "member profile", js: true do context "signed in member" do let(:member) { create :member } - let(:other_member) { create :member } - let(:admin_member) { create :admin_member } + let(:other_member) { create :member } + let(:admin_member) { create :admin_member } let(:crop_wrangler) { create :crop_wrangling_member } background do diff --git a/spec/features/members/deletion_spec.rb b/spec/features/members/deletion_spec.rb index 65570e1ca..3c392cb4c 100644 --- a/spec/features/members/deletion_spec.rb +++ b/spec/features/members/deletion_spec.rb @@ -2,15 +2,15 @@ require 'rails_helper' feature "member deletion" do context "with activity and followers" do - let(:member) { FactoryBot.create(:member) } - let(:other_member) { FactoryBot.create(:member) } - let(:memberpost) { FactoryBot.create(:post, author: member) } + let(:member) { FactoryBot.create(:member) } + let(:other_member) { FactoryBot.create(:member) } + let(:memberpost) { FactoryBot.create(:post, author: member) } let(:othermemberpost) { FactoryBot.create(:post, author: other_member) } - let!(:planting) { FactoryBot.create(:planting, owner: member) } - let!(:harvest) { FactoryBot.create(:harvest, owner: member) } - let!(:seed) { FactoryBot.create(:seed, owner: member) } - let!(:secondgarden) { FactoryBot.create(:garden, owner: member) } - let(:admin) { FactoryBot.create(:admin_member) } + let!(:planting) { FactoryBot.create(:planting, owner: member) } + let!(:harvest) { FactoryBot.create(:harvest, owner: member) } + let!(:seed) { FactoryBot.create(:seed, owner: member) } + let!(:secondgarden) { FactoryBot.create(:garden, owner: member) } + let(:admin) { FactoryBot.create(:admin_member) } background do login_as(member) diff --git a/spec/features/members_list_spec.rb b/spec/features/members_list_spec.rb index 01b6ee8bd..184efbfb6 100644 --- a/spec/features/members_list_spec.rb +++ b/spec/features/members_list_spec.rb @@ -4,7 +4,7 @@ feature "members list" do context "list all members" do let!(:member1) { create :member, login_name: "Archaeopteryx", confirmed_at: Time.zone.parse('2013-02-10') } let!(:member2) { create :member, login_name: "Zephyrosaurus", confirmed_at: Time.zone.parse('2014-01-11') } - let!(:member3) { create :member, login_name: "Testingname", confirmed_at: Time.zone.parse('2014-05-09') } + let!(:member3) { create :member, login_name: "Testingname", confirmed_at: Time.zone.parse('2014-05-09') } scenario "default alphabetical sort" do visit members_path diff --git a/spec/features/notifications_spec.rb b/spec/features/notifications_spec.rb index b0ed36c6e..a5c544552 100644 --- a/spec/features/notifications_spec.rb +++ b/spec/features/notifications_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' feature "Notifications", :js do - let(:sender) { create :member } + let(:sender) { create :member } let(:recipient) { create :member, login_name: 'beyonce' } context "On existing notification" do diff --git a/spec/features/places/searching_a_place_spec.rb b/spec/features/places/searching_a_place_spec.rb index bec7cde68..7a2d12898 100644 --- a/spec/features/places/searching_a_place_spec.rb +++ b/spec/features/places/searching_a_place_spec.rb @@ -1,10 +1,10 @@ require "rails_helper" feature "User searches" do - let(:member) { create :member, location: "Philippines" } - let!(:maize) { create :maize } - let(:garden) { create :garden, owner: member } - let!(:seed1) { create :seed, owner: member } + let(:member) { create :member, location: "Philippines" } + let!(:maize) { create :maize } + let(:garden) { create :garden, owner: member } + let!(:seed1) { create :seed, owner: member } let!(:planting) { create :planting, garden: garden, owner: member, planted_at: Date.parse("2013-3-10") } scenario "with a valid place" do diff --git a/spec/features/planting_reminder_spec.rb b/spec/features/planting_reminder_spec.rb index 53f0993da..e13803182 100644 --- a/spec/features/planting_reminder_spec.rb +++ b/spec/features/planting_reminder_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' require 'capybara/email/rspec' feature "Planting reminder email", :js do - let(:member) { create :member } + let(:member) { create :member } let(:mail) { Notifier.planting_reminder(member) } # Unfortunately, we can't use the default url options for ActionMailer as configured in diff --git a/spec/features/plantings/planting_a_crop_spec.rb b/spec/features/plantings/planting_a_crop_spec.rb index 386ee6407..8cb70fc5a 100644 --- a/spec/features/plantings/planting_a_crop_spec.rb +++ b/spec/features/plantings/planting_a_crop_spec.rb @@ -2,8 +2,8 @@ require "rails_helper" require 'custom_matchers' feature "Planting a crop", :js, :elasticsearch do - let(:member) { FactoryBot.create :member } - let!(:maize) { FactoryBot.create :maize } + let(:member) { FactoryBot.create :member } + let!(:maize) { FactoryBot.create :maize } let(:garden) { FactoryBot.create :garden, owner: member } let!(:planting) do FactoryBot.create :planting, garden: garden, owner: member, planted_at: Date.parse("2013-03-10") diff --git a/spec/features/scientific_name_spec.rb b/spec/features/scientific_name_spec.rb index 009d9d3f7..3844a3a07 100644 --- a/spec/features/scientific_name_spec.rb +++ b/spec/features/scientific_name_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' feature "Scientific names", js: true do let!(:zea_mays) { create :zea_mays } - let(:crop) { zea_mays.crop } + let(:crop) { zea_mays.crop } scenario "Display scientific names on crop page" do visit crop_path(zea_mays.crop) diff --git a/spec/features/seeds/adding_seeds_spec.rb b/spec/features/seeds/adding_seeds_spec.rb index f87d8f59d..2964a5ab3 100644 --- a/spec/features/seeds/adding_seeds_spec.rb +++ b/spec/features/seeds/adding_seeds_spec.rb @@ -3,7 +3,7 @@ require 'custom_matchers' feature "Seeds", :js, :elasticsearch do let(:member) { create :member } - let!(:maize) { create :maize } + let!(:maize) { create :maize } background do login_as member diff --git a/spec/features/seeds/seed_photos.rb b/spec/features/seeds/seed_photos.rb index 089d4b181..60746d98b 100644 --- a/spec/features/seeds/seed_photos.rb +++ b/spec/features/seeds/seed_photos.rb @@ -8,7 +8,7 @@ feature "Seeds", :js do page end - let(:member) { FactoryBot.create :member } + let(:member) { FactoryBot.create :member } let!(:seed) { FactoryBot.create :seed, owner: member } it { is_expected.to have_content 'Add photo' } diff --git a/spec/features/shared_examples/crop_suggest.rb b/spec/features/shared_examples/crop_suggest.rb index 2c86fea0d..b646ba7df 100644 --- a/spec/features/shared_examples/crop_suggest.rb +++ b/spec/features/shared_examples/crop_suggest.rb @@ -2,9 +2,9 @@ require 'rails_helper' shared_examples "crop suggest" do |resource| let!(:pea) { create :crop, name: 'pea' } - let!(:pear) { create :pear } - let!(:tomato) { create :tomato } - let!(:roma) { create :roma } + let!(:pear) { create :pear } + let!(:tomato) { create :tomato } + let!(:roma) { create :roma } background { sync_elasticsearch [pea, pear, maize, tomato] } diff --git a/spec/features/signin_spec.rb b/spec/features/signin_spec.rb index 2f9f1c1c7..07fd6a130 100644 --- a/spec/features/signin_spec.rb +++ b/spec/features/signin_spec.rb @@ -1,9 +1,9 @@ require 'rails_helper' feature "signin", js: true do - let(:member) { FactoryBot.create :member } - let(:recipient) { FactoryBot.create :member } - let(:wrangler) { FactoryBot.create :crop_wrangling_member } + let(:member) { FactoryBot.create :member } + let(:recipient) { FactoryBot.create :member } + let(:wrangler) { FactoryBot.create :crop_wrangling_member } let(:notification) { FactoryBot.create :notification, recipient: recipient } def login diff --git a/spec/features/unsubscribing_spec.rb b/spec/features/unsubscribing_spec.rb index 812dc8266..3f7843034 100644 --- a/spec/features/unsubscribing_spec.rb +++ b/spec/features/unsubscribing_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' require 'capybara/email/rspec' feature "unsubscribe" do - let(:member) { create :member } + let(:member) { create :member } let(:notification) { create :notification } background do diff --git a/spec/helpers/buttons_helper_spec.rb b/spec/helpers/buttons_helper_spec.rb index b2112740e..b9bdc41a2 100644 --- a/spec/helpers/buttons_helper_spec.rb +++ b/spec/helpers/buttons_helper_spec.rb @@ -13,10 +13,10 @@ require 'rails_helper' RSpec.describe ButtonsHelper, type: :helper do before { allow(self).to receive(:can?).and_return(true) } - let(:garden) { FactoryBot.create :garden } + let(:garden) { FactoryBot.create :garden } let(:planting) { FactoryBot.create :planting } - let(:harvest) { FactoryBot.create :harvest } - let(:seed) { FactoryBot.create :seed } + let(:harvest) { FactoryBot.create :harvest } + let(:seed) { FactoryBot.create :seed } describe 'add_photo_button' do it { expect(add_photo_button(garden)).to include "/photos/new?id=#{garden.id}&type=garden" } diff --git a/spec/helpers/photos_helper_spec.rb b/spec/helpers/photos_helper_spec.rb index d52bf74c9..60a6cbc59 100644 --- a/spec/helpers/photos_helper_spec.rb +++ b/spec/helpers/photos_helper_spec.rb @@ -5,13 +5,13 @@ describe PhotosHelper do let(:garden) { FactoryBot.create :garden } - let(:garden_photo) { FactoryBot.create(:photo, thumbnail_url: 'garden.jpg', owner: garden.owner) } - let(:planting) { FactoryBot.create :planting, crop: crop, owner: garden.owner } + let(:garden_photo) { FactoryBot.create(:photo, thumbnail_url: 'garden.jpg', owner: garden.owner) } + let(:planting) { FactoryBot.create :planting, crop: crop, owner: garden.owner } let(:planting_photo) { FactoryBot.create(:photo, thumbnail_url: 'planting.jpg', owner: garden.owner) } - let(:harvest) { FactoryBot.create :harvest, crop: crop, owner: garden.owner } - let(:harvest_photo) { FactoryBot.create(:photo, thumbnail_url: 'harvest.jpg', owner: garden.owner) } - let(:seed) { FactoryBot.create :seed, crop: crop, owner: garden.owner } - let(:seed_photo) { FactoryBot.create(:photo, thumbnail_url: 'seed.jpg', owner: garden.owner) } + let(:harvest) { FactoryBot.create :harvest, crop: crop, owner: garden.owner } + let(:harvest_photo) { FactoryBot.create(:photo, thumbnail_url: 'harvest.jpg', owner: garden.owner) } + let(:seed) { FactoryBot.create :seed, crop: crop, owner: garden.owner } + let(:seed_photo) { FactoryBot.create(:photo, thumbnail_url: 'seed.jpg', owner: garden.owner) } describe "crops" do subject { crop_image_path(crop) } diff --git a/spec/mailers/notifier_spec.rb b/spec/mailers/notifier_spec.rb index 8b1494c0b..791137c59 100644 --- a/spec/mailers/notifier_spec.rb +++ b/spec/mailers/notifier_spec.rb @@ -3,7 +3,7 @@ require "rails_helper" describe Notifier do describe "notifications" do let(:notification) { FactoryBot.create(:notification) } - let(:mail) { Notifier.notify(notification) } + let(:mail) { Notifier.notify(notification) } it 'sets the subject correctly' do mail.subject.should == notification.subject @@ -45,7 +45,7 @@ describe Notifier do describe "new crop request" do let(:member) { FactoryBot.create(:crop_wrangling_member) } - let(:crop) { FactoryBot.create(:crop_request) } + let(:crop) { FactoryBot.create(:crop_request) } let(:mail) { Notifier.new_crop_request(member, crop) } it 'sets the subject correctly' do @@ -67,7 +67,7 @@ describe Notifier do describe "crop approved" do let(:member) { FactoryBot.create(:member) } - let(:crop) { FactoryBot.create(:crop) } + let(:crop) { FactoryBot.create(:crop) } let(:mail) { Notifier.crop_request_approved(member, crop) } it 'sets the subject correctly' do @@ -95,7 +95,7 @@ describe Notifier do describe "crop rejected" do let(:member) { FactoryBot.create(:member) } - let(:crop) { FactoryBot.create(:rejected_crop) } + let(:crop) { FactoryBot.create(:rejected_crop) } let(:mail) { Notifier.crop_request_rejected(member, crop) } it 'sets the subject correctly' do diff --git a/spec/models/ability_spec.rb b/spec/models/ability_spec.rb index e6fc1c709..9a2ad8e29 100644 --- a/spec/models/ability_spec.rb +++ b/spec/models/ability_spec.rb @@ -3,7 +3,7 @@ require 'cancan/matchers' describe Ability do let(:member) { FactoryBot.create(:member) } - let(:ability) { Ability.new(member) } + let(:ability) { Ability.new(member) } context "notifications" do it 'member can view their own notifications' do diff --git a/spec/models/alternate_name_spec.rb b/spec/models/alternate_name_spec.rb index 380904164..f7123d701 100644 --- a/spec/models/alternate_name_spec.rb +++ b/spec/models/alternate_name_spec.rb @@ -21,7 +21,7 @@ describe AlternateName do describe 'relationships' do let(:alternate_name) { FactoryBot.create :alternate_name, crop: crop, creator: member } - let(:crop) { FactoryBot.create :crop } + let(:crop) { FactoryBot.create :crop } let(:member) { FactoryBot.create :member } it { expect(alternate_name.crop).to eq crop } diff --git a/spec/models/crop_spec.rb b/spec/models/crop_spec.rb index bb808fb68..4cd9c3fc1 100644 --- a/spec/models/crop_spec.rb +++ b/spec/models/crop_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' describe Crop do let(:pp2) { FactoryBot.create(:plant_part) } let(:pp1) { FactoryBot.create(:plant_part) } - let(:maize) { FactoryBot.create(:maize) } + let(:maize) { FactoryBot.create(:maize) } context 'all fields present' do let(:crop) { FactoryBot.create(:tomato) } @@ -49,8 +49,8 @@ describe Crop do end context 'popularity' do - let(:tomato) { FactoryBot.create(:tomato) } - let(:maize) { FactoryBot.create(:maize) } + let(:tomato) { FactoryBot.create(:tomato) } + let(:maize) { FactoryBot.create(:maize) } let(:cucumber) { FactoryBot.create(:crop, name: 'cucumber') } before do @@ -340,8 +340,8 @@ describe Crop do context "harvests" do let(:h1) { FactoryBot.create(:harvest, crop: maize, plant_part: pp1) } let(:h2) { FactoryBot.create(:harvest, crop: maize, plant_part: pp2) } - let!(:crop) { FactoryBot.create(:crop) } - let!(:harvest) { FactoryBot.create(:harvest, crop: crop) } + let!(:crop) { FactoryBot.create(:crop) } + let!(:harvest) { FactoryBot.create(:harvest, crop: crop) } it "has harvests" do expect(crop.harvests).to eq [harvest] @@ -544,8 +544,8 @@ describe Crop do end context "crop-post association" do - let!(:tomato) { FactoryBot.create(:tomato) } - let!(:maize) { FactoryBot.create(:maize) } + let!(:tomato) { FactoryBot.create(:tomato) } + let!(:maize) { FactoryBot.create(:maize) } let!(:post) { FactoryBot.create(:post, body: "[maize](crop)[tomato](crop)[tomato](crop)") } describe "destroying a crop" do diff --git a/spec/models/garden_spec.rb b/spec/models/garden_spec.rb index 9ebcbdfb8..e538c2d1a 100644 --- a/spec/models/garden_spec.rb +++ b/spec/models/garden_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' describe Garden do - let(:owner) { FactoryBot.create(:member, login_name: 'hatupatu') } + let(:owner) { FactoryBot.create(:member, login_name: 'hatupatu') } let(:garden) { FactoryBot.create(:garden, owner: owner, name: 'Springfield Community Garden') } it "has a slug" do @@ -57,10 +57,10 @@ describe Garden do context "featured plantings" do let(:tomato) { FactoryBot.create(:tomato) } - let(:maize) { FactoryBot.create(:maize) } - let(:chard) { FactoryBot.create(:chard) } - let(:apple) { FactoryBot.create(:apple) } - let(:pear) { FactoryBot.create(:pear) } + let(:maize) { FactoryBot.create(:maize) } + let(:chard) { FactoryBot.create(:chard) } + let(:apple) { FactoryBot.create(:apple) } + let(:pear) { FactoryBot.create(:pear) } let(:walnut) { FactoryBot.create(:walnut) } it "fetches < 4 featured plantings if insufficient exist" do diff --git a/spec/models/like_spec.rb b/spec/models/like_spec.rb index 7a199e584..363585aea 100644 --- a/spec/models/like_spec.rb +++ b/spec/models/like_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' describe 'like' do let(:member) { FactoryBot.create(:member) } - let(:post) { FactoryBot.create(:post) } + let(:post) { FactoryBot.create(:post) } context 'existing like' do before do diff --git a/spec/models/member_spec.rb b/spec/models/member_spec.rb index ffe4f7544..16ad228fb 100644 --- a/spec/models/member_spec.rb +++ b/spec/models/member_spec.rb @@ -175,7 +175,7 @@ describe 'member' do context 'roles' do let(:member) { FactoryBot.create(:member) } - let(:role) { FactoryBot.create(:role) } + let(:role) { FactoryBot.create(:role) } before do member.roles << role diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb index 920d57f19..d71a6cd1c 100644 --- a/spec/models/photo_spec.rb +++ b/spec/models/photo_spec.rb @@ -2,12 +2,12 @@ require 'rails_helper' describe Photo do let(:photo) { FactoryBot.create(:photo, owner: member) } - let(:member) { FactoryBot.create(:member) } + let(:member) { FactoryBot.create(:member) } describe 'add/delete functionality' do let(:planting) { FactoryBot.create(:planting, owner: member) } let(:harvest) { FactoryBot.create(:harvest, owner: member) } - let(:garden) { FactoryBot.create(:garden, owner: member) } + let(:garden) { FactoryBot.create(:garden, owner: member) } context "adds photos" do it 'to a planting' do @@ -130,15 +130,15 @@ describe Photo do describe 'scopes' do let(:harvest_crop) { FactoryBot.create :crop } let!(:harvest) { FactoryBot.create :harvest, owner: member, crop: harvest_crop } - let!(:harvest_photo) { FactoryBot.create :photo, owner: member } + let!(:harvest_photo) { FactoryBot.create :photo, owner: member } let(:planting_crop) { FactoryBot.create :crop } let!(:planting) { FactoryBot.create :planting, owner: member, crop: planting_crop } - let!(:planting_photo) { FactoryBot.create :photo, owner: member } + let!(:planting_photo) { FactoryBot.create :photo, owner: member } let(:seed_crop) { FactoryBot.create :crop } let!(:seed) { FactoryBot.create :seed, owner: member, crop: seed_crop } - let!(:seed_photo) { FactoryBot.create :photo, owner: member } + let!(:seed_photo) { FactoryBot.create :photo, owner: member } before do harvest.photos << harvest_photo diff --git a/spec/models/planting_spec.rb b/spec/models/planting_spec.rb index 9c5b02eaf..c128c0e6e 100644 --- a/spec/models/planting_spec.rb +++ b/spec/models/planting_spec.rb @@ -1,10 +1,10 @@ require 'rails_helper' describe Planting do - let(:crop) { FactoryBot.create(:tomato) } - let(:garden_owner) { FactoryBot.create(:member, login_name: 'hatupatu') } + let(:crop) { FactoryBot.create(:tomato) } + let(:garden_owner) { FactoryBot.create(:member, login_name: 'hatupatu') } let(:garden) { FactoryBot.create(:garden, owner: garden_owner, name: 'Springfield Community Garden') } - let(:planting) { FactoryBot.create(:planting, crop: crop, garden: garden, owner: garden.owner) } + let(:planting) { FactoryBot.create(:planting, crop: crop, garden: garden, owner: garden.owner) } let(:finished_planting) do FactoryBot.create :planting, planted_at: 4.days.ago, finished_at: 2.days.ago, finished: true end @@ -72,7 +72,7 @@ describe Planting do end describe 'child crop uses parent data' do - let(:child_crop) { FactoryBot.create :crop, parent: crop, name: 'child' } + let(:child_crop) { FactoryBot.create :crop, parent: crop, name: 'child' } let(:child_planting) { FactoryBot.create :planting, crop: child_crop, planted_at: 30.days.ago } # not data for this crop diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb index 127f1ad7e..b39d4aff0 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_spec.rb @@ -132,8 +132,8 @@ describe Post do context "crop-post association" do let!(:tomato) { FactoryBot.create(:tomato) } - let!(:maize) { FactoryBot.create(:maize) } - let!(:chard) { FactoryBot.create(:chard) } + let!(:maize) { FactoryBot.create(:maize) } + let!(:chard) { FactoryBot.create(:chard) } let!(:post) { FactoryBot.create(:post, body: "[maize](crop)[tomato](crop)[tomato](crop)") } it "is generated" do diff --git a/spec/models/seed_spec.rb b/spec/models/seed_spec.rb index 83f3f1cb8..a2dae3155 100644 --- a/spec/models/seed_spec.rb +++ b/spec/models/seed_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' describe Seed do let(:owner) { FactoryBot.create :owner, login_name: 'tamateapokaiwhenua' } - let(:seed) { FactoryBot.build(:seed, owner: owner) } + let(:seed) { FactoryBot.build(:seed, owner: owner) } it 'saves a basic seed' do seed.save.should be(true) @@ -161,7 +161,7 @@ describe Seed do end context 'ancestry' do - let(:parent_planting) { FactoryBot.create :planting } + let(:parent_planting) { FactoryBot.create :planting } let(:seed) { FactoryBot.create :seed, parent_planting: parent_planting, owner: parent_planting.owner } it "seed has a parent planting" do @@ -181,7 +181,7 @@ describe Seed do end describe 'scopes' do - let!(:seed) { FactoryBot.create(:seed) } + let!(:seed) { FactoryBot.create(:seed) } let!(:finished_seed) { FactoryBot.create(:finished_seed) } describe 'has finished scope' do diff --git a/spec/requests/api/v1/crop_request_spec.rb b/spec/requests/api/v1/crop_request_spec.rb index 6d8353d69..893d527c9 100644 --- a/spec/requests/api/v1/crop_request_spec.rb +++ b/spec/requests/api/v1/crop_request_spec.rb @@ -4,7 +4,7 @@ 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) { FactoryBot.create :crop } let(:crop_encoded_as_json_api) do { "id" => crop.id.to_s, "type" => "crops", diff --git a/spec/requests/api/v1/gardens_request_spec.rb b/spec/requests/api/v1/gardens_request_spec.rb index 8426dfcb2..127513607 100644 --- a/spec/requests/api/v1/gardens_request_spec.rb +++ b/spec/requests/api/v1/gardens_request_spec.rb @@ -4,7 +4,7 @@ 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) { FactoryBot.create :garden } let(:garden_encoded_as_json_api) do { "id" => garden.id.to_s, "type" => "gardens", diff --git a/spec/requests/api/v1/harvest_request_spec.rb b/spec/requests/api/v1/harvest_request_spec.rb index 597714060..18a1fe4ab 100644 --- a/spec/requests/api/v1/harvest_request_spec.rb +++ b/spec/requests/api/v1/harvest_request_spec.rb @@ -4,7 +4,7 @@ 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) { FactoryBot.create :harvest } let(:harvest_encoded_as_json_api) do { "id" => harvest.id.to_s, "type" => "harvests", diff --git a/spec/requests/api/v1/member_request_spec.rb b/spec/requests/api/v1/member_request_spec.rb index 9178f91cc..efc5a1feb 100644 --- a/spec/requests/api/v1/member_request_spec.rb +++ b/spec/requests/api/v1/member_request_spec.rb @@ -4,7 +4,7 @@ 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) { FactoryBot.create :member } let(:member_encoded_as_json_api) do { "id" => member.id.to_s, "type" => "members", diff --git a/spec/requests/api/v1/photos_request_spec.rb b/spec/requests/api/v1/photos_request_spec.rb index 118aa4fcc..82959eb0d 100644 --- a/spec/requests/api/v1/photos_request_spec.rb +++ b/spec/requests/api/v1/photos_request_spec.rb @@ -4,7 +4,7 @@ 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) { FactoryBot.create :photo } let(:photo_encoded_as_json_api) do { "id" => photo.id.to_s, "type" => "photos", diff --git a/spec/requests/api/v1/plantings_request_spec.rb b/spec/requests/api/v1/plantings_request_spec.rb index 2085fd85f..9137f8b39 100644 --- a/spec/requests/api/v1/plantings_request_spec.rb +++ b/spec/requests/api/v1/plantings_request_spec.rb @@ -4,7 +4,7 @@ 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) { FactoryBot.create :planting } let(:planting_encoded_as_json_api) do { "id" => planting.id.to_s, "type" => "plantings", diff --git a/spec/requests/api/v1/seeds_request_spec.rb b/spec/requests/api/v1/seeds_request_spec.rb index 3bde1af9d..90d3da22a 100644 --- a/spec/requests/api/v1/seeds_request_spec.rb +++ b/spec/requests/api/v1/seeds_request_spec.rb @@ -4,7 +4,7 @@ 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) { FactoryBot.create :seed } let(:seed_encoded_as_json_api) do { "id" => seed.id.to_s, "type" => "seeds", diff --git a/spec/views/crops/_grown_for.html.haml_spec.rb b/spec/views/crops/_grown_for.html.haml_spec.rb index 0aef069c3..239b26dfd 100644 --- a/spec/views/crops/_grown_for.html.haml_spec.rb +++ b/spec/views/crops/_grown_for.html.haml_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' describe "crops/_grown_for" do - let(:crop) { FactoryBot.create(:crop) } + let(:crop) { FactoryBot.create(:crop) } let(:plant_path) { FactoryBot.create(:plant_part) } let!(:harvest) do FactoryBot.create(:harvest, diff --git a/spec/views/photos/show.html.haml_spec.rb b/spec/views/photos/show.html.haml_spec.rb index fb3ad8859..a4a275751 100644 --- a/spec/views/photos/show.html.haml_spec.rb +++ b/spec/views/photos/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' describe "photos/show" do let(:photo) { FactoryBot.create :photo, owner: member } - let(:crops) { FactoryBot.create_list :crop, 2 } + let(:crops) { FactoryBot.create_list :crop, 2 } before do @photo = photo @crops = crops @@ -10,10 +10,10 @@ describe "photos/show" do let(:member) { FactoryBot.create :member } - let(:harvest) { FactoryBot.create :harvest, owner: member } + let(:harvest) { FactoryBot.create :harvest, owner: member } let(:planting) { FactoryBot.create :planting, owner: member } - let(:seed) { FactoryBot.create :seed, owner: member } - let(:garden) { FactoryBot.create :garden, owner: member } + let(:seed) { FactoryBot.create :seed, owner: member } + let(:garden) { FactoryBot.create :garden, owner: member } shared_examples "photo data renders" do it "shows the image" do diff --git a/spec/views/plantings/index.html.haml_spec.rb b/spec/views/plantings/index.html.haml_spec.rb index 792c2b5e5..e65a5b642 100644 --- a/spec/views/plantings/index.html.haml_spec.rb +++ b/spec/views/plantings/index.html.haml_spec.rb @@ -1,10 +1,10 @@ require 'rails_helper' describe "plantings/index" do - let(:member) { FactoryBot.create(:member) } + let(:member) { FactoryBot.create(:member) } let(:garden) { FactoryBot.create(:garden, owner: member) } - let(:tomato) { FactoryBot.create(:tomato) } - let(:maize) { FactoryBot.create(:maize) } + let(:tomato) { FactoryBot.create(:tomato) } + let(:maize) { FactoryBot.create(:maize) } before do controller.stub(:current_user) { nil } diff --git a/spec/views/plantings/show.html.haml_spec.rb b/spec/views/plantings/show.html.haml_spec.rb index dfd503743..016a29182 100644 --- a/spec/views/plantings/show.html.haml_spec.rb +++ b/spec/views/plantings/show.html.haml_spec.rb @@ -1,8 +1,8 @@ require 'rails_helper' describe "plantings/show" do - let(:crop) { FactoryBot.create(:tomato) } - let(:member) { FactoryBot.create(:member) } + let(:crop) { FactoryBot.create(:tomato) } + let(:member) { FactoryBot.create(:member) } let(:garden) { FactoryBot.create(:garden, owner: member) } let(:planting) do FactoryBot.create(:planting, garden: garden, crop: crop, diff --git a/spec/views/scientific_names/edit.html.haml_spec.rb b/spec/views/scientific_names/edit.html.haml_spec.rb index 7c2a9de1e..b497b44e7 100644 --- a/spec/views/scientific_names/edit.html.haml_spec.rb +++ b/spec/views/scientific_names/edit.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' describe "scientific_names/edit" do context "logged in" do - let(:member) { FactoryBot.create(:member) } + let(:member) { FactoryBot.create(:member) } let(:scientific_name) { FactoryBot.create(:zea_mays, creator: member) } before do diff --git a/spec/views/seeds/new.html.haml_spec.rb b/spec/views/seeds/new.html.haml_spec.rb index 6b6d6e48d..fc40236e5 100644 --- a/spec/views/seeds/new.html.haml_spec.rb +++ b/spec/views/seeds/new.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'rails_helper' describe "seeds/new" do let!(:seed) { FactoryBot.create(:seed, owner: member) } - let!(:member) { FactoryBot.create(:member) } + let!(:member) { FactoryBot.create(:member) } before do sign_in member diff --git a/spec/views/seeds/show.html.haml_spec.rb b/spec/views/seeds/show.html.haml_spec.rb index cd7507601..1c2e88442 100644 --- a/spec/views/seeds/show.html.haml_spec.rb +++ b/spec/views/seeds/show.html.haml_spec.rb @@ -18,7 +18,7 @@ describe "seeds/show" do context 'with location' do let!(:owner) { FactoryBot.create(:london_member) } let!(:seed) { FactoryBot.create(:tradable_seed, owner: owner) } - let!(:member) { FactoryBot.create(:member) } + let!(:member) { FactoryBot.create(:member) } before do assign(:seed, seed) From 89e75ffbee6f477d58ba6f7e33d3a3ec3e80aca3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 14 Mar 2019 07:24:01 +0000 Subject: [PATCH 11/23] Bump flickraw from 0.9.9 to 0.9.10 Bumps [flickraw](https://github.com/hanklords/flickraw) from 0.9.9 to 0.9.10. - [Release notes](https://github.com/hanklords/flickraw/releases) - [Commits](https://github.com/hanklords/flickraw/compare/V0.9.9...V0.9.10) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 348f90af0..39a1a16e8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -171,7 +171,7 @@ GEM ffi (1.9.25) figaro (1.1.1) thor (~> 0.14) - flickraw (0.9.9) + flickraw (0.9.10) font-awesome-sass (5.6.1) sassc (>= 1.11) friendly_id (5.2.5) From d8be8d0c4801662f57c8e64a970519caf6188d0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 14 Mar 2019 08:39:17 +0000 Subject: [PATCH 12/23] Bump unicorn from 5.4.1 to 5.5.0 Bumps [unicorn](https://bogomips.org/unicorn/) from 5.4.1 to 5.5.0. Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 39a1a16e8..9584d6363 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -485,7 +485,7 @@ GEM uglifier (4.1.20) execjs (>= 0.3.0, < 3) unicode-display_width (1.4.1) - unicorn (5.4.1) + unicorn (5.5.0) kgio (~> 2.6) raindrops (~> 0.7) uniform_notifier (1.12.1) From 50ade63429909c13b41ec47f391217953b785491 Mon Sep 17 00:00:00 2001 From: Awesome Code Date: Thu, 14 Mar 2019 10:08:49 +0000 Subject: [PATCH 13/23] Auto corrected by following Lint Ruby RSpec/LeadingSubject --- spec/controllers/crops_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/controllers/crops_controller_spec.rb b/spec/controllers/crops_controller_spec.rb index d510ce92a..c3ca128eb 100644 --- a/spec/controllers/crops_controller_spec.rb +++ b/spec/controllers/crops_controller_spec.rb @@ -58,9 +58,9 @@ describe CropsController do end describe 'DELETE destroy' do + subject { delete :destroy, params: { slug: crop.to_param } } let!(:crop) { FactoryBot.create :crop } - subject { delete :destroy, params: { slug: crop.to_param } } context 'not logged in' do it { expect { subject }.not_to change(Crop, :count) } From f41ecbc68b487e437cdd741a0705a16291e4dbaf Mon Sep 17 00:00:00 2001 From: Awesome Code Date: Thu, 14 Mar 2019 10:11:03 +0000 Subject: [PATCH 14/23] Auto corrected by following Lint Ruby EmptyLine --- spec/controllers/crops_controller_spec.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/controllers/crops_controller_spec.rb b/spec/controllers/crops_controller_spec.rb index c3ca128eb..cb8e5a502 100644 --- a/spec/controllers/crops_controller_spec.rb +++ b/spec/controllers/crops_controller_spec.rb @@ -61,7 +61,6 @@ describe CropsController do subject { delete :destroy, params: { slug: crop.to_param } } let!(:crop) { FactoryBot.create :crop } - context 'not logged in' do it { expect { subject }.not_to change(Crop, :count) } end From f52daa12c5c1166c2ff83750fb045015943eb2a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 18 Mar 2019 07:55:49 +0000 Subject: [PATCH 15/23] Bump dalli from 2.7.9 to 2.7.10 Bumps [dalli](https://github.com/petergoldstein/dalli) from 2.7.9 to 2.7.10. - [Release notes](https://github.com/petergoldstein/dalli/releases) - [Changelog](https://github.com/petergoldstein/dalli/blob/master/History.md) - [Commits](https://github.com/petergoldstein/dalli/compare/v2.7.9...v2.7.10) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9584d6363..86a669f2e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -132,7 +132,7 @@ GEM crass (1.0.4) csv_shaper (1.3.0) activesupport (>= 3.0.0) - dalli (2.7.9) + dalli (2.7.10) database_cleaner (1.7.0) devise (4.6.1) bcrypt (~> 3.0) From 4d062964b64b0dcfc31761d21e7ce2dc73e7e57a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 18 Mar 2019 11:17:15 +0000 Subject: [PATCH 16/23] Bump comfortable_mexican_sofa from 2.0.17 to 2.0.18 Bumps [comfortable_mexican_sofa](https://github.com/comfy/comfortable-mexican-sofa) from 2.0.17 to 2.0.18. - [Release notes](https://github.com/comfy/comfortable-mexican-sofa/releases) - [Commits](https://github.com/comfy/comfortable-mexican-sofa/compare/v2.0.17...v2.0.18) Signed-off-by: dependabot[bot] --- Gemfile.lock | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 86a669f2e..435ad5b6b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -108,7 +108,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - comfortable_mexican_sofa (2.0.17) + comfortable_mexican_sofa (2.0.18) active_link_to (>= 1.0.0) comfy_bootstrap_form (>= 4.0.0) haml-rails (>= 1.0.0) @@ -118,7 +118,7 @@ GEM mini_magick (>= 4.8.0) rails (>= 5.2.0) rails-i18n (>= 5.0.0) - sass-rails (>= 5.0.0) + sassc-rails (>= 2.0.0) comfy_bootstrap_form (4.0.6) rails (>= 5.0.0) concurrent-ruby (1.1.5) @@ -262,7 +262,7 @@ GEM kaminari-core (= 1.1.1) kaminari-core (1.1.1) kgio (2.11.2) - kramdown (1.17.0) + kramdown (2.1.0) launchy (2.4.3) addressable (~> 2.3) leaflet-rails (1.3.1) @@ -286,7 +286,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) mimemagic (0.3.3) - mini_magick (4.9.2) + mini_magick (4.9.3) mini_mime (1.0.1) mini_portile2 (2.4.0) minitest (5.11.3) @@ -370,7 +370,7 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - rails-i18n (5.1.2) + rails-i18n (5.1.3) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) rails_12factor (0.0.3) @@ -430,10 +430,10 @@ GEM ruby-progressbar (1.10.0) ruby-units (2.3.1) ruby_dep (1.5.0) - ruby_parser (3.12.0) + ruby_parser (3.13.0) sexp_processor (~> 4.9) rubyzip (1.2.2) - sass (3.7.2) + sass (3.7.3) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -447,10 +447,16 @@ GEM sassc (2.0.0) ffi (~> 1.9.6) rake + sassc-rails (2.1.0) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt selenium-webdriver (3.141.0) childprocess (~> 0.5) rubyzip (~> 1.2, >= 1.2.2) - sexp_processor (4.11.0) + sexp_processor (4.12.0) sidekiq (5.2.5) connection_pool (~> 2.2, >= 2.2.2) rack (>= 1.5.0) From fe6f6046e4c5fd3ec8d335d0b10f43fae0daede8 Mon Sep 17 00:00:00 2001 From: Awesome Code Date: Tue, 19 Mar 2019 07:22:50 +0000 Subject: [PATCH 17/23] Auto corrected by following Lint Ruby RSpecEmptyLine --- spec/controllers/crops_controller_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/controllers/crops_controller_spec.rb b/spec/controllers/crops_controller_spec.rb index cb8e5a502..d9dce9b9e 100644 --- a/spec/controllers/crops_controller_spec.rb +++ b/spec/controllers/crops_controller_spec.rb @@ -59,6 +59,7 @@ describe CropsController do describe 'DELETE destroy' do subject { delete :destroy, params: { slug: crop.to_param } } + let!(:crop) { FactoryBot.create :crop } context 'not logged in' do From 0f1c6ae3b6f0017e6273042553033702ea4ca879 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 19 Mar 2019 20:28:24 +0000 Subject: [PATCH 18/23] Bump byebug from 11.0.0 to 11.0.1 Bumps [byebug](https://github.com/deivid-rodriguez/byebug) from 11.0.0 to 11.0.1. - [Release notes](https://github.com/deivid-rodriguez/byebug/releases) - [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md) - [Commits](https://github.com/deivid-rodriguez/byebug/compare/v11.0.0...v11.0.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 435ad5b6b..51b60dac6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,7 +78,7 @@ GEM bullet (5.9.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) - byebug (11.0.0) + byebug (11.0.1) cancancan (2.3.0) capybara (3.14.0) addressable From d07c97b6a67dbedd5b75fd57ee2fa9789bd4df8a Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 17 Mar 2019 15:19:04 +1300 Subject: [PATCH 19/23] Add filters for the members api --- app/resources/api/v1/member_resource.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/resources/api/v1/member_resource.rb b/app/resources/api/v1/member_resource.rb index b5b0a94a0..4013aeea4 100644 --- a/app/resources/api/v1/member_resource.rb +++ b/app/resources/api/v1/member_resource.rb @@ -7,9 +7,13 @@ module Api has_many :plantings has_many :harvests has_many :seeds + has_many :photos attribute :login_name + attribute :slug + + filters :login_name, :slug end end end From 6559645265356328f752cdc107b1d060e2c1f283 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Mon, 18 Mar 2019 13:24:47 +1300 Subject: [PATCH 20/23] update spec --- spec/requests/api/v1/member_request_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/requests/api/v1/member_request_spec.rb b/spec/requests/api/v1/member_request_spec.rb index efc5a1feb..f869af9b2 100644 --- a/spec/requests/api/v1/member_request_spec.rb +++ b/spec/requests/api/v1/member_request_spec.rb @@ -53,7 +53,8 @@ RSpec.describe 'Members', type: :request do let(:attributes) do { - "login-name" => member.login_name + "login-name" => member.login_name, + "slug" => member.slug } end From 62f2fa134df1acc2367296af43ca99e6d83c8bea Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Mon, 18 Mar 2019 13:25:11 +1300 Subject: [PATCH 21/23] Set planting.finished as a boolean --- app/resources/api/v1/planting_resource.rb | 2 +- db/migrate/20190317023129_finished_boolean.rb | 8 ++++++++ db/schema.rb | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20190317023129_finished_boolean.rb diff --git a/app/resources/api/v1/planting_resource.rb b/app/resources/api/v1/planting_resource.rb index 030f57892..dce3aaf7d 100644 --- a/app/resources/api/v1/planting_resource.rb +++ b/app/resources/api/v1/planting_resource.rb @@ -30,7 +30,7 @@ module Api filter :planted_from filter :garden filter :owner - filter :finished, default: nil + filter :finished attribute :percentage_grown def percentage_grown diff --git a/db/migrate/20190317023129_finished_boolean.rb b/db/migrate/20190317023129_finished_boolean.rb new file mode 100644 index 000000000..5f8601fca --- /dev/null +++ b/db/migrate/20190317023129_finished_boolean.rb @@ -0,0 +1,8 @@ +class FinishedBoolean < ActiveRecord::Migration[5.2] + def change + Planting.where('finished_at < now()').update_all(finished: true) + Planting.where(finished: nil).update_all(finished: false) + change_column_null :plantings, :finished, false + change_column_default :plantings, :finished, from: nil, to: false + end +end diff --git a/db/schema.rb b/db/schema.rb index d2d475824..5c98e630d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2019_01_30_090437) do +ActiveRecord::Schema.define(version: 2019_03_17_023129) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -385,7 +385,7 @@ ActiveRecord::Schema.define(version: 2019_01_30_090437) do t.string "sunniness" t.string "planted_from" t.integer "owner_id" - t.boolean "finished", default: false + t.boolean "finished", default: false, null: false t.date "finished_at" t.integer "lifespan" t.integer "days_to_first_harvest" From 45f22c1b45430c4bb3179c1ad36ca8bc7ec4f5b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 19 Mar 2019 21:39:40 +0000 Subject: [PATCH 22/23] Bump responders from 2.4.0 to 2.4.1 Bumps [responders](https://github.com/plataformatec/responders) from 2.4.0 to 2.4.1. - [Release notes](https://github.com/plataformatec/responders/releases) - [Changelog](https://github.com/plataformatec/responders/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/responders/compare/v2.4.0...v2.4.1) Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 51b60dac6..92d61cf8a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -392,9 +392,9 @@ GEM ffi (~> 1.0) redis (4.1.0) regexp_parser (1.3.0) - responders (2.4.0) - actionpack (>= 4.2.0, < 5.3) - railties (>= 4.2.0, < 5.3) + responders (2.4.1) + actionpack (>= 4.2.0, < 6.0) + railties (>= 4.2.0, < 6.0) rspec-activemodel-mocks (1.1.0) activemodel (>= 3.0) activesupport (>= 3.0) From afc769aa5f707505adfcd42be656c04b1cf0cd44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 19 Mar 2019 21:51:56 +0000 Subject: [PATCH 23/23] Bump rubocop from 0.65.0 to 0.66.0 Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.65.0 to 0.66.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.65.0...v0.66.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 92d61cf8a..80773f3bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -336,7 +336,6 @@ GEM capybara (>= 2.1, < 4) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - powerpack (0.1.2) psych (3.1.0) public_suffix (3.0.3) puma (3.12.0) @@ -416,15 +415,14 @@ GEM rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) rspec-support (3.8.0) - rubocop (0.65.0) + rubocop (0.66.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) - powerpack (~> 0.1) psych (>= 3.1.0) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.4.0) + unicode-display_width (>= 1.4.0, < 1.6) rubocop-rspec (1.32.0) rubocop (>= 0.60.0) ruby-progressbar (1.10.0) @@ -490,7 +488,7 @@ GEM thread_safe (~> 0.1) uglifier (4.1.20) execjs (>= 0.3.0, < 3) - unicode-display_width (1.4.1) + unicode-display_width (1.5.0) unicorn (5.5.0) kgio (~> 2.6) raindrops (~> 0.7)