From c7ed27286afac98a9b68193aedb67cba6d071337 Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Fri, 23 Jun 2017 17:02:20 +1000 Subject: [PATCH] Rubocop: Correct Lint/ParenthesesAsGroupedExpression offences --- .rubocop_todo.yml | 10 ---------- spec/factories.rb | 2 +- spec/features/admin/enterprises_spec.rb | 2 +- spec/features/admin/order_cycles_spec.rb | 2 +- spec/models/cart_spec.rb | 4 ++-- spec/models/spree/ability_spec.rb | 6 +++--- spec/performance/injection_helper_spec.rb | 3 ++- spec/support/performance_helper.rb | 3 ++- 8 files changed, 12 insertions(+), 20 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index d6bd7afbd4..0a9462032f 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -84,16 +84,6 @@ Lint/NonLocalExitFromIterator: Exclude: - 'app/models/product_importer.rb' -# Offense count: 9 -Lint/ParenthesesAsGroupedExpression: - Exclude: - - 'spec/features/admin/enterprises_spec.rb' - - 'spec/features/admin/order_cycles_spec.rb' - - 'spec/models/cart_spec.rb' - - 'spec/models/spree/ability_spec.rb' - - 'spec/performance/injection_helper_spec.rb' - - 'spec/support/performance_helper.rb' - # Offense count: 5 Lint/ShadowingOuterLocalVariable: Exclude: diff --git a/spec/factories.rb b/spec/factories.rb index 73e62744ba..3b2f67e531 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -72,7 +72,7 @@ FactoryGirl.define do end factory :order_cycle_with_overrides, parent: :order_cycle do - after (:create) do |oc| + after(:create) do |oc| oc.variants.each do |variant| create(:variant_override, variant: variant, hub: oc.distributors.first, price: variant.price + 100) end diff --git a/spec/features/admin/enterprises_spec.rb b/spec/features/admin/enterprises_spec.rb index ce414ed99f..55f957b6be 100644 --- a/spec/features/admin/enterprises_spec.rb +++ b/spec/features/admin/enterprises_spec.rb @@ -92,7 +92,7 @@ feature %q{ choose "Visible to registered customers only" expect(page).to have_no_checked_field "enterprise_require_login_false" - within (".side_menu") { click_link "Users" } + within(".side_menu") { click_link "Users" } select2_search user.email, from: 'Owner' expect(page).to have_no_selector '.select2-drop-mask' # Ensure select2 has finished diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb index d59b203ce6..d33fbc1937 100644 --- a/spec/features/admin/order_cycles_spec.rb +++ b/spec/features/admin/order_cycles_spec.rb @@ -307,7 +307,7 @@ feature %q{ # And it should have some variants selected selected_initial_variants = initial_variants.take initial_variants.size - 1 - OrderCycle.last.variants.map(&:id).should match_array (selected_initial_variants.map(&:id) + [v1.id, v2.id]) + OrderCycle.last.variants.map(&:id).should match_array(selected_initial_variants.map(&:id) + [v1.id, v2.id]) # And the collection details should have been updated OrderCycle.last.exchanges.where(pickup_time: 'New time 0', pickup_instructions: 'New instructions 0').should be_present diff --git a/spec/models/cart_spec.rb b/spec/models/cart_spec.rb index 8fb39b9d60..9ef473db3e 100644 --- a/spec/models/cart_spec.rb +++ b/spec/models/cart_spec.rb @@ -47,7 +47,7 @@ describe Cart do let(:product_from_other_distributor) { FactoryGirl.create(:product, :distributors => [other_distributor]) } let(:order) { FactoryGirl.create(:order, :distributor => distributor) } - before (:each) do + before do FactoryGirl.create(:line_item, :order => order, :product => product) order.reload subject.orders << order @@ -88,7 +88,7 @@ describe Cart do describe 'existing order for distributor and order cycle' do let(:order) { FactoryGirl.create(:order, :distributor => distributor, :order_cycle => order_cycle) } - before (:each) do + before do subject.orders << order subject.save! end diff --git a/spec/models/spree/ability_spec.rb b/spec/models/spree/ability_spec.rb index 0057d377e7..07d7ef3649 100644 --- a/spec/models/spree/ability_spec.rb +++ b/spec/models/spree/ability_spec.rb @@ -438,7 +438,7 @@ module Spree end context 'Order Cycle co-ordinator, distributor enterprise manager' do - let (:user) do + let(:user) do user = create(:user) user.spree_roles = [] d1.enterprise_roles.build(user: user).save @@ -470,7 +470,7 @@ module Spree end context 'enterprise manager' do - let (:user) do + let(:user) do user = create(:user) user.spree_roles = [] s1.enterprise_roles.build(user: user).save @@ -504,7 +504,7 @@ module Spree end context 'enterprise owner' do - let (:user) { s1.owner } + let(:user) { s1.owner } it 'should have the ability to welcome and register enterprises that I own' do should have_ability([:welcome, :register], for: s1) diff --git a/spec/performance/injection_helper_spec.rb b/spec/performance/injection_helper_spec.rb index 7553836947..29e755b85d 100644 --- a/spec/performance/injection_helper_spec.rb +++ b/spec/performance/injection_helper_spec.rb @@ -24,6 +24,7 @@ describe InjectionHelper, type: :helper, performance: true do puts result end - puts (results.sum / results.count * 1000).round 0 + avg = (results.sum / results.count * 1000).round(0) + puts avg end end diff --git a/spec/support/performance_helper.rb b/spec/support/performance_helper.rb index 767691fa06..ebcb8d8825 100644 --- a/spec/support/performance_helper.rb +++ b/spec/support/performance_helper.rb @@ -12,7 +12,8 @@ module OpenFoodNetwork result.total end.drop(1) # Do not return the first sample - puts (results.sum / results.count * 1000).round 0 + avg = (results.sum / results.count * 1000).round(0) + puts avg results end