Compare commits

...

12 Commits

Author SHA1 Message Date
Cesy
b3b664b06c Rename for CodeFactor: member_routing_spec.rb to members_controller_routing_spec.rb 2023-12-21 09:30:20 +00:00
Cesy
c04dbd4599 Rename for CodeFactor: follows_routing_spec.rb to follows_controller_routing_spec.rb 2023-12-21 09:29:04 +00:00
Cesy
76da9edc23 Rename for CodeFactor: updates_routing_spec.rb to posts_controller_updates_routing_spec.rb
For codefactor
2023-12-21 09:27:50 +00:00
Cesy
f8ee706023 Rename harvests_routing_spec.rb to harvests_controller_routing_spec.rb
Making codeclimate happier
2023-12-21 09:25:30 +00:00
Cesy
8f5fd12863 Merge branch 'dev' into rubocop-fixes 2023-12-21 09:20:55 +00:00
Cesy
7a91336917 Merge pull request #3511 from Growstuff/dependabot/bundler/carrierwave-3.0.5
Bump carrierwave from 2.1.1 to 3.0.5
2023-12-21 09:16:50 +00:00
dependabot[bot]
d2a7ce2ca4 Bump carrierwave from 2.1.1 to 3.0.5
Bumps [carrierwave](https://github.com/carrierwaveuploader/carrierwave) from 2.1.1 to 3.0.5.
- [Release notes](https://github.com/carrierwaveuploader/carrierwave/releases)
- [Changelog](https://github.com/carrierwaveuploader/carrierwave/blob/master/CHANGELOG.md)
- [Commits](https://github.com/carrierwaveuploader/carrierwave/compare/v2.1.1...v3.0.5)

---
updated-dependencies:
- dependency-name: carrierwave
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-19 08:28:01 +00:00
Daniel O'Connor
65af9c88b1 Merge branch 'dev' into rubocop-fixes 2023-12-13 21:18:42 +10:30
Daniel O'Connor
a3e6edde7c Rubocop 2023-09-16 07:58:26 +00:00
Daniel O'Connor
dcfb088638 Rubocop 2023-09-16 07:57:09 +00:00
Daniel O'Connor
bf0f6c7579 Rubcop 2023-09-16 07:55:57 +00:00
Daniel O'Connor
73566832b9 Fix todo 2023-09-16 07:54:44 +00:00
31 changed files with 38 additions and 64 deletions

View File

@@ -48,12 +48,6 @@ FactoryBot/CreateList:
- 'spec/views/places/show.html.haml_spec.rb'
- 'spec/views/posts/index.html.haml_spec.rb'
# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
FactoryBot/RedundantFactoryOption:
Exclude:
- 'spec/factories/scientific_name.rb'
# Offense count: 1135
# This cop supports unsafe autocorrection (--autocorrect-all).
FactoryBot/SyntaxMethods:
@@ -101,15 +95,6 @@ Layout/LineEndStringConcatenationIndentation:
Layout/LineLength:
Max: 304
# Offense count: 1
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
# SupportedStyles: space, no_space
# SupportedStylesForEmptyBraces: space, no_space
Layout/SpaceBeforeBlockBraces:
Exclude:
- 'spec/models/photo_spec.rb'
# Offense count: 3
# This cop supports safe autocorrection (--autocorrect).
Lint/AmbiguousOperatorPrecedence:
@@ -242,15 +227,6 @@ RSpec/EmptyExampleGroup:
- 'spec/views/photos/edit.html.haml_spec.rb'
- 'spec/views/posts/_single.html.haml_spec.rb'
# Offense count: 6
# This cop supports safe autocorrection (--autocorrect).
RSpec/EmptyLineAfterExampleGroup:
Exclude:
- 'spec/features/crops/creating_a_crop_spec.rb'
- 'spec/features/likeable_spec.rb'
- 'spec/models/crop_spec.rb'
- 'spec/support/feature_helpers.rb'
# Offense count: 134
# Configuration parameters: CountAsOne.
RSpec/ExampleLength:
@@ -323,13 +299,6 @@ RSpec/MessageChain:
RSpec/MessageSpies:
EnforcedStyle: receive
# Offense count: 22
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: hash, symbol
RSpec/MetadataStyle:
Enabled: false
# Offense count: 1
RSpec/MultipleDescribes:
Exclude:

View File

@@ -100,7 +100,7 @@ GEM
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.5)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
ast (2.4.2)
autoprefixer-rails (10.4.7.0)
@@ -152,13 +152,12 @@ GEM
capybara-screenshot (1.0.26)
capybara (>= 1.0, < 4)
launchy
carrierwave (2.1.1)
activemodel (>= 5.0.0)
activesupport (>= 5.0.0)
carrierwave (3.0.5)
activemodel (>= 6.0.0)
activesupport (>= 6.0.0)
addressable (~> 2.6)
image_processing (~> 1.1)
mimemagic (>= 0.3.0)
mini_mime (>= 0.1.3)
marcel (~> 1.0.0)
ssrf_filter (~> 1.0)
chartkick (5.0.5)
codeclimate-test-reporter (1.0.9)
@@ -248,7 +247,7 @@ GEM
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday (~> 1.0)
ffi (1.15.5)
ffi (1.16.3)
flickraw (0.9.10)
font-awesome-sass (5.15.1)
sassc (>= 1.11)
@@ -546,7 +545,7 @@ GEM
rubocop-factory_bot (~> 2.22)
ruby-progressbar (1.13.0)
ruby-units (4.0.1)
ruby-vips (2.1.4)
ruby-vips (2.2.0)
ffi (~> 1.12)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
@@ -591,7 +590,7 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
ssrf_filter (1.0.7)
ssrf_filter (1.1.2)
sysexits (1.2.0)
temple (0.10.3)
terminal-table (3.0.2)

View File

@@ -2,7 +2,7 @@
FactoryBot.define do
factory :scientific_name do
association :crop, factory: :crop
association :crop
name { "Beanus Magicus" }
creator

View File

@@ -2,7 +2,7 @@
require 'rails_helper'
describe "forums", js: true do
describe "forums", :js do
context 'signed in admin' do
include_context 'signed in admin'
it "navigating to forum admin with js" do

View File

@@ -2,7 +2,7 @@
require 'rails_helper'
describe "forums", js: true do
describe "forums", :js do
include_context 'signed in admin'
let(:forum) { create(:forum) }

View File

@@ -2,7 +2,7 @@
require 'rails_helper'
describe "Alternate names", js: true do
describe "Alternate names", :js do
let!(:alternate_eggplant) { create(:alternate_eggplant) }
let(:crop) { alternate_eggplant.crop }

View File

@@ -2,7 +2,7 @@
require 'rails_helper'
describe "Crop", js: true do
describe "Crop", :js do
shared_context 'fill in form' do
before do
visit new_crop_path
@@ -22,6 +22,7 @@ describe "Crop", js: true do
end
end
end
shared_examples 'request crop' do
describe "requesting a crop with multiple scientific and alternate name" do
include_examples 'fill in form'
@@ -38,6 +39,7 @@ describe "Crop", js: true do
it { expect(page).to have_content "Matsurika" }
end
end
shared_examples 'create crop' do
describe "creating a crop with multiple scientific and alternate name" do
include_examples 'fill in form'

View File

@@ -2,7 +2,7 @@
require 'rails_helper'
describe "crop detail page", js: true do
describe "crop detail page", :js do
subject do
# Update the medians after all the
# data has been loaded

View File

@@ -2,7 +2,7 @@
require 'rails_helper'
describe "crop wranglers", js: true do
describe "crop wranglers", :js do
context "signed in wrangler" do
include_context 'signed in crop wrangler'
let!(:crop_wranglers) { create_list(:crop_wrangling_member, 3) }

View File

@@ -2,7 +2,7 @@
require 'rails_helper'
describe "Scientific names", js: true do
describe "Scientific names", :js do
let!(:zea_mays) { create(:zea_mays) }
let(:crop) { zea_mays.crop }

View File

@@ -2,7 +2,7 @@
require 'rails_helper'
describe "footer", js: true do
describe "footer", :js do
before { visit root_path }
it "footer is on home page" do

View File

@@ -2,7 +2,7 @@
require 'rails_helper'
describe "Planting a crop", js: true do
describe "Planting a crop", :js do
context 'signed in' do
include_context 'signed in member'
# name is aaa to ensure it is ordered first

View File

@@ -2,7 +2,7 @@
require 'rails_helper'
describe 'Likeable', :js, search: true do
describe 'Likeable', :js, :search do
let(:another_member) { FactoryBot.create(:london_member) }
let!(:post) { FactoryBot.create(:post, :reindex, author: member) }
let!(:photo) { FactoryBot.create(:photo, :reindex, owner: member) }
@@ -51,6 +51,7 @@ describe 'Likeable', :js, search: true do
logout(another_member)
end
end
describe 'photos#index' do
let(:path) { photos_path }

View File

@@ -2,7 +2,7 @@
require 'rails_helper'
describe "Changing locales", js: true do
describe "Changing locales", :js do
after { I18n.locale = :en }
let(:member) { FactoryBot.create(:member) }

View File

@@ -2,7 +2,7 @@
require 'rails_helper'
describe "member profile", js: true do
describe "member profile", :js do
let(:member) { create(:member) }
let(:other_member) { create(:member) }
let(:admin_member) { create(:admin_member) }

View File

@@ -2,7 +2,7 @@
require 'rails_helper'
describe 'Test with visual testing', js: true, type: :feature do
describe 'Test with visual testing', :js, type: :feature do
# Use the same random seed every time so our random data is the same
# on every run, so doesn't trigger percy to see changes
before { Faker::Config.random = Random.new(42) }

View File

@@ -29,7 +29,7 @@ describe "Seeds", :js, :search do
it { expect(page).to have_selector '.form-group.required', text: 'Will trade' }
end
describe "Adding a new seed", js: true do
describe "Adding a new seed", :js do
before do
fill_autocomplete "crop", with: "mai"
select_from_autocomplete "maize"

View File

@@ -2,7 +2,7 @@
require 'rails_helper'
describe "seeds", js: true do
describe "seeds", :js do
context "signed in user" do
include_context 'signed in member'
xit "button on index to edit seed" do

View File

@@ -2,7 +2,7 @@
require 'rails_helper'
describe "signin", js: true do
describe "signin", :js do
let(:member) { FactoryBot.create(:member) }
let(:recipient) { FactoryBot.create(:member) }
let(:wrangler) { FactoryBot.create(:crop_wrangling_member) }

View File

@@ -2,7 +2,7 @@
require 'rails_helper'
describe "signup", js: true do
describe "signup", :js do
it "sign up for new account from top menubar" do
visit crops_path # something other than front page, which has multiple signup links
click_link 'Sign up'

View File

@@ -2,7 +2,7 @@
require 'rails_helper'
describe "timeline", js: true do
describe "timeline", :js do
let(:member) { FactoryBot.create(:member) }
let(:friend1) { FactoryBot.create(:member) }
let(:friend2) { FactoryBot.create(:member) }

View File

@@ -143,6 +143,7 @@ describe Crop do
shared_examples 'has default photo' do
it { expect(described_class.has_photos).to include(crop) }
end
let!(:crop) { FactoryBot.create(:tomato) }
context 'with a planting photo' do

View File

@@ -115,7 +115,7 @@ describe Photo do
planting.photos << photo
harvest.destroy # photo is now used by harvest but not planting
photo.destroy_if_unused
expect{ photo.reload }.not_to raise_error
expect { photo.reload }.not_to raise_error
end
it 'they are used by harvests but not plantings' do
@@ -237,7 +237,7 @@ describe Photo do
end
end
describe 'Elastic search indexing', search: true do
describe 'Elastic search indexing', :search do
let!(:planting) { FactoryBot.create(:planting, :reindex, owner: photo.owner) }
let!(:crop) { FactoryBot.create(:crop, :reindex) }

View File

@@ -99,7 +99,7 @@ RSpec.configure do |config|
config.include FactoryBot::Syntax::Methods
# Prevent Poltergeist from fetching external URLs during feature tests
config.before(:each, js: true) do
config.before(:each, :js) do
if page.driver.browser.respond_to?(:url_blacklist)
page.driver.browser.url_blacklist = [
'gravatar.com',

View File

@@ -53,7 +53,7 @@ RSpec.configure do |config|
Searchkick.disable_callbacks
end
config.around(:each, search: true) do |example|
config.around(:each, :search) do |example|
Searchkick.callbacks(true) do
index_everything
example.run

View File

@@ -16,10 +16,12 @@ module FeatureHelpers
let(:member) { FactoryBot.create(:member) }
include_examples 'sign in'
end
shared_context 'signed in crop wrangler' do
let(:member) { FactoryBot.create(:crop_wrangling_member) }
include_examples 'sign in'
end
shared_context 'signed in admin' do
let(:member) { FactoryBot.create(:admin_member) }
include_examples 'sign in'

View File

@@ -2,7 +2,7 @@
require 'rails_helper'
describe 'home/_seeds.html.haml', search: true, type: "view" do
describe 'home/_seeds.html.haml', :search, type: "view" do
let!(:seed) { FactoryBot.create(:tradable_seed, owner:) }
let(:owner) { FactoryBot.create(:london_member) }