diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 07b92b2f15..6f960ac65b 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -221,10 +221,9 @@ Metrics/PerceivedComplexity: - 'app/models/spree/ability.rb' - 'app/models/spree/order/checkout.rb' -# Offense count: 3 +# Offense count: 2 Naming/AccessorMethodName: Exclude: - - 'lib/spree/core/controller_helpers/common.rb' - 'spec/support/request/shop_workflow.rb' - 'spec/support/request/web_helper.rb' diff --git a/lib/spree/core/controller_helpers/common.rb b/lib/spree/core/controller_helpers/common.rb index 8f0da80bc7..279bb29637 100644 --- a/lib/spree/core/controller_helpers/common.rb +++ b/lib/spree/core/controller_helpers/common.rb @@ -10,7 +10,7 @@ module Spree helper_method :title= helper_method :accurate_title - layout :get_layout + layout :pick_layout before_action :set_user_language @@ -65,7 +65,7 @@ module Spree # Returns which layout to render. # The layout to render can be set inside Spree configuration with the +:layout+ option. # Default layout is: +app/views/spree/layouts/spree_application+ - def get_layout + def pick_layout Spree::Config[:layout] end end