From a2ebc614d9ca34de44898d5f611c1f701c72ab49 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Mon, 27 Jul 2020 14:07:32 +0100 Subject: [PATCH] Rename AuthenticationWorkflow to AuthenticationHelper --- spec/controllers/admin/column_preferences_controller_spec.rb | 2 +- spec/controllers/admin/customers_controller_spec.rb | 2 +- spec/controllers/admin/inventory_items_controller_spec.rb | 2 +- spec/controllers/admin/proxy_orders_controller_spec.rb | 2 +- spec/controllers/admin/schedules_controller_spec.rb | 2 +- .../admin/subscription_line_items_controller_spec.rb | 2 +- spec/controllers/admin/subscriptions_controller_spec.rb | 2 +- spec/controllers/admin/variant_overrides_controller_spec.rb | 2 +- spec/controllers/api/customers_controller_spec.rb | 2 +- spec/controllers/api/enterprise_fees_controller_spec.rb | 2 +- spec/controllers/api/exchange_products_controller_spec.rb | 2 +- spec/controllers/api/logos_controller_spec.rb | 2 +- spec/controllers/api/orders_controller_spec.rb | 2 +- spec/controllers/api/product_images_controller_spec.rb | 2 +- spec/controllers/api/promo_images_controller_spec.rb | 2 +- spec/controllers/api/shops_controller_spec.rb | 2 +- spec/controllers/spree/admin/adjustments_controller_spec.rb | 2 +- spec/controllers/spree/admin/countries_controller_spec.rb | 2 +- .../controllers/spree/admin/image_settings_controller_spec.rb | 2 +- spec/controllers/spree/admin/mail_methods_controller_spec.rb | 2 +- .../spree/admin/orders/customer_details_controller_spec.rb | 2 +- .../spree/admin/return_authorizations_controller_spec.rb | 2 +- .../spree/admin/shipping_categories_controller_spec.rb | 2 +- .../spree/admin/shipping_methods_controller_spec.rb | 2 +- spec/controllers/spree/users_controller_spec.rb | 2 +- spec/features/admin/adjustments_spec.rb | 2 +- spec/features/admin/authentication_spec.rb | 2 +- spec/features/admin/bulk_order_management_spec.rb | 2 +- spec/features/admin/bulk_product_update_spec.rb | 2 +- spec/features/admin/configuration/general_settings_spec.rb | 2 +- spec/features/admin/configuration/image_settings_spec.rb | 2 +- spec/features/admin/configuration/mail_methods_spec.rb | 2 +- spec/features/admin/configuration/states_spec.rb | 2 +- spec/features/admin/configuration/tax_categories_spec.rb | 2 +- spec/features/admin/configuration/tax_rates_spec.rb | 2 +- spec/features/admin/configuration/taxonomies_spec.rb | 2 +- spec/features/admin/configuration/zones_spec.rb | 2 +- spec/features/admin/content_spec.rb | 2 +- spec/features/admin/customers_spec.rb | 2 +- spec/features/admin/enterprise_fees_spec.rb | 2 +- spec/features/admin/enterprise_groups_spec.rb | 2 +- spec/features/admin/enterprise_relationships_spec.rb | 2 +- spec/features/admin/enterprise_roles_spec.rb | 2 +- spec/features/admin/enterprise_user_spec.rb | 2 +- spec/features/admin/enterprises/images_spec.rb | 2 +- spec/features/admin/enterprises/index_spec.rb | 2 +- spec/features/admin/enterprises_spec.rb | 2 +- spec/features/admin/external_services_spec.rb | 2 +- spec/features/admin/image_settings_spec.rb | 2 +- spec/features/admin/multilingual_spec.rb | 2 +- .../admin/order_cycles/complex_creating_specific_time_spec.rb | 2 +- .../complex_editing_exchange_same_enterprise_spec.rb | 2 +- .../complex_editing_multiple_product_pages_spec.rb | 2 +- spec/features/admin/order_cycles/complex_editing_spec.rb | 2 +- .../admin/order_cycles/complex_updating_specific_time_spec.rb | 2 +- spec/features/admin/order_cycles/list_spec.rb | 2 +- spec/features/admin/order_cycles/simple_spec.rb | 2 +- spec/features/admin/order_cycles_complex_nav_check_spec.rb | 2 +- spec/features/admin/order_print_ticket_spec.rb | 2 +- spec/features/admin/order_spec.rb | 2 +- spec/features/admin/orders_spec.rb | 2 +- spec/features/admin/overview_spec.rb | 2 +- spec/features/admin/payment_method_spec.rb | 2 +- spec/features/admin/payments_spec.rb | 2 +- spec/features/admin/product_import_spec.rb | 2 +- spec/features/admin/products_spec.rb | 2 +- spec/features/admin/properties_spec.rb | 2 +- spec/features/admin/reports/packing_report_spec.rb | 2 +- spec/features/admin/reports_spec.rb | 2 +- spec/features/admin/schedules_spec.rb | 2 +- spec/features/admin/shipping_methods_spec.rb | 2 +- spec/features/admin/subscriptions_spec.rb | 2 +- spec/features/admin/tag_rules_spec.rb | 2 +- spec/features/admin/tax_settings_spec.rb | 2 +- spec/features/admin/users_spec.rb | 2 +- spec/features/admin/variant_overrides_spec.rb | 2 +- spec/features/admin/variants_spec.rb | 2 +- spec/features/consumer/account/cards_spec.rb | 2 +- spec/features/consumer/account/settings_spec.rb | 2 +- spec/features/consumer/account_spec.rb | 2 +- spec/features/consumer/authentication_spec.rb | 2 +- spec/features/consumer/groups_spec.rb | 2 +- spec/features/consumer/multilingual_spec.rb | 2 +- spec/features/consumer/producers_spec.rb | 2 +- spec/features/consumer/registration_spec.rb | 2 +- spec/features/consumer/shopping/cart_spec.rb | 2 +- spec/features/consumer/shopping/checkout_auth_spec.rb | 2 +- spec/features/consumer/shopping/checkout_spec.rb | 2 +- spec/features/consumer/shopping/embedded_shopfronts_spec.rb | 2 +- spec/features/consumer/shopping/orders_spec.rb | 2 +- spec/features/consumer/shopping/products_spec.rb | 2 +- spec/features/consumer/shopping/shopping_spec.rb | 2 +- spec/features/consumer/shopping/variant_overrides_spec.rb | 2 +- spec/features/consumer/shops_spec.rb | 2 +- .../open_food_network/orders_and_fulfillments_report_spec.rb | 2 +- spec/lib/open_food_network/packing_report_spec.rb | 2 +- spec/requests/checkout/stripe_connect_spec.rb | 2 +- spec/requests/checkout/stripe_sca_spec.rb | 2 +- spec/requests/embedded_shopfronts_headers_spec.rb | 2 +- .../{authentication_workflow.rb => authentication_helper.rb} | 4 ++-- spec/views/spree/shared/_order_details.html.haml_spec.rb | 2 +- 101 files changed, 102 insertions(+), 102 deletions(-) rename spec/support/request/{authentication_workflow.rb => authentication_helper.rb} (94%) diff --git a/spec/controllers/admin/column_preferences_controller_spec.rb b/spec/controllers/admin/column_preferences_controller_spec.rb index acc3c194a5..53f2d12fda 100644 --- a/spec/controllers/admin/column_preferences_controller_spec.rb +++ b/spec/controllers/admin/column_preferences_controller_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Admin::ColumnPreferencesController, type: :controller do - include AuthenticationWorkflow + include AuthenticationHelper describe "bulk_update" do let!(:user1) { create(:user) } diff --git a/spec/controllers/admin/customers_controller_spec.rb b/spec/controllers/admin/customers_controller_spec.rb index 8e344879a2..b439cc7c9c 100644 --- a/spec/controllers/admin/customers_controller_spec.rb +++ b/spec/controllers/admin/customers_controller_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Admin::CustomersController, type: :controller do - include AuthenticationWorkflow + include AuthenticationHelper describe "index" do let(:enterprise) { create(:distributor_enterprise) } diff --git a/spec/controllers/admin/inventory_items_controller_spec.rb b/spec/controllers/admin/inventory_items_controller_spec.rb index 9fce5711a6..2c1b3cfd9d 100644 --- a/spec/controllers/admin/inventory_items_controller_spec.rb +++ b/spec/controllers/admin/inventory_items_controller_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Admin::InventoryItemsController, type: :controller do - # include AuthenticationWorkflow + # include AuthenticationHelper describe "create" do context "json" do diff --git a/spec/controllers/admin/proxy_orders_controller_spec.rb b/spec/controllers/admin/proxy_orders_controller_spec.rb index 0bc63e3cb8..19b4f8acc0 100644 --- a/spec/controllers/admin/proxy_orders_controller_spec.rb +++ b/spec/controllers/admin/proxy_orders_controller_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Admin::ProxyOrdersController, type: :controller do - include AuthenticationWorkflow + include AuthenticationHelper describe 'cancel' do let!(:user) { create(:user, enterprise_limit: 10) } diff --git a/spec/controllers/admin/schedules_controller_spec.rb b/spec/controllers/admin/schedules_controller_spec.rb index 8a0ac86c78..0648574642 100644 --- a/spec/controllers/admin/schedules_controller_spec.rb +++ b/spec/controllers/admin/schedules_controller_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Admin::SchedulesController, type: :controller do - include AuthenticationWorkflow + include AuthenticationHelper describe "index" do let!(:coordinated_order_cycle) { create(:simple_order_cycle) } diff --git a/spec/controllers/admin/subscription_line_items_controller_spec.rb b/spec/controllers/admin/subscription_line_items_controller_spec.rb index d60c581ab5..6df2a71f53 100644 --- a/spec/controllers/admin/subscription_line_items_controller_spec.rb +++ b/spec/controllers/admin/subscription_line_items_controller_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Admin::SubscriptionLineItemsController, type: :controller do - include AuthenticationWorkflow + include AuthenticationHelper describe "build" do let(:user) { create(:user) } diff --git a/spec/controllers/admin/subscriptions_controller_spec.rb b/spec/controllers/admin/subscriptions_controller_spec.rb index 7eb11807bf..1aeb87ddef 100644 --- a/spec/controllers/admin/subscriptions_controller_spec.rb +++ b/spec/controllers/admin/subscriptions_controller_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Admin::SubscriptionsController, type: :controller do - include AuthenticationWorkflow + include AuthenticationHelper include OpenFoodNetwork::EmailHelper describe 'index' do diff --git a/spec/controllers/admin/variant_overrides_controller_spec.rb b/spec/controllers/admin/variant_overrides_controller_spec.rb index 4690dba35b..721152c45f 100644 --- a/spec/controllers/admin/variant_overrides_controller_spec.rb +++ b/spec/controllers/admin/variant_overrides_controller_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Admin::VariantOverridesController, type: :controller do - # include AuthenticationWorkflow + # include AuthenticationHelper describe "bulk_update" do context "json" do diff --git a/spec/controllers/api/customers_controller_spec.rb b/spec/controllers/api/customers_controller_spec.rb index cab5b2e1e1..25fc52cc09 100644 --- a/spec/controllers/api/customers_controller_spec.rb +++ b/spec/controllers/api/customers_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' module Api describe CustomersController, type: :controller do - include AuthenticationWorkflow + include AuthenticationHelper render_views let(:user) { create(:user) } diff --git a/spec/controllers/api/enterprise_fees_controller_spec.rb b/spec/controllers/api/enterprise_fees_controller_spec.rb index 8991e5fcde..b32423fea2 100644 --- a/spec/controllers/api/enterprise_fees_controller_spec.rb +++ b/spec/controllers/api/enterprise_fees_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' module Api describe EnterpriseFeesController, type: :controller do - include AuthenticationWorkflow + include AuthenticationHelper let!(:unreferenced_fee) { create(:enterprise_fee) } let!(:referenced_fee) { create(:enterprise_fee) } diff --git a/spec/controllers/api/exchange_products_controller_spec.rb b/spec/controllers/api/exchange_products_controller_spec.rb index f94089280c..3fa7248198 100644 --- a/spec/controllers/api/exchange_products_controller_spec.rb +++ b/spec/controllers/api/exchange_products_controller_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' module Api describe ExchangeProductsController, type: :controller do - include AuthenticationWorkflow + include AuthenticationHelper let(:order_cycle) { create(:order_cycle) } let(:exchange) { order_cycle.exchanges.incoming.first } diff --git a/spec/controllers/api/logos_controller_spec.rb b/spec/controllers/api/logos_controller_spec.rb index 213ac8bc6e..b4cee3e896 100644 --- a/spec/controllers/api/logos_controller_spec.rb +++ b/spec/controllers/api/logos_controller_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" module Api describe LogosController, type: :controller do - include AuthenticationWorkflow + include AuthenticationHelper let(:admin_user) { create(:admin_user) } let(:enterprise_owner) { create(:user) } diff --git a/spec/controllers/api/orders_controller_spec.rb b/spec/controllers/api/orders_controller_spec.rb index 726756734d..b4d03951fc 100644 --- a/spec/controllers/api/orders_controller_spec.rb +++ b/spec/controllers/api/orders_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' module Api describe OrdersController, type: :controller do - include AuthenticationWorkflow + include AuthenticationHelper render_views let!(:regular_user) { create(:user) } diff --git a/spec/controllers/api/product_images_controller_spec.rb b/spec/controllers/api/product_images_controller_spec.rb index 5015d41b00..44fb239e38 100644 --- a/spec/controllers/api/product_images_controller_spec.rb +++ b/spec/controllers/api/product_images_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' module Api describe ProductImagesController, type: :controller do - include AuthenticationWorkflow + include AuthenticationHelper render_views describe "uploading an image" do diff --git a/spec/controllers/api/promo_images_controller_spec.rb b/spec/controllers/api/promo_images_controller_spec.rb index cce6d08f5f..ac73a1d94b 100644 --- a/spec/controllers/api/promo_images_controller_spec.rb +++ b/spec/controllers/api/promo_images_controller_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" module Api describe PromoImagesController, type: :controller do - include AuthenticationWorkflow + include AuthenticationHelper let(:admin_user) { create(:admin_user) } let(:enterprise_owner) { create(:user) } diff --git a/spec/controllers/api/shops_controller_spec.rb b/spec/controllers/api/shops_controller_spec.rb index a90f606f57..08040feea8 100644 --- a/spec/controllers/api/shops_controller_spec.rb +++ b/spec/controllers/api/shops_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Api::ShopsController, type: :controller do - include AuthenticationWorkflow + include AuthenticationHelper render_views context "as a non-authenticated user" do diff --git a/spec/controllers/spree/admin/adjustments_controller_spec.rb b/spec/controllers/spree/admin/adjustments_controller_spec.rb index 624fa0c839..7691bd6e72 100644 --- a/spec/controllers/spree/admin/adjustments_controller_spec.rb +++ b/spec/controllers/spree/admin/adjustments_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' module Spree describe Admin::AdjustmentsController, type: :controller do - include AuthenticationWorkflow + include AuthenticationHelper before { controller_login_as_admin } diff --git a/spec/controllers/spree/admin/countries_controller_spec.rb b/spec/controllers/spree/admin/countries_controller_spec.rb index f961a36b22..87a9356f1e 100644 --- a/spec/controllers/spree/admin/countries_controller_spec.rb +++ b/spec/controllers/spree/admin/countries_controller_spec.rb @@ -5,7 +5,7 @@ require 'spec_helper' module Spree module Admin describe CountriesController, type: :controller do - include AuthenticationWorkflow + include AuthenticationHelper describe "#update" do before { controller_login_as_admin } diff --git a/spec/controllers/spree/admin/image_settings_controller_spec.rb b/spec/controllers/spree/admin/image_settings_controller_spec.rb index 2084dea1b3..20bdd9dae0 100644 --- a/spec/controllers/spree/admin/image_settings_controller_spec.rb +++ b/spec/controllers/spree/admin/image_settings_controller_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Spree::Admin::ImageSettingsController do - include AuthenticationWorkflow + include AuthenticationHelper before { controller_login_as_admin } diff --git a/spec/controllers/spree/admin/mail_methods_controller_spec.rb b/spec/controllers/spree/admin/mail_methods_controller_spec.rb index 410bb5c8ee..f7aa10959b 100644 --- a/spec/controllers/spree/admin/mail_methods_controller_spec.rb +++ b/spec/controllers/spree/admin/mail_methods_controller_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Spree::Admin::MailMethodsController do - include AuthenticationWorkflow + include AuthenticationHelper before { controller_login_as_admin } 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 e4cc3a1c33..bc0c135505 100644 --- a/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb +++ b/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do - include AuthenticationWorkflow + include AuthenticationHelper describe "#update" do context "adding customer details via newly created admin order" do diff --git a/spec/controllers/spree/admin/return_authorizations_controller_spec.rb b/spec/controllers/spree/admin/return_authorizations_controller_spec.rb index 1567bd8127..4cc170872b 100644 --- a/spec/controllers/spree/admin/return_authorizations_controller_spec.rb +++ b/spec/controllers/spree/admin/return_authorizations_controller_spec.rb @@ -5,7 +5,7 @@ require 'spec_helper' module Spree module Admin describe ReturnAuthorizationsController, type: :controller do - include AuthenticationWorkflow + include AuthenticationHelper let(:order) do create(:order, :with_line_item, :completed, diff --git a/spec/controllers/spree/admin/shipping_categories_controller_spec.rb b/spec/controllers/spree/admin/shipping_categories_controller_spec.rb index 2125281bcf..05aefff048 100644 --- a/spec/controllers/spree/admin/shipping_categories_controller_spec.rb +++ b/spec/controllers/spree/admin/shipping_categories_controller_spec.rb @@ -5,7 +5,7 @@ require 'spec_helper' module Spree module Admin describe ShippingCategoriesController, type: :controller do - include AuthenticationWorkflow + include AuthenticationHelper describe "#create and #update" do before { controller_login_as_admin } diff --git a/spec/controllers/spree/admin/shipping_methods_controller_spec.rb b/spec/controllers/spree/admin/shipping_methods_controller_spec.rb index a78a24700e..f209e87a81 100644 --- a/spec/controllers/spree/admin/shipping_methods_controller_spec.rb +++ b/spec/controllers/spree/admin/shipping_methods_controller_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Spree::Admin::ShippingMethodsController, type: :controller do - include AuthenticationWorkflow + include AuthenticationHelper describe "#update" do let(:shipping_method) { create(:shipping_method) } diff --git a/spec/controllers/spree/users_controller_spec.rb b/spec/controllers/spree/users_controller_spec.rb index 50ac3ebf6f..5210c1717a 100644 --- a/spec/controllers/spree/users_controller_spec.rb +++ b/spec/controllers/spree/users_controller_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Spree::UsersController, type: :controller do - include AuthenticationWorkflow + include AuthenticationHelper describe "show" do let!(:u1) { create(:user) } diff --git a/spec/features/admin/adjustments_spec.rb b/spec/features/admin/adjustments_spec.rb index 511f8a91bc..5911e602c5 100644 --- a/spec/features/admin/adjustments_spec.rb +++ b/spec/features/admin/adjustments_spec.rb @@ -4,7 +4,7 @@ feature ' As an administrator I want to manage adjustments on orders ', js: true do - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper let!(:user) { create(:user) } diff --git a/spec/features/admin/authentication_spec.rb b/spec/features/admin/authentication_spec.rb index a7add975f2..f9401ad192 100644 --- a/spec/features/admin/authentication_spec.rb +++ b/spec/features/admin/authentication_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' feature "Authentication", js: true do include UIComponentHelper - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper let(:user) { create(:user, password: "password", password_confirmation: "password") } diff --git a/spec/features/admin/bulk_order_management_spec.rb b/spec/features/admin/bulk_order_management_spec.rb index a17d933f80..efe3a3ed7e 100644 --- a/spec/features/admin/bulk_order_management_spec.rb +++ b/spec/features/admin/bulk_order_management_spec.rb @@ -5,7 +5,7 @@ feature ' I want to be able to manage orders in bulk ', js: true do include AdminHelper - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper context "listing orders" do diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb index e7ed955cc7..553e2182aa 100644 --- a/spec/features/admin/bulk_product_update_spec.rb +++ b/spec/features/admin/bulk_product_update_spec.rb @@ -5,7 +5,7 @@ feature ' I want to be able to manage products in bulk ', js: true do include AdminHelper - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper describe "listing products" do diff --git a/spec/features/admin/configuration/general_settings_spec.rb b/spec/features/admin/configuration/general_settings_spec.rb index 6791e93a05..e676f32801 100644 --- a/spec/features/admin/configuration/general_settings_spec.rb +++ b/spec/features/admin/configuration/general_settings_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe "General Settings" do - include AuthenticationWorkflow + include AuthenticationHelper before(:each) do login_as_admin_and_visit spree.admin_dashboard_path diff --git a/spec/features/admin/configuration/image_settings_spec.rb b/spec/features/admin/configuration/image_settings_spec.rb index 6a2ede12da..5c87e8e6ad 100644 --- a/spec/features/admin/configuration/image_settings_spec.rb +++ b/spec/features/admin/configuration/image_settings_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe "image settings" do - include AuthenticationWorkflow + include AuthenticationHelper before do login_as_admin_and_visit spree.admin_dashboard_path diff --git a/spec/features/admin/configuration/mail_methods_spec.rb b/spec/features/admin/configuration/mail_methods_spec.rb index 5063335c21..3296ca0317 100644 --- a/spec/features/admin/configuration/mail_methods_spec.rb +++ b/spec/features/admin/configuration/mail_methods_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe "Mail Methods" do - include AuthenticationWorkflow + include AuthenticationHelper before(:each) do login_as_admin_and_visit spree.admin_general_settings_path diff --git a/spec/features/admin/configuration/states_spec.rb b/spec/features/admin/configuration/states_spec.rb index 6aaa117bbc..e3a761088d 100755 --- a/spec/features/admin/configuration/states_spec.rb +++ b/spec/features/admin/configuration/states_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe "States" do - include AuthenticationWorkflow + include AuthenticationHelper let!(:country) { create(:country) } diff --git a/spec/features/admin/configuration/tax_categories_spec.rb b/spec/features/admin/configuration/tax_categories_spec.rb index 5b3041caf2..54832143b3 100644 --- a/spec/features/admin/configuration/tax_categories_spec.rb +++ b/spec/features/admin/configuration/tax_categories_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe "Tax Categories" do - include AuthenticationWorkflow + include AuthenticationHelper before(:each) do login_as_admin_and_visit spree.admin_general_settings_path diff --git a/spec/features/admin/configuration/tax_rates_spec.rb b/spec/features/admin/configuration/tax_rates_spec.rb index 4211ce1f56..a3cb9fc83e 100644 --- a/spec/features/admin/configuration/tax_rates_spec.rb +++ b/spec/features/admin/configuration/tax_rates_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe "Tax Rates" do - include AuthenticationWorkflow + include AuthenticationHelper let!(:calculator) { create(:calculator_per_item, calculable: create(:order)) } let!(:tax_rate) { create(:tax_rate, calculator: calculator) } diff --git a/spec/features/admin/configuration/taxonomies_spec.rb b/spec/features/admin/configuration/taxonomies_spec.rb index ffa82fb0fd..317d49c846 100644 --- a/spec/features/admin/configuration/taxonomies_spec.rb +++ b/spec/features/admin/configuration/taxonomies_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe "Taxonomies" do - include AuthenticationWorkflow + include AuthenticationHelper before(:each) do login_as_admin_and_visit spree.admin_general_settings_path diff --git a/spec/features/admin/configuration/zones_spec.rb b/spec/features/admin/configuration/zones_spec.rb index 9403d080af..75d05936f3 100644 --- a/spec/features/admin/configuration/zones_spec.rb +++ b/spec/features/admin/configuration/zones_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe "Zones" do - include AuthenticationWorkflow + include AuthenticationHelper before do login_as_admin diff --git a/spec/features/admin/content_spec.rb b/spec/features/admin/content_spec.rb index cc9d8af55c..225965aed0 100644 --- a/spec/features/admin/content_spec.rb +++ b/spec/features/admin/content_spec.rb @@ -4,7 +4,7 @@ feature ' As a site administrator I want to configure the site content ' do - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper before do diff --git a/spec/features/admin/customers_spec.rb b/spec/features/admin/customers_spec.rb index 49338715bb..4674504e2a 100644 --- a/spec/features/admin/customers_spec.rb +++ b/spec/features/admin/customers_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' feature 'Customers' do include AdminHelper - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper context "as an enterprise user" do diff --git a/spec/features/admin/enterprise_fees_spec.rb b/spec/features/admin/enterprise_fees_spec.rb index a5732a67b4..7b16c71ed4 100644 --- a/spec/features/admin/enterprise_fees_spec.rb +++ b/spec/features/admin/enterprise_fees_spec.rb @@ -5,7 +5,7 @@ feature ' I want to manage enterprise fees ', js: true do include WebHelper - include AuthenticationWorkflow + include AuthenticationHelper let!(:tax_category_gst) { create(:tax_category, name: 'GST') } diff --git a/spec/features/admin/enterprise_groups_spec.rb b/spec/features/admin/enterprise_groups_spec.rb index 4cab98f0e7..ff19b44f17 100644 --- a/spec/features/admin/enterprise_groups_spec.rb +++ b/spec/features/admin/enterprise_groups_spec.rb @@ -5,7 +5,7 @@ feature ' I want to manage enterprise groups ' do include WebHelper - include AuthenticationWorkflow + include AuthenticationHelper before(:each) do login_to_admin_section diff --git a/spec/features/admin/enterprise_relationships_spec.rb b/spec/features/admin/enterprise_relationships_spec.rb index cb9bbaea1a..3dd00acbae 100644 --- a/spec/features/admin/enterprise_relationships_spec.rb +++ b/spec/features/admin/enterprise_relationships_spec.rb @@ -5,7 +5,7 @@ feature ' I want to manage relationships between enterprises ', js: true do include WebHelper - include AuthenticationWorkflow + include AuthenticationHelper context "as a site administrator" do before { login_as_admin } diff --git a/spec/features/admin/enterprise_roles_spec.rb b/spec/features/admin/enterprise_roles_spec.rb index ff29207aeb..2e7c2775a1 100644 --- a/spec/features/admin/enterprise_roles_spec.rb +++ b/spec/features/admin/enterprise_roles_spec.rb @@ -4,7 +4,7 @@ feature ' As an Administrator I want to manage relationships between users and enterprises ', js: true do - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper include OpenFoodNetwork::EmailHelper diff --git a/spec/features/admin/enterprise_user_spec.rb b/spec/features/admin/enterprise_user_spec.rb index 9d6aa54535..30b3907970 100644 --- a/spec/features/admin/enterprise_user_spec.rb +++ b/spec/features/admin/enterprise_user_spec.rb @@ -5,7 +5,7 @@ feature ' I want to setup users to manage an enterprise ' do include WebHelper - include AuthenticationWorkflow + include AuthenticationHelper let!(:user) { create(:user) } let!(:supplier1) { create(:supplier_enterprise, name: 'Supplier 1') } diff --git a/spec/features/admin/enterprises/images_spec.rb b/spec/features/admin/enterprises/images_spec.rb index 302db2d291..0d4644f8c7 100644 --- a/spec/features/admin/enterprises/images_spec.rb +++ b/spec/features/admin/enterprises/images_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" feature "Managing enterprise images" do include WebHelper - include AuthenticationWorkflow + include AuthenticationHelper context "as an Enterprise user", js: true do let(:enterprise_user) { create(:user, enterprise_limit: 1) } diff --git a/spec/features/admin/enterprises/index_spec.rb b/spec/features/admin/enterprises/index_spec.rb index 8afc7acb7e..550879d3c1 100644 --- a/spec/features/admin/enterprises/index_spec.rb +++ b/spec/features/admin/enterprises/index_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' feature 'Enterprises Index' do include WebHelper - include AuthenticationWorkflow + include AuthenticationHelper context "as an admin user" do scenario "listing enterprises" do diff --git a/spec/features/admin/enterprises_spec.rb b/spec/features/admin/enterprises_spec.rb index dc5d1e5458..be7e9ddfa9 100644 --- a/spec/features/admin/enterprises_spec.rb +++ b/spec/features/admin/enterprises_spec.rb @@ -5,7 +5,7 @@ feature ' I want to manage enterprises ' do include WebHelper - include AuthenticationWorkflow + include AuthenticationHelper scenario "viewing an enterprise" do e = create(:enterprise) diff --git a/spec/features/admin/external_services_spec.rb b/spec/features/admin/external_services_spec.rb index 3a9a72610e..ceeef4c556 100644 --- a/spec/features/admin/external_services_spec.rb +++ b/spec/features/admin/external_services_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature 'External services' do - include AuthenticationWorkflow + include AuthenticationHelper describe "bugherd" do before do diff --git a/spec/features/admin/image_settings_spec.rb b/spec/features/admin/image_settings_spec.rb index 9968952798..83e584a0ce 100644 --- a/spec/features/admin/image_settings_spec.rb +++ b/spec/features/admin/image_settings_spec.rb @@ -4,7 +4,7 @@ feature ' As an admin I want to manage image formats ' do - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper before(:all) do diff --git a/spec/features/admin/multilingual_spec.rb b/spec/features/admin/multilingual_spec.rb index 33ad4d1d03..32e4684936 100644 --- a/spec/features/admin/multilingual_spec.rb +++ b/spec/features/admin/multilingual_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature 'Multilingual', js: true do - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper let(:admin_role) { Spree::Role.find_or_create_by!(name: 'admin') } let(:admin_user) { create(:user) } diff --git a/spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb b/spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb index b6227fe95a..237764eaae 100644 --- a/spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb +++ b/spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb @@ -7,7 +7,7 @@ feature ' I want to create/update complex order cycles with a specific time ', js: true do include AdminHelper - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper let(:order_cycle_opening_time) { Time.zone.local(2040, 11, 0o6, 0o6, 0o0, 0o0).strftime("%F %T %z") } diff --git a/spec/features/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb b/spec/features/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb index ce9d5f0914..ef0d1c5f95 100644 --- a/spec/features/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb +++ b/spec/features/admin/order_cycles/complex_editing_exchange_same_enterprise_spec.rb @@ -7,7 +7,7 @@ feature ' I want to manage complex order cycles ', js: true do include AdminHelper - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper scenario "editing an order cycle with an exchange between the same enterprise" do diff --git a/spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb b/spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb index 44c05037e5..c13e0dd8b1 100644 --- a/spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb +++ b/spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb @@ -7,7 +7,7 @@ feature ' I want to manage complex order cycles ', js: true do include AdminHelper - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper describe "editing an order cycle with multiple pages of products", js: true do diff --git a/spec/features/admin/order_cycles/complex_editing_spec.rb b/spec/features/admin/order_cycles/complex_editing_spec.rb index d93999ab3b..4b9aa275fc 100644 --- a/spec/features/admin/order_cycles/complex_editing_spec.rb +++ b/spec/features/admin/order_cycles/complex_editing_spec.rb @@ -7,7 +7,7 @@ feature ' I want to manage complex order cycles ', js: true do include AdminHelper - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper scenario "editing an order cycle" do diff --git a/spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb b/spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb index d76ba551c2..dfa2946d97 100644 --- a/spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb +++ b/spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb @@ -7,7 +7,7 @@ feature ' I want to create/update complex order cycles with a specific time ', js: true do include AdminHelper - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper let(:order_cycle_opening_time) { Time.zone.local(2040, 11, 0o6, 0o6, 0o0, 0o0).strftime("%F %T %z") } diff --git a/spec/features/admin/order_cycles/list_spec.rb b/spec/features/admin/order_cycles/list_spec.rb index 17bda44e4f..a7a4890511 100644 --- a/spec/features/admin/order_cycles/list_spec.rb +++ b/spec/features/admin/order_cycles/list_spec.rb @@ -7,7 +7,7 @@ feature ' I want to list and filter order cycles ', js: true do include AdminHelper - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper scenario "listing and filtering order cycles" do diff --git a/spec/features/admin/order_cycles/simple_spec.rb b/spec/features/admin/order_cycles/simple_spec.rb index 02d49be349..1f22485f4c 100644 --- a/spec/features/admin/order_cycles/simple_spec.rb +++ b/spec/features/admin/order_cycles/simple_spec.rb @@ -7,7 +7,7 @@ feature ' I want to manage simple order cycles ', js: true do include AdminHelper - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper scenario "updating many order cycle opening/closing times at once", js: true do diff --git a/spec/features/admin/order_cycles_complex_nav_check_spec.rb b/spec/features/admin/order_cycles_complex_nav_check_spec.rb index 12c90e79a1..1814d9f5af 100644 --- a/spec/features/admin/order_cycles_complex_nav_check_spec.rb +++ b/spec/features/admin/order_cycles_complex_nav_check_spec.rb @@ -6,7 +6,7 @@ feature ' As an administrator I want to be alerted when I navigate away from a dirty order cycle form ', js: true do - include AuthenticationWorkflow + include AuthenticationHelper scenario "alert when navigating away from dirty form" do # Given a 'complex' order cycle form diff --git a/spec/features/admin/order_print_ticket_spec.rb b/spec/features/admin/order_print_ticket_spec.rb index 08616352dd..15fd46692a 100644 --- a/spec/features/admin/order_print_ticket_spec.rb +++ b/spec/features/admin/order_print_ticket_spec.rb @@ -7,7 +7,7 @@ feature ' I want to print a ticket for an order ', js: true do include CheckoutHelper - include AuthenticationWorkflow + include AuthenticationHelper include ActionView::Helpers::NumberHelper context "as an enterprise manager" do diff --git a/spec/features/admin/order_spec.rb b/spec/features/admin/order_spec.rb index be70b5392f..bfef4f6931 100644 --- a/spec/features/admin/order_spec.rb +++ b/spec/features/admin/order_spec.rb @@ -7,7 +7,7 @@ feature ' I want to create and edit orders ', js: true do include WebHelper - include AuthenticationWorkflow + include AuthenticationHelper let(:user) { create(:user) } let(:product) { create(:simple_product) } diff --git a/spec/features/admin/orders_spec.rb b/spec/features/admin/orders_spec.rb index df1690d59b..8510ff5943 100644 --- a/spec/features/admin/orders_spec.rb +++ b/spec/features/admin/orders_spec.rb @@ -6,7 +6,7 @@ feature ' As an administrator I want to manage orders ', js: true do - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper let(:user) { create(:user) } diff --git a/spec/features/admin/overview_spec.rb b/spec/features/admin/overview_spec.rb index 79b4ebf55c..3a4a3feb7d 100644 --- a/spec/features/admin/overview_spec.rb +++ b/spec/features/admin/overview_spec.rb @@ -5,7 +5,7 @@ feature ' I want to be given information about the state of my enterprises, products and order cycles ', js: true do include WebHelper - include AuthenticationWorkflow + include AuthenticationHelper include ::Spree::TestingSupport::AuthorizationHelpers context "as an enterprise user" do diff --git a/spec/features/admin/payment_method_spec.rb b/spec/features/admin/payment_method_spec.rb index f6b8f798c2..5ef9f6fa4b 100644 --- a/spec/features/admin/payment_method_spec.rb +++ b/spec/features/admin/payment_method_spec.rb @@ -5,7 +5,7 @@ feature ' I want to be able to set a distributor on each payment method ' do include WebHelper - include AuthenticationWorkflow + include AuthenticationHelper background do @distributors = (1..3).map { create(:distributor_enterprise) } diff --git a/spec/features/admin/payments_spec.rb b/spec/features/admin/payments_spec.rb index f9cac18498..851843dc30 100644 --- a/spec/features/admin/payments_spec.rb +++ b/spec/features/admin/payments_spec.rb @@ -4,7 +4,7 @@ feature ' As an admin I want to manage payments ' do - include AuthenticationWorkflow + include AuthenticationHelper let(:order) { create(:completed_order_with_fees) } diff --git a/spec/features/admin/product_import_spec.rb b/spec/features/admin/product_import_spec.rb index 85669fa9ed..a4bae3794a 100644 --- a/spec/features/admin/product_import_spec.rb +++ b/spec/features/admin/product_import_spec.rb @@ -3,7 +3,7 @@ require 'open_food_network/permissions' feature "Product Import", js: true do include AdminHelper - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper let!(:admin) { create(:admin_user) } diff --git a/spec/features/admin/products_spec.rb b/spec/features/admin/products_spec.rb index 61f1a45c6e..dd9bfafd2c 100644 --- a/spec/features/admin/products_spec.rb +++ b/spec/features/admin/products_spec.rb @@ -5,7 +5,7 @@ feature ' I want to set a supplier and distributor(s) for a product ' do include WebHelper - include AuthenticationWorkflow + include AuthenticationHelper let!(:taxon) { create(:taxon) } let!(:stock_location) { create(:stock_location, backorderable_default: false) } diff --git a/spec/features/admin/properties_spec.rb b/spec/features/admin/properties_spec.rb index 958aa87867..634f3fd436 100644 --- a/spec/features/admin/properties_spec.rb +++ b/spec/features/admin/properties_spec.rb @@ -6,7 +6,7 @@ feature ' As an admin I want to manage product properties ' do - include AuthenticationWorkflow + include AuthenticationHelper scenario "creating and editing a property" do login_as_admin_and_visit spree.admin_properties_path diff --git a/spec/features/admin/reports/packing_report_spec.rb b/spec/features/admin/reports/packing_report_spec.rb index 79378a5040..41035bada1 100644 --- a/spec/features/admin/reports/packing_report_spec.rb +++ b/spec/features/admin/reports/packing_report_spec.rb @@ -1,7 +1,7 @@ require "spec_helper" feature "Packing Reports", js: true do - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper let(:distributor) { create(:distributor_enterprise) } diff --git a/spec/features/admin/reports_spec.rb b/spec/features/admin/reports_spec.rb index 75da617a8f..265d8cb97d 100644 --- a/spec/features/admin/reports_spec.rb +++ b/spec/features/admin/reports_spec.rb @@ -5,7 +5,7 @@ feature ' I want numbers, all the numbers! ' do include WebHelper - include AuthenticationWorkflow + include AuthenticationHelper context "Permissions for different reports" do context "As an enterprise user" do diff --git a/spec/features/admin/schedules_spec.rb b/spec/features/admin/schedules_spec.rb index 1d70d1bf34..41c963e403 100644 --- a/spec/features/admin/schedules_spec.rb +++ b/spec/features/admin/schedules_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature 'Schedules', js: true do - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper context "as an enterprise user" do diff --git a/spec/features/admin/shipping_methods_spec.rb b/spec/features/admin/shipping_methods_spec.rb index fb57f2f898..560fe2f357 100644 --- a/spec/features/admin/shipping_methods_spec.rb +++ b/spec/features/admin/shipping_methods_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' feature 'shipping methods' do include WebHelper - include AuthenticationWorkflow + include AuthenticationHelper before :each do @shipping_method = create(:shipping_method) diff --git a/spec/features/admin/subscriptions_spec.rb b/spec/features/admin/subscriptions_spec.rb index 604126cf45..4278018aa2 100644 --- a/spec/features/admin/subscriptions_spec.rb +++ b/spec/features/admin/subscriptions_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' feature 'Subscriptions' do include AdminHelper - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper context "as an enterprise user", js: true do diff --git a/spec/features/admin/tag_rules_spec.rb b/spec/features/admin/tag_rules_spec.rb index 710e567b04..0f3f035379 100644 --- a/spec/features/admin/tag_rules_spec.rb +++ b/spec/features/admin/tag_rules_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature 'Tag Rules', js: true do - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper let!(:enterprise) { create(:distributor_enterprise) } diff --git a/spec/features/admin/tax_settings_spec.rb b/spec/features/admin/tax_settings_spec.rb index e496d0619a..0226ccb5f7 100644 --- a/spec/features/admin/tax_settings_spec.rb +++ b/spec/features/admin/tax_settings_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature 'Account and Billing Settings' do - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper describe "updating" do diff --git a/spec/features/admin/users_spec.rb b/spec/features/admin/users_spec.rb index ae1fa8da4f..94cb4b881f 100644 --- a/spec/features/admin/users_spec.rb +++ b/spec/features/admin/users_spec.rb @@ -1,7 +1,7 @@ require "spec_helper" feature "Managing users" do - include AuthenticationWorkflow + include AuthenticationHelper include OpenFoodNetwork::EmailHelper context "as super-admin" do diff --git a/spec/features/admin/variant_overrides_spec.rb b/spec/features/admin/variant_overrides_spec.rb index d540a3518e..80571f5488 100644 --- a/spec/features/admin/variant_overrides_spec.rb +++ b/spec/features/admin/variant_overrides_spec.rb @@ -6,7 +6,7 @@ feature " Without affecting other hubs that share the same products ", js: true do include AdminHelper - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper context "as the manager of a hub" do diff --git a/spec/features/admin/variants_spec.rb b/spec/features/admin/variants_spec.rb index 163cc78d7e..2b5df3c0aa 100644 --- a/spec/features/admin/variants_spec.rb +++ b/spec/features/admin/variants_spec.rb @@ -4,7 +4,7 @@ feature ' As an admin I want to manage product variants ' do - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper scenario "creating a new variant" do diff --git a/spec/features/consumer/account/cards_spec.rb b/spec/features/consumer/account/cards_spec.rb index c0a5da2150..e364d8057f 100644 --- a/spec/features/consumer/account/cards_spec.rb +++ b/spec/features/consumer/account/cards_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature "Credit Cards", js: true do - include AuthenticationWorkflow + include AuthenticationHelper describe "as a logged in user" do let(:user) { create(:user) } let!(:customer) { create(:customer, user: user) } diff --git a/spec/features/consumer/account/settings_spec.rb b/spec/features/consumer/account/settings_spec.rb index 16eeade5a1..77012ee3d8 100644 --- a/spec/features/consumer/account/settings_spec.rb +++ b/spec/features/consumer/account/settings_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature "Account Settings", js: true do - include AuthenticationWorkflow + include AuthenticationHelper include OpenFoodNetwork::EmailHelper describe "as a logged in user" do diff --git a/spec/features/consumer/account_spec.rb b/spec/features/consumer/account_spec.rb index bdba76c971..401c8fbd33 100644 --- a/spec/features/consumer/account_spec.rb +++ b/spec/features/consumer/account_spec.rb @@ -6,7 +6,7 @@ feature ' and view any outstanding balance. ', js: true do include UIComponentHelper - include AuthenticationWorkflow + include AuthenticationHelper let(:user) { create(:user) } let!(:distributor1) { create(:distributor_enterprise) } diff --git a/spec/features/consumer/authentication_spec.rb b/spec/features/consumer/authentication_spec.rb index c172f40f38..a98d7183b0 100644 --- a/spec/features/consumer/authentication_spec.rb +++ b/spec/features/consumer/authentication_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature "Authentication", js: true do - include AuthenticationWorkflow + include AuthenticationHelper include UIComponentHelper include OpenFoodNetwork::EmailHelper diff --git a/spec/features/consumer/groups_spec.rb b/spec/features/consumer/groups_spec.rb index dc9a3e4b75..3284b709c8 100644 --- a/spec/features/consumer/groups_spec.rb +++ b/spec/features/consumer/groups_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature 'Groups', js: true do - include AuthenticationWorkflow + include AuthenticationHelper include UIComponentHelper let(:enterprise) { create(:distributor_enterprise) } diff --git a/spec/features/consumer/multilingual_spec.rb b/spec/features/consumer/multilingual_spec.rb index a62a1b6ba3..1a54a813d3 100644 --- a/spec/features/consumer/multilingual_spec.rb +++ b/spec/features/consumer/multilingual_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature 'Multilingual', js: true do - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper include ShopWorkflow include UIComponentHelper diff --git a/spec/features/consumer/producers_spec.rb b/spec/features/consumer/producers_spec.rb index cf49db00df..f9e03d5f87 100644 --- a/spec/features/consumer/producers_spec.rb +++ b/spec/features/consumer/producers_spec.rb @@ -5,7 +5,7 @@ feature ' I want to see a list of producers So that I can shop at hubs distributing their products ', js: true do - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper include UIComponentHelper diff --git a/spec/features/consumer/registration_spec.rb b/spec/features/consumer/registration_spec.rb index ddb93298c7..3d7cbb0a0f 100644 --- a/spec/features/consumer/registration_spec.rb +++ b/spec/features/consumer/registration_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature "Registration", js: true do - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper describe "Registering a Profile" do diff --git a/spec/features/consumer/shopping/cart_spec.rb b/spec/features/consumer/shopping/cart_spec.rb index 7d156ef596..5339aa99f7 100644 --- a/spec/features/consumer/shopping/cart_spec.rb +++ b/spec/features/consumer/shopping/cart_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature "full-page cart", js: true do - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper include ShopWorkflow include UIComponentHelper diff --git a/spec/features/consumer/shopping/checkout_auth_spec.rb b/spec/features/consumer/shopping/checkout_auth_spec.rb index 4631e636ce..acbbabd970 100644 --- a/spec/features/consumer/shopping/checkout_auth_spec.rb +++ b/spec/features/consumer/shopping/checkout_auth_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature "As a consumer I want to check out my cart", js: true do - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper include ShopWorkflow include CheckoutWorkflow diff --git a/spec/features/consumer/shopping/checkout_spec.rb b/spec/features/consumer/shopping/checkout_spec.rb index 7f665e6351..dd79d95958 100644 --- a/spec/features/consumer/shopping/checkout_spec.rb +++ b/spec/features/consumer/shopping/checkout_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature "As a consumer I want to check out my cart", js: true do - include AuthenticationWorkflow + include AuthenticationHelper include ShopWorkflow include CheckoutWorkflow include WebHelper diff --git a/spec/features/consumer/shopping/embedded_shopfronts_spec.rb b/spec/features/consumer/shopping/embedded_shopfronts_spec.rb index 445a92186f..075209769e 100644 --- a/spec/features/consumer/shopping/embedded_shopfronts_spec.rb +++ b/spec/features/consumer/shopping/embedded_shopfronts_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' feature "Using embedded shopfront functionality", js: true do include OpenFoodNetwork::EmbeddedPagesHelper - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper include ShopWorkflow include CheckoutWorkflow diff --git a/spec/features/consumer/shopping/orders_spec.rb b/spec/features/consumer/shopping/orders_spec.rb index 1d5221e257..f7b0a832c5 100644 --- a/spec/features/consumer/shopping/orders_spec.rb +++ b/spec/features/consumer/shopping/orders_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature "Order Management", js: true do - include AuthenticationWorkflow + include AuthenticationHelper include OpenFoodNetwork::EmailHelper describe "viewing a completed order" do diff --git a/spec/features/consumer/shopping/products_spec.rb b/spec/features/consumer/shopping/products_spec.rb index 0846845021..91393e3213 100644 --- a/spec/features/consumer/shopping/products_spec.rb +++ b/spec/features/consumer/shopping/products_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature "As a consumer I want to view products", js: true do - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper include ShopWorkflow include UIComponentHelper diff --git a/spec/features/consumer/shopping/shopping_spec.rb b/spec/features/consumer/shopping/shopping_spec.rb index 9dd9ebbc65..f55c3aded5 100644 --- a/spec/features/consumer/shopping/shopping_spec.rb +++ b/spec/features/consumer/shopping/shopping_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature "As a consumer I want to shop with a distributor", js: true do - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper include ShopWorkflow include UIComponentHelper diff --git a/spec/features/consumer/shopping/variant_overrides_spec.rb b/spec/features/consumer/shopping/variant_overrides_spec.rb index 9c7ca0a5d1..d89990dc55 100644 --- a/spec/features/consumer/shopping/variant_overrides_spec.rb +++ b/spec/features/consumer/shopping/variant_overrides_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature "shopping with variant overrides defined", js: true do - include AuthenticationWorkflow + include AuthenticationHelper include WebHelper include ShopWorkflow include CheckoutWorkflow diff --git a/spec/features/consumer/shops_spec.rb b/spec/features/consumer/shops_spec.rb index a9c262817c..80483840fc 100644 --- a/spec/features/consumer/shops_spec.rb +++ b/spec/features/consumer/shops_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' feature 'Shops', js: true do - include AuthenticationWorkflow + include AuthenticationHelper include UIComponentHelper include WebHelper diff --git a/spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb b/spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb index e646884e6e..af91f3a917 100644 --- a/spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb +++ b/spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' require 'open_food_network/orders_and_fulfillments_report' describe OpenFoodNetwork::OrdersAndFulfillmentsReport do - include AuthenticationWorkflow + include AuthenticationHelper let(:distributor) { create(:distributor_enterprise) } let(:order_cycle) { create(:simple_order_cycle) } diff --git a/spec/lib/open_food_network/packing_report_spec.rb b/spec/lib/open_food_network/packing_report_spec.rb index 197224d5d8..462baf0b58 100644 --- a/spec/lib/open_food_network/packing_report_spec.rb +++ b/spec/lib/open_food_network/packing_report_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' require 'open_food_network/packing_report' -include AuthenticationWorkflow +include AuthenticationHelper module OpenFoodNetwork describe PackingReport do diff --git a/spec/requests/checkout/stripe_connect_spec.rb b/spec/requests/checkout/stripe_connect_spec.rb index 75ca23c8c4..4bc09fc74f 100644 --- a/spec/requests/checkout/stripe_connect_spec.rb +++ b/spec/requests/checkout/stripe_connect_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe "checking out an order with a Stripe Connect payment method", type: :request do include ShopWorkflow - include AuthenticationWorkflow + include AuthenticationHelper include OpenFoodNetwork::ApiHelper let!(:order_cycle) { create(:simple_order_cycle) } diff --git a/spec/requests/checkout/stripe_sca_spec.rb b/spec/requests/checkout/stripe_sca_spec.rb index 95a5b29554..ad03211b1a 100644 --- a/spec/requests/checkout/stripe_sca_spec.rb +++ b/spec/requests/checkout/stripe_sca_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' describe "checking out an order with a Stripe SCA payment method", type: :request do include ShopWorkflow - include AuthenticationWorkflow + include AuthenticationHelper include OpenFoodNetwork::ApiHelper let!(:order_cycle) { create(:simple_order_cycle) } diff --git a/spec/requests/embedded_shopfronts_headers_spec.rb b/spec/requests/embedded_shopfronts_headers_spec.rb index f04de87b86..1a6f2a3a01 100644 --- a/spec/requests/embedded_shopfronts_headers_spec.rb +++ b/spec/requests/embedded_shopfronts_headers_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe "setting response headers for embedded shopfronts", type: :request do - include AuthenticationWorkflow + include AuthenticationHelper let(:enterprise) { create(:distributor_enterprise) } let(:user) { enterprise.owner } diff --git a/spec/support/request/authentication_workflow.rb b/spec/support/request/authentication_helper.rb similarity index 94% rename from spec/support/request/authentication_workflow.rb rename to spec/support/request/authentication_helper.rb index a10c858508..c60f7b92ba 100644 --- a/spec/support/request/authentication_workflow.rb +++ b/spec/support/request/authentication_helper.rb @@ -1,4 +1,4 @@ -module AuthenticationWorkflow +module AuthenticationHelper include Warden::Test::Helpers def login_as(user) @@ -46,7 +46,7 @@ module AuthenticationWorkflow end RSpec.configure do |config| - config.extend AuthenticationWorkflow, type: :feature + config.extend AuthenticationHelper, type: :feature # rspec-rails 3 will no longer automatically infer an example group's spec type # from the file location. You can explicitly opt-in to the feature using this diff --git a/spec/views/spree/shared/_order_details.html.haml_spec.rb b/spec/views/spree/shared/_order_details.html.haml_spec.rb index ac6d788f24..60e95ac0f6 100644 --- a/spec/views/spree/shared/_order_details.html.haml_spec.rb +++ b/spec/views/spree/shared/_order_details.html.haml_spec.rb @@ -3,7 +3,7 @@ require "spec_helper" describe "spree/shared/_order_details.html.haml" do - include AuthenticationWorkflow + include AuthenticationHelper helper Spree::BaseHelper let(:order) { create(:completed_order_with_fees) }