diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 6e471c16a1..80125d9260 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -221,28 +221,11 @@ Metrics/PerceivedComplexity: - 'app/models/spree/ability.rb' - 'app/models/spree/order/checkout.rb' -# Offense count: 18 +# Offense count: 1 # This cop supports unsafe autocorrection (--autocorrect-all). # Configuration parameters: Inferences. RSpecRails/InferredSpecType: Exclude: - - 'spec/requests/admin/images_spec.rb' - - 'spec/requests/admin/product_import_spec.rb' - - 'spec/requests/admin/vouchers_spec.rb' - - 'spec/requests/api/orders_spec.rb' - - 'spec/requests/api/routes_spec.rb' - - 'spec/requests/api/v1/customers_spec.rb' - - 'spec/requests/api_docs_spec.rb' - - 'spec/requests/checkout/paypal_spec.rb' - - 'spec/requests/checkout/routes_spec.rb' - - 'spec/requests/checkout/stripe_sca_spec.rb' - - 'spec/requests/errors_spec.rb' - - 'spec/requests/home_controller_spec.rb' - - 'spec/requests/large_request_spec.rb' - - 'spec/requests/omniauth_callbacks_controller_spec.rb' - - 'spec/requests/spree/admin/overview_spec.rb' - - 'spec/requests/spree/admin/payments_spec.rb' - - 'spec/requests/voucher_adjustments_spec.rb' - 'spec/routing/stripe_spec.rb' # Offense count: 1 diff --git a/spec/requests/admin/images_spec.rb b/spec/requests/admin/images_spec.rb index a62f9bef81..f86f36b86a 100644 --- a/spec/requests/admin/images_spec.rb +++ b/spec/requests/admin/images_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe "/admin/products/:product_id/images", type: :request do +RSpec.describe "/admin/products/:product_id/images" do include AuthenticationHelper let!(:product) { create(:product) } diff --git a/spec/requests/admin/product_import_spec.rb b/spec/requests/admin/product_import_spec.rb index b3c968748d..de6e066817 100644 --- a/spec/requests/admin/product_import_spec.rb +++ b/spec/requests/admin/product_import_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe "Product Import", type: :request do +RSpec.describe "Product Import" do include AuthenticationHelper describe "validate_data" do diff --git a/spec/requests/admin/vouchers_spec.rb b/spec/requests/admin/vouchers_spec.rb index 64c16ef7ff..3c3eb7e6fb 100644 --- a/spec/requests/admin/vouchers_spec.rb +++ b/spec/requests/admin/vouchers_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe "/admin/enterprises/:enterprise_id/vouchers", type: :request do +RSpec.describe "/admin/enterprises/:enterprise_id/vouchers" do let(:enterprise) { create(:supplier_enterprise, name: "Feedme") } let(:enterprise_user) { create(:user, enterprise_limit: 1) } diff --git a/spec/requests/api/orders_spec.rb b/spec/requests/api/orders_spec.rb index 88078720b8..2e72d07eba 100644 --- a/spec/requests/api/orders_spec.rb +++ b/spec/requests/api/orders_spec.rb @@ -2,7 +2,7 @@ require 'swagger_helper' -RSpec.describe 'api/v0/orders', swagger_doc: 'v0.yaml', type: :request do +RSpec.describe 'api/v0/orders', swagger_doc: 'v0.yaml' do path '/api/v0/orders' do get('list orders') do tags 'Orders' diff --git a/spec/requests/api/routes_spec.rb b/spec/requests/api/routes_spec.rb index 1ea8b2287c..a702010471 100644 --- a/spec/requests/api/routes_spec.rb +++ b/spec/requests/api/routes_spec.rb @@ -3,7 +3,7 @@ # test a single endpoint to make sure the redirects are working as intended. require 'spec_helper' -RSpec.describe 'Orders Cycles endpoint', type: :request do +RSpec.describe 'Orders Cycles endpoint' do let(:distributor) { create(:distributor_enterprise) } let(:order_cycle) { create(:order_cycle, distributors: [distributor]) } diff --git a/spec/requests/api/v1/customers_spec.rb b/spec/requests/api/v1/customers_spec.rb index bc9e8308cc..0d10c3ef0c 100644 --- a/spec/requests/api/v1/customers_spec.rb +++ b/spec/requests/api/v1/customers_spec.rb @@ -2,7 +2,7 @@ require "swagger_helper" -RSpec.describe "Customers", type: :request, swagger_doc: "v1.yaml", feature: :api_v1 do +RSpec.describe "Customers", swagger_doc: "v1.yaml", feature: :api_v1 do let!(:enterprise1) { create(:enterprise, name: "The Farm") } let!(:enterprise2) { create(:enterprise) } let!(:enterprise3) { create(:enterprise) } diff --git a/spec/requests/api_docs_spec.rb b/spec/requests/api_docs_spec.rb index f2d8fb5ab6..57ec4292e1 100644 --- a/spec/requests/api_docs_spec.rb +++ b/spec/requests/api_docs_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe "API documentation", type: :request do +RSpec.describe "API documentation" do it "shows the OFN API v1" do get rswag_ui_path expect(response).to redirect_to "/api-docs/index.html" diff --git a/spec/requests/checkout/paypal_spec.rb b/spec/requests/checkout/paypal_spec.rb index a5cbe87a8a..05eab82d63 100644 --- a/spec/requests/checkout/paypal_spec.rb +++ b/spec/requests/checkout/paypal_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe "checking out an order with a paypal express payment method", type: :request do +RSpec.describe "checking out an order with a paypal express payment method" do include ShopWorkflow include PaypalHelper diff --git a/spec/requests/checkout/routes_spec.rb b/spec/requests/checkout/routes_spec.rb index 9ae03183bb..6cbe586d3a 100644 --- a/spec/requests/checkout/routes_spec.rb +++ b/spec/requests/checkout/routes_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'checkout endpoints', type: :request do +RSpec.describe 'checkout endpoints' do include ShopWorkflow let!(:shop) { create(:enterprise) } diff --git a/spec/requests/checkout/stripe_sca_spec.rb b/spec/requests/checkout/stripe_sca_spec.rb index fc67d17910..12af937792 100644 --- a/spec/requests/checkout/stripe_sca_spec.rb +++ b/spec/requests/checkout/stripe_sca_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe "checking out an order with a Stripe SCA payment method", type: :request do +RSpec.describe "checking out an order with a Stripe SCA payment method" do include ShopWorkflow include AuthenticationHelper include OpenFoodNetwork::ApiHelper diff --git a/spec/requests/errors_spec.rb b/spec/requests/errors_spec.rb index 0d44cc5ada..f0a364749a 100644 --- a/spec/requests/errors_spec.rb +++ b/spec/requests/errors_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Errors', type: :request do +RSpec.describe 'Errors' do include ExceptionHelper shared_examples "returning a HTTP 404" do |path| diff --git a/spec/requests/home_controller_spec.rb b/spec/requests/home_controller_spec.rb index b5ba8111db..04c9eab414 100644 --- a/spec/requests/home_controller_spec.rb +++ b/spec/requests/home_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe HomeController, type: :request do +RSpec.describe HomeController do context "#unauthorized" do it "renders the unauthorized template" do get "/unauthorized" diff --git a/spec/requests/large_request_spec.rb b/spec/requests/large_request_spec.rb index 2bb91d853f..ce5fbefb59 100644 --- a/spec/requests/large_request_spec.rb +++ b/spec/requests/large_request_spec.rb @@ -5,7 +5,7 @@ # http://daniel.fone.net.nz/blog/2014/11/28/actiondispatch-cookies-cookieoverflow-via-devise-s-user_return_to/ require 'spec_helper' -RSpec.describe 'A very large request', type: :request do +RSpec.describe 'A very large request' do it 'should not overflow cookies' do get '/admin', params: { foo: 'x' * ActionDispatch::Cookies::MAX_COOKIE_SIZE } expect(response).to have_http_status(:redirect) diff --git a/spec/requests/omniauth_callbacks_controller_spec.rb b/spec/requests/omniauth_callbacks_controller_spec.rb index d416559850..27f1ba9a54 100644 --- a/spec/requests/omniauth_callbacks_controller_spec.rb +++ b/spec/requests/omniauth_callbacks_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' # Devise calls OmniauthCallbacksController for OpenID Connect callbacks. -RSpec.describe '/user/spree_user/auth/openid_connect/callback', type: :request do +RSpec.describe '/user/spree_user/auth/openid_connect/callback' do include AuthenticationHelper let(:user) { create(:user) } diff --git a/spec/requests/spree/admin/overview_spec.rb b/spec/requests/spree/admin/overview_spec.rb index 4d5739f88c..8649f0f57d 100644 --- a/spec/requests/spree/admin/overview_spec.rb +++ b/spec/requests/spree/admin/overview_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe "/admin", type: :request do +RSpec.describe "/admin" do let(:enterprise) { create(:supplier_enterprise, name: "Feedme") } let(:enterprise_user) { create(:user, enterprise_limit: 1) } diff --git a/spec/requests/spree/admin/payments_spec.rb b/spec/requests/spree/admin/payments_spec.rb index f8e9f6e3c6..2a60c8cfa6 100644 --- a/spec/requests/spree/admin/payments_spec.rb +++ b/spec/requests/spree/admin/payments_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe Spree::Admin::PaymentsController, type: :request do +RSpec.describe Spree::Admin::PaymentsController do let(:user) { order.user } let(:order) { create(:completed_order_with_fees) } diff --git a/spec/requests/voucher_adjustments_spec.rb b/spec/requests/voucher_adjustments_spec.rb index e4b3712a46..34c374e30d 100644 --- a/spec/requests/voucher_adjustments_spec.rb +++ b/spec/requests/voucher_adjustments_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe VoucherAdjustmentsController, type: :request do +RSpec.describe VoucherAdjustmentsController do let(:user) { order.user } let(:address) { create(:address) } let(:distributor) { create(:distributor_enterprise, with_payment_and_shipping: true) }