diff --git a/spec/controllers/admin/enterprises_controller_spec.rb b/spec/controllers/admin/enterprises_controller_spec.rb index c707fd759f..a51af80b36 100644 --- a/spec/controllers/admin/enterprises_controller_spec.rb +++ b/spec/controllers/admin/enterprises_controller_spec.rb @@ -136,7 +136,7 @@ describe Admin::EnterprisesController, type: :controller do let!(:property) { create(:property, name: "A nice name") } before do - login_as_enterprise_user [producer] + controller_login_as_enterprise_user [producer] end context "when a submitted property does not already exist" do @@ -177,7 +177,7 @@ describe Admin::EnterprisesController, type: :controller do let!(:tag_rule) { create(:tag_rule, enterprise: enterprise) } before do - login_as_enterprise_user [enterprise] + controller_login_as_enterprise_user [enterprise] end context "discount order rules" do diff --git a/spec/controllers/admin/order_cycles_controller_spec.rb b/spec/controllers/admin/order_cycles_controller_spec.rb index a12b644f2c..6988fa4787 100644 --- a/spec/controllers/admin/order_cycles_controller_spec.rb +++ b/spec/controllers/admin/order_cycles_controller_spec.rb @@ -102,7 +102,7 @@ module Admin let(:params) { { format: :json, order_cycle: {} } } before do - login_as_enterprise_user([shop]) + controller_login_as_enterprise_user([shop]) allow(OrderCycleForm).to receive(:new) { form_mock } end @@ -148,7 +148,7 @@ module Admin end context "as a manager of the coordinator" do - before { login_as_enterprise_user([coordinator]) } + before { controller_login_as_enterprise_user([coordinator]) } let(:params) { { format: :json, id: order_cycle.id, order_cycle: {} } } context "when updating succeeds" do diff --git a/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb b/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb index c62d0a0f9c..e4cc3a1c33 100644 --- a/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb +++ b/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb @@ -37,7 +37,7 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do } before do - login_as_enterprise_user [order.distributor] + controller_login_as_enterprise_user [order.distributor] end it "advances the order state" do diff --git a/spec/controllers/spree/admin/products_controller_spec.rb b/spec/controllers/spree/admin/products_controller_spec.rb index a8a99563ab..b33198d14c 100644 --- a/spec/controllers/spree/admin/products_controller_spec.rb +++ b/spec/controllers/spree/admin/products_controller_spec.rb @@ -10,7 +10,7 @@ describe Spree::Admin::ProductsController, type: :controller do end before do - login_as_enterprise_user [s_managed] + controller_login_as_enterprise_user [s_managed] spree_post :bulk_update, "products" => [{ "id" => product.id, "name" => "Pine nuts" }] end @@ -38,7 +38,7 @@ describe Spree::Admin::ProductsController, type: :controller do ) end - before { login_as_enterprise_user([producer]) } + before { controller_login_as_enterprise_user([producer]) } it 'fails' do spree_post :bulk_update, @@ -92,7 +92,7 @@ describe Spree::Admin::ProductsController, type: :controller do ) end - before { login_as_enterprise_user([producer]) } + before { controller_login_as_enterprise_user([producer]) } it 'does not fail' do spree_post :bulk_update, @@ -174,7 +174,7 @@ describe Spree::Admin::ProductsController, type: :controller do let!(:product) { create(:simple_product, supplier: producer) } before do - login_as_enterprise_user [producer] + controller_login_as_enterprise_user [producer] end describe "change product supplier" do diff --git a/spec/controllers/spree/admin/reports_controller_spec.rb b/spec/controllers/spree/admin/reports_controller_spec.rb index db261fe961..9b72b5418f 100644 --- a/spec/controllers/spree/admin/reports_controller_spec.rb +++ b/spec/controllers/spree/admin/reports_controller_spec.rb @@ -65,7 +65,7 @@ describe Spree::Admin::ReportsController, type: :controller do context "Coordinator Enterprise User" do let!(:present_objects) { [orderA1, orderA2, orderB1, orderB2] } - before { login_as_enterprise_user [coordinator1] } + before { controller_login_as_enterprise_user [coordinator1] } describe 'Orders & Fulfillment' do it "shows all orders in order cycles I coordinate" do @@ -79,7 +79,7 @@ describe Spree::Admin::ReportsController, type: :controller do # As a Distributor Enterprise user for distributor1 context "Distributor Enterprise User" do - before { login_as_enterprise_user [distributor1] } + before { controller_login_as_enterprise_user [distributor1] } describe 'Orders and Distributors' do let!(:present_objects) { [orderA1, orderA2, orderB1, orderB2] } @@ -132,7 +132,7 @@ describe Spree::Admin::ReportsController, type: :controller do # As a Supplier Enterprise user for supplier1 context "Supplier" do - before { login_as_enterprise_user [supplier1] } + before { controller_login_as_enterprise_user [supplier1] } describe 'index' do it "loads reports relevant to producers" do diff --git a/spec/controllers/spree/admin/search_controller_spec.rb b/spec/controllers/spree/admin/search_controller_spec.rb index d1219e8e67..a6f8623b30 100644 --- a/spec/controllers/spree/admin/search_controller_spec.rb +++ b/spec/controllers/spree/admin/search_controller_spec.rb @@ -6,7 +6,7 @@ describe Spree::Admin::SearchController, type: :controller do let!(:manager) { create(:user, email: "test2@email.com" ) } let!(:random) { create(:user, email: "test3@email.com" ) } let!(:enterprise) { create(:enterprise, owner: owner, users: [owner, manager]) } - before { login_as_enterprise_user [enterprise] } + before { controller_login_as_enterprise_user [enterprise] } describe 'searching for known users' do describe "when search query is not an exact match" do diff --git a/spec/support/controller_helper.rb b/spec/support/controller_helper.rb index 053f28d7b7..2d7ddf585d 100644 --- a/spec/support/controller_helper.rb +++ b/spec/support/controller_helper.rb @@ -10,7 +10,7 @@ module OpenFoodNetwork allow(controller).to receive_messages(spree_current_user: @admin_user) end - def login_as_enterprise_user(enterprises) + def controller_login_as_enterprise_user(enterprises) @enterprise_user ||= begin user = create(:user) user.spree_roles = []