Merge pull request #3818 from nebulab/kennyadsl/remove-all-deprecations

Remove all code deprecated in Solidus v2.x

.eslintrc.json

@@ -93,7 +93,6 @@
     "Sortable": "readonly",
     "Spree": "readonly",
     "Turbolinks": "readonly",
-    "update_state": "writable",
-    "Proxy": "readonly"
+    "update_state": "writable"
   }
 }

Rakefile

@@ -102,9 +102,3 @@ namespace :gem do
     end
   end
 end
-
-desc "Creates a sandbox application for simulating the Solidus code in a deployed Rails app"
-task :sandbox do
-  warn "Using `rake sandbox` is deprecated, please use bin/sandbox directly instead."
-  sh("bin/sandbox")
-end

api/app/controllers/spree/api/base_controller.rb

@@ -103,7 +103,7 @@ def invalid_resource!(resource)
       end
 
       def api_key
-        bearer_token || spree_token || params[:token]
+        bearer_token || params[:token]
       end
       helper_method :api_key
 
@@ -113,17 +113,6 @@ def bearer_token
         header.gsub(pattern, '') if header.present? && header.match(pattern)
       end
 
-      def spree_token
-        token = request.headers["X-Spree-Token"]
-        return if token.blank?
-
-        Spree::Deprecation.warn(
-          'The custom X-Spree-Token request header is deprecated and will be removed in the next release.' \
-          ' Please use bearer token authorization header instead.'
-        )
-        token
-      end
-
       def order_token
         request.headers["X-Spree-Order-Token"] || params[:order_token]
       end

api/app/controllers/spree/api/checkouts_controller.rb

@@ -9,11 +9,10 @@ class CheckoutsController < Spree::Api::BaseController
 
       rescue_from Spree::Order::InsufficientStock, with: :insufficient_stock_error
 
-      include Spree::Core::ControllerHelpers::Order
-
-      # TODO: Remove this after deprecated usage in #update is removed
       include Spree::Core::ControllerHelpers::PaymentParameters
 
+      include Spree::Core::ControllerHelpers::Order
+
       def next
         authorize! :update, @order, order_token
         if !expected_total_ok?(params[:expected_total])
@@ -116,17 +115,6 @@ def state_callback(before_or_after = :before)
       end
 
       def after_update_attributes
-        if params[:order] && params[:order][:coupon_code].present?
-          Spree::Deprecation.warn('This method is deprecated. Please use `Spree::Api::CouponCodesController#create` endpoint instead.')
-          handler = PromotionHandler::Coupon.new(@order)
-          handler.apply
-
-          if handler.error.present?
-            @coupon_message = handler.error
-            respond_with(@order, default_template: 'spree/api/orders/could_not_apply_coupon', status: 422)
-            return true
-          end
-        end
         false
       end
 

api/app/controllers/spree/api/orders_controller.rb

@@ -12,8 +12,6 @@ class OrdersController < Spree::Api::BaseController
       class_attribute :admin_payment_attributes
       self.admin_payment_attributes = [:payment_method, :amount, :state, source: {}]
 
-      skip_before_action :authenticate_user, only: :apply_coupon_code
-
       before_action :find_order, except: [:create, :mine, :current, :index]
       around_action :lock_order, except: [:create, :mine, :current, :index, :show]
 
@@ -104,20 +102,6 @@ def mine
         end
       end
 
-      def apply_coupon_code
-        Spree::Deprecation.warn('This method is deprecated. Please use `Spree::Api::CouponCodesController#create` endpoint instead.')
-
-        authorize! :update, @order, order_token
-        @order.coupon_code = params[:coupon_code]
-        @handler = PromotionHandler::Coupon.new(@order).apply
-        if @handler.successful?
-          render "spree/api/promotions/handler", status: 200
-        else
-          logger.error("apply_coupon_code_error=#{@handler.error.inspect}")
-          render "spree/api/promotions/handler", status: 422
-        end
-      end
-
       private
 
       def order_params

api/app/controllers/spree/api/taxonomies_controller.rb

@@ -15,12 +15,6 @@ def show
         respond_with(taxonomy)
       end
 
-      # Because JSTree wants parameters in a *slightly* different format
-      def jstree
-        Spree::Deprecation.warn("Please don't use `/api/taxonomies/:taxonomy_id/jstree` endpoint. It is deprecated and will be removed in the next future.", caller)
-        show
-      end
-
       def create
         authorize! :create, Taxonomy
         @taxonomy = Spree::Taxonomy.new(taxonomy_params)

api/app/controllers/spree/api/taxons_controller.rb

@@ -29,11 +29,6 @@ def show
         respond_with(@taxon)
       end
 
-      def jstree
-        Spree::Deprecation.warn("Please don't use `/api/taxonomies/:taxonomy_id/taxons/:taxon_id/jstree` endpoint. It is deprecated and will be removed in the next future.", caller)
-        show
-      end
-
       def create
         authorize! :create, Taxon
         @taxon = Spree::Taxon.new(taxon_params)

api/app/views/spree/api/config/show.json.jbuilder

@@ -1,4 +1,3 @@
 # frozen_string_literal: true
 
-json.default_country_id(Spree::Country.default.id)
 json.default_country_iso(Spree::Config[:default_country_iso])

api/config/routes.rb

@@ -4,11 +4,6 @@
   namespace :admin do
     resources :users do
       resource :api_key, controller: 'users/api_key', only: [:create, :destroy]
-
-      member do
-        put :generate_api_key # Deprecated
-        put :clear_api_key # Deprecated
-      end
     end
   end
 
@@ -68,7 +63,6 @@
       member do
         put :cancel
         put :empty
-        put :apply_coupon_code
       end
 
       resources :coupon_codes, only: [:create, :destroy]
@@ -99,14 +93,7 @@
     resources :states, only: [:index, :show]
 
     resources :taxonomies do
-      member do
-        get :jstree
-      end
-      resources :taxons do
-        member do
-          get :jstree
-        end
-      end
+      resources :taxons
     end
 
     resources :taxons, only: [:index]

api/lib/spree/api/responders/jbuilder_template.rb

@@ -16,8 +16,6 @@ def template
           options[:default_template]
         end
       end
-
-      RablTemplate = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('RablTemplate', 'JbuilderTemplate')
     end
   end
 end