Move spree orders routes out of the spree engine routes into the main app routes, still inside the spree namespace

config/routes/spree.rb

@@ -1,3 +1,13 @@
+Openfoodnetwork::Application.routes.draw do
+  namespace :spree do
+    resources :orders do
+      get :clear, :on => :collection
+      get :order_cycle_expired, :on => :collection
+      put :cancel, on: :member
+    end
+  end
+end
+
 # Overriding Devise routes to use our own controller
 Spree::Core::Engine.routes.draw do
   devise_for :spree_user,
@@ -159,12 +169,6 @@ Spree::Core::Engine.routes.draw do
     resources :payment_methods
   end
 
-  resources :orders do
-    get :clear, :on => :collection
-    get :order_cycle_expired, :on => :collection
-    put :cancel, on: :member
-  end
-
   resources :products
 
   # Used by spree_paypal_express

spec/controllers/spree/orders_controller_spec.rb

@@ -22,12 +22,12 @@ describe Spree::OrdersController, type: :controller do
       let(:current_user) { nil }
 
       it "loads page" do
-        spree_get :show, id: order.number, token: order.token
+        get :show, id: order.number, token: order.token
         expect(response).to be_success
       end
 
       it "stores order token in session as 'access_token'" do
-        spree_get :show, id: order.number, token: order.token
+        get :show, id: order.number, token: order.token
         expect(session[:access_token]).to eq(order.token)
       end
     end
@@ -41,7 +41,7 @@ describe Spree::OrdersController, type: :controller do
       end
 
       it "loads page" do
-        spree_get :show, id: order.number
+        get :show, id: order.number
         expect(response).to be_success
       end
     end
@@ -50,7 +50,7 @@ describe Spree::OrdersController, type: :controller do
       let(:current_user) { order.user }
 
       it "loads page" do
-        spree_get :show, id: order.number
+        get :show, id: order.number
         expect(response).to be_success
       end
     end
@@ -59,7 +59,7 @@ describe Spree::OrdersController, type: :controller do
       let(:current_user) { create(:user) }
 
       it "redirects to unauthorized" do
-        spree_get :show, id: order.number
+        get :show, id: order.number
         expect(response).to redirect_to unauthorized_path
       end
     end
@@ -72,7 +72,7 @@ describe Spree::OrdersController, type: :controller do
       end
 
       it "redirects to unauthorized" do
-        spree_get :show, id: order.number
+        get :show, id: order.number
         expect(response).to redirect_to(root_path(anchor: "login?after_login=#{spree.order_path(order)}"))
         expect(flash[:error]).to eq("Please log in to view your order.")
       end
@@ -81,7 +81,7 @@ describe Spree::OrdersController, type: :controller do
 
   describe "viewing cart" do
     it "redirects home when no distributor is selected" do
-      spree_get :edit
+      get :edit
       expect(response).to redirect_to root_path
     end
 
@@ -95,13 +95,13 @@ describe Spree::OrdersController, type: :controller do
       allow(order_cycle).to receive(:variants_distributed_by).and_return []
 
       session[:access_token] = order.token
-      spree_get :edit
+      get :edit
       expect(response).to redirect_to shop_path
     end
 
     it "redirects to the shop when no order cycle is selected" do
       allow(controller).to receive(:current_distributor).and_return(distributor)
-      spree_get :edit
+      get :edit
       expect(response).to redirect_to shop_path
     end
 
@@ -115,7 +115,7 @@ describe Spree::OrdersController, type: :controller do
       expect(order).to receive(:empty!)
       expect(order).to receive(:set_distribution!).with(nil, nil)
 
-      spree_get :edit
+      get :edit
 
       expect(response).to redirect_to root_url
       expect(flash[:info]).to eq(I18n.t('order_cycles_closed_for_hub'))
@@ -144,7 +144,7 @@ describe Spree::OrdersController, type: :controller do
           # We fixed our view by hardcoding the link.
           spree_registration_path = '/signup'
           ofn_registration_path = '/register'
-          spree_get :edit
+          get :edit
           expect(response.body).to_not match spree_registration_path
           expect(response.body).to match ofn_registration_path
         end
@@ -156,7 +156,7 @@ describe Spree::OrdersController, type: :controller do
         end
 
         it "displays a flash message when we view the cart" do
-          spree_get :edit
+          get :edit
           expect(response.status).to eq 200
           expect(flash[:error]).to eq I18n.t('spree.orders.error_flash_for_unavailable_items')
         end
@@ -168,7 +168,7 @@ describe Spree::OrdersController, type: :controller do
         end
 
         it "displays a flash message when we view the cart" do
-          spree_get :edit
+          get :edit
           expect(response.status).to eq 200
           expect(flash[:error]).to eq I18n.t('spree.orders.error_flash_for_unavailable_items')
         end
@@ -181,7 +181,7 @@ describe Spree::OrdersController, type: :controller do
       it "should silently ignore the missing line item" do
         order = subject.current_order(true)
         li = order.add_variant(create(:simple_product, on_hand: 110).variants.first)
-        spree_get :update, order: { line_items_attributes: {
+        get :update, order: { line_items_attributes: {
           "0" => { quantity: "0", id: "9999" },
           "1" => { quantity: "99", id: li.id }
         } }
@@ -209,7 +209,7 @@ describe Spree::OrdersController, type: :controller do
       line_item = order.add_variant(create(:simple_product, on_hand: 110).variants.first)
       adjustment = create(:adjustment, adjustable: order)
 
-      spree_get :update, order: { line_items_attributes: {
+      get :update, order: { line_items_attributes: {
         "1" => { quantity: "99", id: line_item.id }
       } }