From 8e84754f35271c1fceaf29998625e151dc6e6800 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Mon, 27 Jul 2020 13:22:14 +0100 Subject: [PATCH] Rename login_as_admin to a more specific name controller_login_as_admin --- spec/controllers/spree/admin/adjustments_controller_spec.rb | 2 +- spec/controllers/spree/admin/countries_controller_spec.rb | 2 +- .../spree/admin/image_settings_controller_spec.rb | 2 +- .../controllers/spree/admin/mail_methods_controller_spec.rb | 2 +- spec/controllers/spree/admin/orders_controller_spec.rb | 4 ++-- spec/controllers/spree/admin/products_controller_spec.rb | 2 +- spec/controllers/spree/admin/reports_controller_spec.rb | 6 +++--- .../spree/admin/return_authorizations_controller_spec.rb | 2 +- .../spree/admin/shipping_categories_controller_spec.rb | 2 +- .../spree/admin/shipping_methods_controller_spec.rb | 6 +++--- spec/controllers/spree/admin/variants_controller_spec.rb | 2 +- spec/support/controller_helper.rb | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/spec/controllers/spree/admin/adjustments_controller_spec.rb b/spec/controllers/spree/admin/adjustments_controller_spec.rb index 4ad02b73c7..624fa0c839 100644 --- a/spec/controllers/spree/admin/adjustments_controller_spec.rb +++ b/spec/controllers/spree/admin/adjustments_controller_spec.rb @@ -4,7 +4,7 @@ module Spree describe Admin::AdjustmentsController, type: :controller do include AuthenticationWorkflow - before { login_as_admin } + before { controller_login_as_admin } describe "setting included tax" do let(:order) { create(:order) } diff --git a/spec/controllers/spree/admin/countries_controller_spec.rb b/spec/controllers/spree/admin/countries_controller_spec.rb index 4146a506de..f961a36b22 100644 --- a/spec/controllers/spree/admin/countries_controller_spec.rb +++ b/spec/controllers/spree/admin/countries_controller_spec.rb @@ -8,7 +8,7 @@ module Spree include AuthenticationWorkflow describe "#update" do - before { login_as_admin } + before { controller_login_as_admin } it "updates the name of an existing country" do country = create(:country) diff --git a/spec/controllers/spree/admin/image_settings_controller_spec.rb b/spec/controllers/spree/admin/image_settings_controller_spec.rb index 89ccac822c..2084dea1b3 100644 --- a/spec/controllers/spree/admin/image_settings_controller_spec.rb +++ b/spec/controllers/spree/admin/image_settings_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Spree::Admin::ImageSettingsController do include AuthenticationWorkflow - before { login_as_admin } + before { controller_login_as_admin } context "updating image settings" do it "should be able to update paperclip settings" do diff --git a/spec/controllers/spree/admin/mail_methods_controller_spec.rb b/spec/controllers/spree/admin/mail_methods_controller_spec.rb index 1a706462a7..410bb5c8ee 100644 --- a/spec/controllers/spree/admin/mail_methods_controller_spec.rb +++ b/spec/controllers/spree/admin/mail_methods_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Spree::Admin::MailMethodsController do include AuthenticationWorkflow - before { login_as_admin } + before { controller_login_as_admin } context "#update" do it "should reinitialize the mail settings" do diff --git a/spec/controllers/spree/admin/orders_controller_spec.rb b/spec/controllers/spree/admin/orders_controller_spec.rb index b1b7d5a05f..0d10068f1e 100644 --- a/spec/controllers/spree/admin/orders_controller_spec.rb +++ b/spec/controllers/spree/admin/orders_controller_spec.rb @@ -6,7 +6,7 @@ describe Spree::Admin::OrdersController, type: :controller do describe "#edit" do let!(:order) { create(:order_with_totals_and_distribution, ship_address: create(:address)) } - before { login_as_admin } + before { controller_login_as_admin } it "advances the order state" do expect { @@ -40,7 +40,7 @@ describe Spree::Admin::OrdersController, type: :controller do order_cycle_id: order.order_cycle_id } } end - before { login_as_admin } + before { controller_login_as_admin } context "complete order" do let(:order) { create :completed_order_with_totals } diff --git a/spec/controllers/spree/admin/products_controller_spec.rb b/spec/controllers/spree/admin/products_controller_spec.rb index efc6ce9b5b..a8a99563ab 100644 --- a/spec/controllers/spree/admin/products_controller_spec.rb +++ b/spec/controllers/spree/admin/products_controller_spec.rb @@ -134,7 +134,7 @@ describe Spree::Admin::ProductsController, type: :controller do } before do - login_as_admin + controller_login_as_admin create(:stock_location) end diff --git a/spec/controllers/spree/admin/reports_controller_spec.rb b/spec/controllers/spree/admin/reports_controller_spec.rb index 8cfda5fe36..db261fe961 100644 --- a/spec/controllers/spree/admin/reports_controller_spec.rb +++ b/spec/controllers/spree/admin/reports_controller_spec.rb @@ -191,7 +191,7 @@ describe Spree::Admin::ReportsController, type: :controller do end context "Products & Inventory" do - before { login_as_admin } + before { controller_login_as_admin } context "with distributors and suppliers" do let(:distributors) { [coordinator1, distributor1, distributor2] } @@ -235,7 +235,7 @@ describe Spree::Admin::ReportsController, type: :controller do end context "My Customers" do - before { login_as_admin } + before { controller_login_as_admin } it "should have report types for customers" do expect(subject.report_types[:customers]).to eq([ @@ -286,7 +286,7 @@ describe Spree::Admin::ReportsController, type: :controller do end context "Admin" do - before { login_as_admin } + before { controller_login_as_admin } describe "users_and_enterprises" do let!(:present_objects) { [coordinator1] } diff --git a/spec/controllers/spree/admin/return_authorizations_controller_spec.rb b/spec/controllers/spree/admin/return_authorizations_controller_spec.rb index 6c28642da5..1567bd8127 100644 --- a/spec/controllers/spree/admin/return_authorizations_controller_spec.rb +++ b/spec/controllers/spree/admin/return_authorizations_controller_spec.rb @@ -13,7 +13,7 @@ module Spree end before do - login_as_admin + controller_login_as_admin # Pay the order order.payments.first.complete diff --git a/spec/controllers/spree/admin/shipping_categories_controller_spec.rb b/spec/controllers/spree/admin/shipping_categories_controller_spec.rb index 531b175072..2125281bcf 100644 --- a/spec/controllers/spree/admin/shipping_categories_controller_spec.rb +++ b/spec/controllers/spree/admin/shipping_categories_controller_spec.rb @@ -8,7 +8,7 @@ module Spree include AuthenticationWorkflow describe "#create and #update" do - before { login_as_admin } + before { controller_login_as_admin } it "creates a shipping shipping category" do expect { diff --git a/spec/controllers/spree/admin/shipping_methods_controller_spec.rb b/spec/controllers/spree/admin/shipping_methods_controller_spec.rb index 105d55563c..a78a24700e 100644 --- a/spec/controllers/spree/admin/shipping_methods_controller_spec.rb +++ b/spec/controllers/spree/admin/shipping_methods_controller_spec.rb @@ -16,7 +16,7 @@ describe Spree::Admin::ShippingMethodsController, type: :controller do } } - before { login_as_admin } + before { controller_login_as_admin } it "updates preferred_amount and preferred_currency of a FlatRate calculator" do shipping_method.calculator = create(:calculator_flat_rate, calculable: shipping_method) @@ -81,7 +81,7 @@ describe Spree::Admin::ShippingMethodsController, type: :controller do let(:shipping_method) { create(:shipping_method) } scenario "is soft deleted" do - login_as_admin + controller_login_as_admin expect(shipping_method.deleted_at).to be_nil spree_delete :destroy, "id" => shipping_method.id @@ -94,7 +94,7 @@ describe Spree::Admin::ShippingMethodsController, type: :controller do let(:order) { create(:order_with_line_items) } scenario "is not soft deleted" do - login_as_admin + controller_login_as_admin expect(order.shipping_method.deleted_at).to be_nil spree_delete :destroy, "id" => order.shipping_method.id diff --git a/spec/controllers/spree/admin/variants_controller_spec.rb b/spec/controllers/spree/admin/variants_controller_spec.rb index 7163f6f423..9af2be952a 100644 --- a/spec/controllers/spree/admin/variants_controller_spec.rb +++ b/spec/controllers/spree/admin/variants_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' module Spree module Admin describe VariantsController, type: :controller do - before { login_as_admin } + before { controller_login_as_admin } describe "#index" do describe "deleted variants" do diff --git a/spec/support/controller_helper.rb b/spec/support/controller_helper.rb index b543555319..053f28d7b7 100644 --- a/spec/support/controller_helper.rb +++ b/spec/support/controller_helper.rb @@ -1,6 +1,6 @@ module OpenFoodNetwork module ControllerHelper - def login_as_admin + def controller_login_as_admin @admin_user ||= begin user = create(:user) user.spree_roles << Spree::Role.find_or_create_by!(name: 'admin')