From a7eb95afc534d56a2c33b1062b22e57673eb6d2d Mon Sep 17 00:00:00 2001 From: cyrillefr Date: Mon, 19 May 2025 09:29:47 +0200 Subject: [PATCH] Fixes RSpecRailsInferredSpecType in base controllers --- .rubocop_todo.yml | 17 +---------------- spec/controllers/base_controller_spec.rb | 2 +- spec/controllers/cart_controller_spec.rb | 2 +- spec/controllers/checkout_controller_spec.rb | 2 +- spec/controllers/enterprises_controller_spec.rb | 2 +- spec/controllers/groups_controller_spec.rb | 2 +- spec/controllers/line_items_controller_spec.rb | 2 +- .../controllers/registration_controller_spec.rb | 2 +- spec/controllers/shop_controller_spec.rb | 2 +- spec/controllers/shops_controller_spec.rb | 2 +- .../user_confirmations_controller_spec.rb | 2 +- .../user_passwords_controller_spec.rb | 2 +- .../user_registrations_controller_spec.rb | 2 +- .../webhook_endpoints_controller_spec.rb | 2 +- 14 files changed, 14 insertions(+), 29 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 6b3a7c7b98..2595d2040f 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -221,22 +221,11 @@ Metrics/PerceivedComplexity: - 'app/models/spree/ability.rb' - 'app/models/spree/order/checkout.rb' -# Offense count: 98 +# Offense count: 85 # This cop supports unsafe autocorrection (--autocorrect-all). # Configuration parameters: Inferences. RSpecRails/InferredSpecType: Exclude: - - 'spec/controllers/base_controller_spec.rb' - - 'spec/controllers/cart_controller_spec.rb' - - 'spec/controllers/checkout_controller_spec.rb' - - 'spec/controllers/enterprises_controller_spec.rb' - - 'spec/controllers/groups_controller_spec.rb' - - 'spec/controllers/line_items_controller_spec.rb' - - 'spec/controllers/payment_gateways/paypal_controller_spec.rb' - - 'spec/controllers/payment_gateways/stripe_controller_spec.rb' - - 'spec/controllers/registration_controller_spec.rb' - - 'spec/controllers/shop_controller_spec.rb' - - 'spec/controllers/shops_controller_spec.rb' - 'spec/controllers/spree/admin/adjustments_controller_spec.rb' - 'spec/controllers/spree/admin/base_controller_spec.rb' - 'spec/controllers/spree/admin/countries_controller_spec.rb' @@ -263,10 +252,6 @@ RSpecRails/InferredSpecType: - 'spec/controllers/spree/users_controller_spec.rb' - 'spec/controllers/stripe/callbacks_controller_spec.rb' - 'spec/controllers/stripe/webhooks_controller_spec.rb' - - 'spec/controllers/user_confirmations_controller_spec.rb' - - 'spec/controllers/user_passwords_controller_spec.rb' - - 'spec/controllers/user_registrations_controller_spec.rb' - - 'spec/controllers/webhook_endpoints_controller_spec.rb' - 'spec/helpers/admin/enterprises_helper_spec.rb' - 'spec/helpers/admin/orders_helper_spec.rb' - 'spec/helpers/admin/reports_helper_spec.rb' diff --git a/spec/controllers/base_controller_spec.rb b/spec/controllers/base_controller_spec.rb index 0c9ff572ad..e5f07ec8b6 100644 --- a/spec/controllers/base_controller_spec.rb +++ b/spec/controllers/base_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe BaseController, type: :controller do +RSpec.describe BaseController do let(:oc) { instance_double(OrderCycle, id: 1) } let(:order) { instance_double(Spree::Order) } controller(BaseController) do diff --git a/spec/controllers/cart_controller_spec.rb b/spec/controllers/cart_controller_spec.rb index 3d8322dfcb..b08cca2b12 100644 --- a/spec/controllers/cart_controller_spec.rb +++ b/spec/controllers/cart_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe CartController, type: :controller do +RSpec.describe CartController do let(:order) { create(:order) } describe "basic behaviour" do diff --git a/spec/controllers/checkout_controller_spec.rb b/spec/controllers/checkout_controller_spec.rb index 88a900da9b..165264f47e 100644 --- a/spec/controllers/checkout_controller_spec.rb +++ b/spec/controllers/checkout_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe CheckoutController, type: :controller do +RSpec.describe CheckoutController do let(:user) { order.user } let(:address) { create(:address) } let(:distributor) { create(:distributor_enterprise, with_payment_and_shipping: true) } diff --git a/spec/controllers/enterprises_controller_spec.rb b/spec/controllers/enterprises_controller_spec.rb index 149b7ae881..c209307cfb 100644 --- a/spec/controllers/enterprises_controller_spec.rb +++ b/spec/controllers/enterprises_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe EnterprisesController, type: :controller do +RSpec.describe EnterprisesController do describe "shopping for a distributor" do let(:user) { create(:user) } let(:order) { controller.current_order(true) } diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb index a7d91c3522..1ad96df7e8 100644 --- a/spec/controllers/groups_controller_spec.rb +++ b/spec/controllers/groups_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe GroupsController, type: :controller do +RSpec.describe GroupsController do render_views let!(:enterprise) { create(:distributor_enterprise) } diff --git a/spec/controllers/line_items_controller_spec.rb b/spec/controllers/line_items_controller_spec.rb index 7b4fb970de..42ab3ba13a 100644 --- a/spec/controllers/line_items_controller_spec.rb +++ b/spec/controllers/line_items_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe LineItemsController, type: :controller do +RSpec.describe LineItemsController do let(:user) { create(:user) } let(:distributor) { create(:distributor_enterprise) } let(:order_cycle) { create(:simple_order_cycle) } diff --git a/spec/controllers/registration_controller_spec.rb b/spec/controllers/registration_controller_spec.rb index bb87674ba9..c89c43eb8f 100644 --- a/spec/controllers/registration_controller_spec.rb +++ b/spec/controllers/registration_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe RegistrationController, type: :controller do +RSpec.describe RegistrationController do describe "redirecting when user not logged in" do it "index" do get :index diff --git a/spec/controllers/shop_controller_spec.rb b/spec/controllers/shop_controller_spec.rb index 0986630c68..437a737ee0 100644 --- a/spec/controllers/shop_controller_spec.rb +++ b/spec/controllers/shop_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ShopController, type: :controller do +RSpec.describe ShopController do let!(:pm) { create(:payment_method) } let!(:sm) { create(:shipping_method) } let(:distributor) { diff --git a/spec/controllers/shops_controller_spec.rb b/spec/controllers/shops_controller_spec.rb index 84d639eb13..914da71979 100644 --- a/spec/controllers/shops_controller_spec.rb +++ b/spec/controllers/shops_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ShopsController, type: :controller do +RSpec.describe ShopsController do include WebHelper render_views diff --git a/spec/controllers/user_confirmations_controller_spec.rb b/spec/controllers/user_confirmations_controller_spec.rb index d276d4c874..c19768c8ee 100644 --- a/spec/controllers/user_confirmations_controller_spec.rb +++ b/spec/controllers/user_confirmations_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe UserConfirmationsController, type: :controller do +RSpec.describe UserConfirmationsController do let!(:user) { create(:user) } let!(:confirmed_user) { create(:user, confirmed_at: nil) } let!(:unconfirmed_user) { create(:user, confirmed_at: nil) } diff --git a/spec/controllers/user_passwords_controller_spec.rb b/spec/controllers/user_passwords_controller_spec.rb index 3db687cfc2..d873c7df96 100644 --- a/spec/controllers/user_passwords_controller_spec.rb +++ b/spec/controllers/user_passwords_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe UserPasswordsController, type: :controller do +RSpec.describe UserPasswordsController do render_views let(:user) { create(:user) } diff --git a/spec/controllers/user_registrations_controller_spec.rb b/spec/controllers/user_registrations_controller_spec.rb index db83429068..559cec3569 100644 --- a/spec/controllers/user_registrations_controller_spec.rb +++ b/spec/controllers/user_registrations_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe UserRegistrationsController, type: :controller do +RSpec.describe UserRegistrationsController do before do @request.env["devise.mapping"] = Devise.mappings[:spree_user] end diff --git a/spec/controllers/webhook_endpoints_controller_spec.rb b/spec/controllers/webhook_endpoints_controller_spec.rb index bd6ea07961..4eb2e50f1a 100644 --- a/spec/controllers/webhook_endpoints_controller_spec.rb +++ b/spec/controllers/webhook_endpoints_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require 'open_food_network/order_cycle_permissions' -RSpec.describe WebhookEndpointsController, type: :controller do +RSpec.describe WebhookEndpointsController do let(:user) { create(:admin_user) } before { allow(controller).to receive(:spree_current_user) { user } }