From f357c3ff30bc95399855601efc1c4ce8f9442f4f Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 23 Apr 2021 19:20:25 +0100
Subject: [PATCH] Remove require_dependency or use require

See here https://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#require-dependency
---
 app/controllers/api/v0/base_controller.rb                       | 2 +-
 app/controllers/application_controller.rb                       | 2 +-
 app/models/calculator/default_tax.rb                            | 1 -
 app/models/calculator/flat_percent_item_total.rb                | 1 -
 app/models/calculator/flat_percent_per_item.rb                  | 1 -
 app/models/calculator/flat_rate.rb                              | 1 -
 app/models/calculator/flexi_rate.rb                             | 1 -
 app/models/calculator/per_item.rb                               | 1 -
 app/models/calculator/price_sack.rb                             | 1 -
 .../app/controllers/web/api/v0/cookies_consent_controller.rb    | 2 +-
 10 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/controllers/api/v0/base_controller.rb b/app/controllers/api/v0/base_controller.rb
index 676d32e183..0f3aec1189 100644
--- a/app/controllers/api/v0/base_controller.rb
+++ b/app/controllers/api/v0/base_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Base controller for OFN's API
-require_dependency 'spree/api/controller_setup'
+require "spree/api/controller_setup"
 require "spree/core/controller_helpers/ssl"
 
 module Api
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 399d1ae9e1..ef25c50d64 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_dependency 'spree/authentication_helpers'
+require "spree/authentication_helpers"
 require "application_responder"
 require 'cancan'
 require 'spree/core/controller_helpers/auth'
diff --git a/app/models/calculator/default_tax.rb b/app/models/calculator/default_tax.rb
index 3ab75caac3..fb764340fa 100644
--- a/app/models/calculator/default_tax.rb
+++ b/app/models/calculator/default_tax.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 
-require_dependency 'spree/calculator'
 require 'open_food_network/enterprise_fee_calculator'
 
 module Calculator
diff --git a/app/models/calculator/flat_percent_item_total.rb b/app/models/calculator/flat_percent_item_total.rb
index 79c2f1f400..d4c2067444 100644
--- a/app/models/calculator/flat_percent_item_total.rb
+++ b/app/models/calculator/flat_percent_item_total.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 
-require_dependency 'spree/calculator'
 require 'spree/localized_number'
 
 module Calculator
diff --git a/app/models/calculator/flat_percent_per_item.rb b/app/models/calculator/flat_percent_per_item.rb
index b1b6a851a0..84d4f73b8f 100644
--- a/app/models/calculator/flat_percent_per_item.rb
+++ b/app/models/calculator/flat_percent_per_item.rb
@@ -1,4 +1,3 @@
-require_dependency 'spree/calculator'
 require 'spree/localized_number'
 
 class Calculator::FlatPercentPerItem < Spree::Calculator
diff --git a/app/models/calculator/flat_rate.rb b/app/models/calculator/flat_rate.rb
index d8bc14ca8f..6dae041ec3 100644
--- a/app/models/calculator/flat_rate.rb
+++ b/app/models/calculator/flat_rate.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 
-require_dependency 'spree/calculator'
 require 'spree/localized_number'
 
 module Calculator
diff --git a/app/models/calculator/flexi_rate.rb b/app/models/calculator/flexi_rate.rb
index 76ae53379a..09a0978018 100644
--- a/app/models/calculator/flexi_rate.rb
+++ b/app/models/calculator/flexi_rate.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 
-require_dependency 'spree/calculator'
 require 'spree/localized_number'
 
 module Calculator
diff --git a/app/models/calculator/per_item.rb b/app/models/calculator/per_item.rb
index 49b2df35c4..b5e8d86e91 100644
--- a/app/models/calculator/per_item.rb
+++ b/app/models/calculator/per_item.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 
-require_dependency 'spree/calculator'
 require 'spree/localized_number'
 
 module Calculator
diff --git a/app/models/calculator/price_sack.rb b/app/models/calculator/price_sack.rb
index cb6d185bd6..6ee294d6a1 100644
--- a/app/models/calculator/price_sack.rb
+++ b/app/models/calculator/price_sack.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 
-require_dependency 'spree/calculator'
 # For #to_d method on Ruby 1.8
 require 'bigdecimal/util'
 require 'spree/localized_number'
diff --git a/engines/web/app/controllers/web/api/v0/cookies_consent_controller.rb b/engines/web/app/controllers/web/api/v0/cookies_consent_controller.rb
index 606ad3e237..59a3e62f7d 100644
--- a/engines/web/app/controllers/web/api/v0/cookies_consent_controller.rb
+++ b/engines/web/app/controllers/web/api/v0/cookies_consent_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_dependency 'web/cookies_consent'
+require "web/cookies_consent"
 
 module Web
   module Api