diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 410348d6e4..6b3a7c7b98 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: 115
+# Offense count: 98
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Inferences.
 RSpecRails/InferredSpecType:
   Exclude:
-    - 'spec/controllers/api/v0/customers_controller_spec.rb'
-    - 'spec/controllers/api/v0/enterprise_fees_controller_spec.rb'
-    - 'spec/controllers/api/v0/enterprises_controller_spec.rb'
-    - 'spec/controllers/api/v0/exchange_products_controller_spec.rb'
-    - 'spec/controllers/api/v0/logos_controller_spec.rb'
-    - 'spec/controllers/api/v0/order_cycles_controller_spec.rb'
-    - 'spec/controllers/api/v0/orders_controller_spec.rb'
-    - 'spec/controllers/api/v0/product_images_controller_spec.rb'
-    - 'spec/controllers/api/v0/products_controller_spec.rb'
-    - 'spec/controllers/api/v0/promo_images_controller_spec.rb'
-    - 'spec/controllers/api/v0/reports/packing_report_spec.rb'
-    - 'spec/controllers/api/v0/reports_controller_spec.rb'
-    - 'spec/controllers/api/v0/shipments_controller_spec.rb'
-    - 'spec/controllers/api/v0/shops_controller_spec.rb'
-    - 'spec/controllers/api/v0/statuses_controller_spec.rb'
-    - 'spec/controllers/api/v0/terms_and_conditions_controller_spec.rb'
-    - 'spec/controllers/api/v0/variants_controller_spec.rb'
     - 'spec/controllers/base_controller_spec.rb'
     - 'spec/controllers/cart_controller_spec.rb'
     - 'spec/controllers/checkout_controller_spec.rb'
diff --git a/spec/controllers/api/v0/customers_controller_spec.rb b/spec/controllers/api/v0/customers_controller_spec.rb
index f77fd470fe..57389a238a 100644
--- a/spec/controllers/api/v0/customers_controller_spec.rb
+++ b/spec/controllers/api/v0/customers_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Api
-  RSpec.describe V0::CustomersController, type: :controller do
+  RSpec.describe V0::CustomersController do
     include AuthenticationHelper
     render_views
 
diff --git a/spec/controllers/api/v0/enterprise_fees_controller_spec.rb b/spec/controllers/api/v0/enterprise_fees_controller_spec.rb
index 06a7b564fe..bca69dd91f 100644
--- a/spec/controllers/api/v0/enterprise_fees_controller_spec.rb
+++ b/spec/controllers/api/v0/enterprise_fees_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Api
-  RSpec.describe V0::EnterpriseFeesController, type: :controller do
+  RSpec.describe V0::EnterpriseFeesController do
     include AuthenticationHelper
 
     let!(:unreferenced_fee) { create(:enterprise_fee) }
diff --git a/spec/controllers/api/v0/enterprises_controller_spec.rb b/spec/controllers/api/v0/enterprises_controller_spec.rb
index 5224c5f2e5..397f7e1953 100644
--- a/spec/controllers/api/v0/enterprises_controller_spec.rb
+++ b/spec/controllers/api/v0/enterprises_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Api::V0::EnterprisesController, type: :controller do
+RSpec.describe Api::V0::EnterprisesController do
   render_views
 
   let(:enterprise) { create(:distributor_enterprise) }
diff --git a/spec/controllers/api/v0/exchange_products_controller_spec.rb b/spec/controllers/api/v0/exchange_products_controller_spec.rb
index f290186450..03f6176e25 100644
--- a/spec/controllers/api/v0/exchange_products_controller_spec.rb
+++ b/spec/controllers/api/v0/exchange_products_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Api
-  RSpec.describe V0::ExchangeProductsController, type: :controller do
+  RSpec.describe V0::ExchangeProductsController do
     include AuthenticationHelper
 
     let(:order_cycle) { create(:order_cycle) }
diff --git a/spec/controllers/api/v0/logos_controller_spec.rb b/spec/controllers/api/v0/logos_controller_spec.rb
index ac99bc272f..80148f1490 100644
--- a/spec/controllers/api/v0/logos_controller_spec.rb
+++ b/spec/controllers/api/v0/logos_controller_spec.rb
@@ -3,7 +3,7 @@
 require "spec_helper"
 
 module Api
-  RSpec.describe V0::LogosController, type: :controller do
+  RSpec.describe V0::LogosController do
     include AuthenticationHelper
     include FileHelper
 
diff --git a/spec/controllers/api/v0/order_cycles_controller_spec.rb b/spec/controllers/api/v0/order_cycles_controller_spec.rb
index 55d667b1e0..b42c8d28e8 100644
--- a/spec/controllers/api/v0/order_cycles_controller_spec.rb
+++ b/spec/controllers/api/v0/order_cycles_controller_spec.rb
@@ -3,7 +3,7 @@
 require "spec_helper"
 
 module Api
-  RSpec.describe V0::OrderCyclesController, type: :controller do
+  RSpec.describe V0::OrderCyclesController do
     let!(:distributor) { create(:distributor_enterprise) }
     let!(:order_cycle) { create(:simple_order_cycle, distributors: [distributor]) }
     let!(:exchange) { order_cycle.exchanges.to_enterprises(distributor).outgoing.first }
diff --git a/spec/controllers/api/v0/orders_controller_spec.rb b/spec/controllers/api/v0/orders_controller_spec.rb
index 46af729b6d..e0245dceff 100644
--- a/spec/controllers/api/v0/orders_controller_spec.rb
+++ b/spec/controllers/api/v0/orders_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Api
-  RSpec.describe V0::OrdersController, type: :controller do
+  RSpec.describe V0::OrdersController do
     include AuthenticationHelper
     render_views
 
