diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index bedff16039..4a5e6f12d6 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 1400 --no-auto-gen-timestamp` -# using RuboCop version 1.54.2. +# using RuboCop version 1.55.0. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new @@ -34,16 +34,6 @@ Layout/LineLength: - 'spec/system/consumer/shopping/cart_spec.rb' - 'spec/system/consumer/shopping/products_spec.rb' -# Offense count: 7 -# This cop supports safe autocorrection (--autocorrect). -Lint/AmbiguousOperatorPrecedence: - Exclude: - - 'app/models/calculator/flexi_rate.rb' - - 'app/models/enterprise.rb' - - 'app/models/spree/ability.rb' - - 'app/models/spree/line_item.rb' - - 'app/models/spree/preferences/store.rb' - # Offense count: 17 # Configuration parameters: AllowedMethods. # AllowedMethods: enums @@ -1144,7 +1134,7 @@ Style/HashAsLastArrayItem: - 'app/components/products_table_component.rb' # Offense count: 12 -# This cop supports safe autocorrection (--autocorrect). +# This cop supports unsafe autocorrection (--autocorrect-all). # Configuration parameters: AllowSplatArgument. Style/HashConversion: Exclude: diff --git a/app/models/calculator/flexi_rate.rb b/app/models/calculator/flexi_rate.rb index 1959aec67e..c9ba7ef7f0 100644 --- a/app/models/calculator/flexi_rate.rb +++ b/app/models/calculator/flexi_rate.rb @@ -35,7 +35,7 @@ module Calculator private def compute_for(count) - count * preferred_additional_item.to_f + preferred_first_item.to_f + (count * preferred_additional_item.to_f) + preferred_first_item.to_f end end end diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb index 494d40fead..99ce5c85c7 100644 --- a/app/models/enterprise.rb +++ b/app/models/enterprise.rb @@ -359,7 +359,7 @@ class Enterprise < ApplicationRecord def category # Make this crazy logic human readable so we can argue about it sanely. cat = is_primary_producer ? "producer_" : "non_producer_" - cat << "sells_" + sells + cat << ("sells_" + sells) # Map backend cases to front end cases. case cat @@ -493,7 +493,7 @@ class Enterprise < ApplicationRecord end def correct_whatsapp_url(phone_number) - phone_number && "https://wa.me/" + phone_number.tr('+ ', '') + phone_number && ("https://wa.me/" + phone_number.tr('+ ', '')) end def correct_instagram_url(url) diff --git a/app/models/spree/ability.rb b/app/models/spree/ability.rb index 1da1374b9d..fe0db0be6e 100644 --- a/app/models/spree/ability.rb +++ b/app/models/spree/ability.rb @@ -24,10 +24,10 @@ module Spree can [:index, :read], Country can :create, Order can :read, Order do |order, token| - order.user == user || order.token && token == order.token + order.user == user || (order.token && token == order.token) end can :update, Order do |order, token| - order.user == user || order.token && token == order.token + order.user == user || (order.token && token == order.token) end can [:index, :read], Product can [:index, :read], ProductProperty diff --git a/app/models/spree/line_item.rb b/app/models/spree/line_item.rb index ef0ea3a86b..0f487a4913 100644 --- a/app/models/spree/line_item.rb +++ b/app/models/spree/line_item.rb @@ -202,7 +202,7 @@ module Spree fees = adjustments.enterprise_fee.sum(:amount) - (price + fees / quantity).round(2) + (price + (fees / quantity)).round(2) end def single_display_amount_with_adjustments diff --git a/app/models/spree/preferences/store.rb b/app/models/spree/preferences/store.rb index 5eff5b2864..8ede8e3901 100644 --- a/app/models/spree/preferences/store.rb +++ b/app/models/spree/preferences/store.rb @@ -25,7 +25,7 @@ module Spree def exist?(key) @cache.exist?(key) || - should_persist? && Spree::Preference.where(key: key).exists? + (should_persist? && Spree::Preference.where(key: key).exists?) end def get(key, fallback = nil)