diff --git a/spec/controllers/api/v0/product_images_controller_spec.rb b/spec/controllers/api/v0/product_images_controller_spec.rb
index 60e90b997f..3b1cb45673 100644
--- a/spec/controllers/api/v0/product_images_controller_spec.rb
+++ b/spec/controllers/api/v0/product_images_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Api::V0::ProductImagesController, type: :controller do
+RSpec.describe Api::V0::ProductImagesController do
   include AuthenticationHelper
   include FileHelper
   render_views
diff --git a/spec/controllers/api/v0/products_controller_spec.rb b/spec/controllers/api/v0/products_controller_spec.rb
index 3fcaa49a07..8150cf9332 100644
--- a/spec/controllers/api/v0/products_controller_spec.rb
+++ b/spec/controllers/api/v0/products_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 require 'spree/core/product_duplicator'
 
-RSpec.describe Api::V0::ProductsController, type: :controller do
+RSpec.describe Api::V0::ProductsController do
   render_views
 
   let(:supplier) { create(:supplier_enterprise) }
diff --git a/spec/controllers/api/v0/promo_images_controller_spec.rb b/spec/controllers/api/v0/promo_images_controller_spec.rb
index df12d3a70f..05e517ff93 100644
--- a/spec/controllers/api/v0/promo_images_controller_spec.rb
+++ b/spec/controllers/api/v0/promo_images_controller_spec.rb
@@ -3,7 +3,7 @@
 require "spec_helper"
 
 module Api
-  RSpec.describe V0::PromoImagesController, type: :controller do
+  RSpec.describe V0::PromoImagesController do
     include AuthenticationHelper
     include FileHelper
 
diff --git a/spec/controllers/api/v0/reports/packing_report_spec.rb b/spec/controllers/api/v0/reports/packing_report_spec.rb
index 055ddc737d..dc69ddc647 100644
--- a/spec/controllers/api/v0/reports/packing_report_spec.rb
+++ b/spec/controllers/api/v0/reports/packing_report_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe Api::V0::ReportsController, type: :controller do
+RSpec.describe Api::V0::ReportsController do
   let(:params) {
     {
       report_type: 'packing',
diff --git a/spec/controllers/api/v0/reports_controller_spec.rb b/spec/controllers/api/v0/reports_controller_spec.rb
index 7f7dd358fe..612db3036a 100644
--- a/spec/controllers/api/v0/reports_controller_spec.rb
+++ b/spec/controllers/api/v0/reports_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe Api::V0::ReportsController, type: :controller do
+RSpec.describe Api::V0::ReportsController do
   let(:enterprise_user) { create(:user, enterprises: [create(:enterprise)]) }
   let(:params) {
     {
diff --git a/spec/controllers/api/v0/shipments_controller_spec.rb b/spec/controllers/api/v0/shipments_controller_spec.rb
index 4298373ab4..e79c9dcec9 100644
--- a/spec/controllers/api/v0/shipments_controller_spec.rb
+++ b/spec/controllers/api/v0/shipments_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Api::V0::ShipmentsController, type: :controller do
+RSpec.describe Api::V0::ShipmentsController do
   render_views
 
   let!(:shipment) { create(:shipment) }
diff --git a/spec/controllers/api/v0/shops_controller_spec.rb b/spec/controllers/api/v0/shops_controller_spec.rb
index b3acf2d710..a494ebb254 100644
--- a/spec/controllers/api/v0/shops_controller_spec.rb
+++ b/spec/controllers/api/v0/shops_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Api::V0::ShopsController, type: :controller do
+RSpec.describe Api::V0::ShopsController do
   include AuthenticationHelper
   render_views
 
diff --git a/spec/controllers/api/v0/statuses_controller_spec.rb b/spec/controllers/api/v0/statuses_controller_spec.rb
index 3fd9973b3a..d27a7aa69a 100644
--- a/spec/controllers/api/v0/statuses_controller_spec.rb
+++ b/spec/controllers/api/v0/statuses_controller_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 module Api
-  RSpec.describe V0::StatusesController, type: :controller do
+  RSpec.describe V0::StatusesController do
     render_views
 
     describe "job queue status" do
diff --git a/spec/controllers/api/v0/terms_and_conditions_controller_spec.rb b/spec/controllers/api/v0/terms_and_conditions_controller_spec.rb
index e6e6bdefc2..7a24529c39 100644
--- a/spec/controllers/api/v0/terms_and_conditions_controller_spec.rb
+++ b/spec/controllers/api/v0/terms_and_conditions_controller_spec.rb
@@ -3,7 +3,7 @@
 require "spec_helper"
 
 module Api
-  RSpec.describe V0::TermsAndConditionsController, type: :controller do
+  RSpec.describe V0::TermsAndConditionsController do
     include AuthenticationHelper
     include FileHelper
 
diff --git a/spec/controllers/api/v0/variants_controller_spec.rb b/spec/controllers/api/v0/variants_controller_spec.rb
index 744ddedbd2..df3456eecb 100644
--- a/spec/controllers/api/v0/variants_controller_spec.rb
+++ b/spec/controllers/api/v0/variants_controller_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Api::V0::VariantsController, type: :controller do
+RSpec.describe Api::V0::VariantsController do
   render_views
 
   let(:supplier) { create(:supplier_enterprise) }