Overhaul Spec Tests

.circleci/config.yml

@@ -51,7 +51,7 @@ run_tests: &run_tests
     - store_test_results:
         path: ~/rspec
     - store_artifacts:
-        path: tmp/capybara
+        path: /tmp/test-artifacts
 
 run_tests_3_0: &run_tests_3_0
   <<: *defaults_3_0
@@ -86,7 +86,7 @@ run_tests_3_0: &run_tests_3_0
     - store_test_results:
         path: ~/rspec
     - store_artifacts:
-        path: tmp/capybara
+        path: /tmp/test-artifacts
 
 jobs:
   bundle:

lib/spree/auth/engine.rb

@@ -31,7 +31,7 @@ def self.activate
           Rails.configuration.cache_classes ? require(c) : load(c)
         end
         if Spree::Auth::Engine.backend_available?
-          Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/backend/*/*/*_decorator*.rb")) do |c|
+          Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/backend/**/*_decorator*.rb")) do |c|
             Rails.configuration.cache_classes ? require(c) : load(c)
           end
         end
@@ -60,10 +60,6 @@ def self.frontend_available?
         @@frontend_available ||= Gem::Specification.find_all_by_name('spree_frontend').any?
       end
 
-      def self.api_available?
-        @@api_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Api::Engine')
-      end
-
       def self.emails_available?
         @@emails_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Emails::Engine')
       end

lib/spree/testing_support/auth_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module TestingSupport
     module AuthHelpers
@@ -9,6 +11,23 @@ def logout_button
         Spree.version.to_f == 4.1 ? Spree.t('nav_bar.log_out') : Spree.t(:logout).upcase
       end
 
+      def admin_login(email:, password:, remember_me: true, locale: nil)
+        visit spree.admin_path(locale: locale)
+
+        fill_in id: 'spree_user_email', with: email
+        fill_in id: 'spree_user_password', with: password
+
+        first('label', text: Spree.t(:remember_me)).click if remember_me
+
+        click_button login_button
+      end
+
+      def assert_admin_login_success(locale = :en)
+        expect(page).to have_css('.admin')
+        expect(current_path).to eq '/admin'
+        expect(page).to have_css("html[lang='#{locale.to_s}']")
+      end
+
       def log_in(email:, password:, remember_me: true, locale: nil)
         visit spree.login_path(locale: locale)
 
@@ -22,20 +41,20 @@ def log_in(email:, password:, remember_me: true, locale: nil)
         expect(page).to have_content Spree.t(:logged_in_successfully)
       end
 
-      def log_out
-        show_user_menu
+      def log_out_via_frontend_user_menu
+        show_frontend_user_menu
         click_link logout_button
 
         expect(page).to have_content 'Signed out successfully'
       end
 
-      def show_user_menu
+      def show_frontend_user_menu
         find("button[aria-label='#{Spree.t('nav_bar.show_user_menu')}']").click
       end
 
       def show_user_account
         within '#nav-bar' do
-          show_user_menu
+          show_frontend_user_menu
           click_link Spree.t(:my_account).upcase
         end
       end

lib/spree/testing_support/checkout_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module TestingSupport
     module CheckoutHelpers

spec/controllers/spree/admin/orders_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     RSpec.describe OrdersController, type: :controller do

spec/controllers/spree/admin/user_sessions_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Spree::Admin::UserSessionsController, type: :controller do
   before { @request.env['devise.mapping'] = Devise.mappings[:spree_user] }
 

spec/controllers/spree/checkout_controller_spec.rb

@@ -9,6 +9,8 @@
     Spree::Store.default.update(default_locale: 'en', supported_locales: 'en,fr') if Spree.version.to_f >= 4.2
   end
 
+  after { I18n.locale = :en }
+
   context '#edit' do
     context 'when registration step enabled' do
       before do
@@ -33,8 +35,8 @@
 
         context 'non default locale' do
           it 'redirects to registration step with non default locale' do
-            get :edit, params: { state: 'address', locale: 'fr' }
-            expect(response).to redirect_to spree.checkout_registration_path(locale: 'fr')
+            get :edit, params: { state: 'address', locale: :fr }
+            expect(response).to redirect_to spree.checkout_registration_path(locale: :fr)
           end
         end
       end
@@ -97,8 +99,8 @@
           it 'redirects to the tokenized order view with a non default locale' do
             # spree version higher than 3.6 required for test to work correctly
             request.cookie_jar.signed[:token] = 'ABC'
-            post :update, params: { state: 'confirm', locale: 'fr' }
-            expect(response).to redirect_to spree.order_path(order, locale: 'fr')
+            post :update, params: { state: 'confirm', locale: :fr }
+            expect(response).to redirect_to spree.order_path(order, locale: :fr)
           end
         end
       end
@@ -121,8 +123,8 @@
 
         context 'non default locale' do
           it 'redirects to the standard order view with a non default locale' do
-            post :update, params: { state: 'confirm', locale: 'fr' }
-            expect(response).to redirect_to spree.order_path(order, locale: 'fr')
+            post :update, params: { state: 'confirm', locale: :fr }
+            expect(response).to redirect_to spree.order_path(order, locale: :fr)
           end
         end
       end
@@ -174,8 +176,8 @@
     context 'non default locale' do
       it 'redirects to the checkout_path after saving with non default locale' do
         allow(controller).to receive(:check_authorization)
-        put :update_registration, params: { order: { email: 'jobs@spreecommerce.com' }, locale: 'fr' }
-        expect(response).to redirect_to spree.checkout_state_path(:address, locale: 'fr')
+        put :update_registration, params: { order: { email: 'jobs@spreecommerce.com' }, locale: :fr }
+        expect(response).to redirect_to spree.checkout_state_path(:address, locale: :fr)
       end
     end
 

spec/controllers/spree/user_registrations_controller_spec.rb

@@ -1,6 +1,8 @@
 RSpec.describe Spree::UserRegistrationsController, type: :controller do
   before { @request.env['devise.mapping'] = Devise.mappings[:spree_user] }
 
+  after { I18n.locale = :en }
+
   context '#create' do
     before { allow(controller).to receive(:after_sign_up_path_for).and_return(spree.account_path) }
 
@@ -14,15 +16,13 @@
         Spree::Store.default.update(default_locale: 'en', supported_locales: 'en,fr')
       end
 
-      after { I18n.locale = :en }
-
       it 'redirects to account_path with locale' do
-        post :create, params: { spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }, locale: 'fr'}
-        expect(response).to redirect_to spree.account_path(locale: 'fr')
+        post :create, params: { spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }, locale: :fr}
+        expect(response).to redirect_to spree.account_path(locale: :fr)
       end
 
       it 'saves locale in user' do
-        post :create, params: { spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }, locale: 'fr'}
+        post :create, params: { spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }, locale: :fr}
         user = Spree.user_class.find_by_email('foobar@example.com')
         expect(user.selected_locale).to eq('fr')
       end
@@ -83,8 +83,6 @@
       allow(Devise::Mapping).to receive(:find_scope!).and_return(:spree_user)
     end
 
-    after { I18n.locale = :en }
-
     it 'redirects to sign in after timeout' do
       expect(controller.send(:after_inactive_sign_up_path_for, :user)).to eq(spree.login_path)
     end

spec/controllers/spree/user_sessions_controller_spec.rb

@@ -3,6 +3,8 @@
 
   before { @request.env['devise.mapping'] = Devise.mappings[:spree_user] }
 
+  after { I18n.locale = :en }
+
   context "#create" do
     context "using correct login information" do
       if Gem.loaded_specs['spree_core'].version >= Gem::Version.create('3.7.0')
@@ -14,7 +16,7 @@
 
           it 'assigns orders with the correct token and no user present' do
             order = create(:order, email: user.email, token: 'ABC', user_id: nil, created_by_id: nil)
-            post :create, params: { spree_user: { email: user.email, password: 'secret' }}
+            post :create, params: { spree_user: { email: user.email, password: 'secret' } }
 
             order.reload
             expect(order.user_id).to eq user.id
@@ -23,7 +25,7 @@
 
           it 'assigns orders with the correct token and no user or email present' do
             order = create(:order, token: 'ABC', user_id: nil, created_by_id: nil)
-            post :create, params: { spree_user: { email: user.email, password: 'secret' }}
+            post :create, params: { spree_user: { email: user.email, password: 'secret' } }
 
             order.reload
             expect(order.user_id).to eq user.id
@@ -34,7 +36,7 @@
             order = create(:order, email: user.email, token: 'ABC',
                            user_id: nil, created_by_id: nil,
                            completed_at: 1.minute.ago)
-            post :create, params: { spree_user: { email: user.email, password: 'secret' }}
+            post :create, params: { spree_user: { email: user.email, password: 'secret' } }
 
             order.reload
             expect(order.user_id).to be_nil
@@ -43,14 +45,14 @@
 
           it 'does not assign orders with an existing user' do
             order = create(:order, token: 'ABC', user_id: 200)
-            post :create, params: { spree_user: { email: user.email, password: 'secret' }}
+            post :create, params: { spree_user: { email: user.email, password: 'secret' } }
 
             expect(order.reload.user_id).to eq 200
           end
 
           it 'does not assign orders with a different token' do
             order = create(:order, token: 'DEF', user_id: nil, created_by_id: nil)
-            post :create, params: { spree_user: { email: user.email, password: 'secret' }}
+            post :create, params: { spree_user: { email: user.email, password: 'secret' } }
 
             expect(order.reload.user_id).to be_nil
           end
@@ -72,7 +74,7 @@
           else
             order = create(:order, email: user.email, guest_token: 'ABC', user_id: nil, created_by_id: nil)
           end
-          post :create, params: { spree_user: { email: user.email, password: 'secret' }}
+          post :create, params: { spree_user: { email: user.email, password: 'secret' } }
 
           order.reload
           expect(order.user_id).to eq user.id
@@ -85,7 +87,7 @@
           else
             order = create(:order, guest_token: 'ABC', user_id: nil, created_by_id: nil)
           end
-          post :create, params: { spree_user: { email: user.email, password: 'secret' }}
+          post :create, params: { spree_user: { email: user.email, password: 'secret' } }
 
           order.reload
           expect(order.user_id).to eq user.id
@@ -111,22 +113,22 @@
 
         it 'does not assign orders with an existing user' do
           if Spree.version.to_f > 3.6
-              order = create(:order, token: 'ABC', user_id: 200)
+            order = create(:order, token: 'ABC', user_id: 200)
           else
-              order = create(:order, guest_token: 'ABC', user_id: 200)
+            order = create(:order, guest_token: 'ABC', user_id: 200)
           end
-          post :create, params: { spree_user: { email: user.email, password: 'secret' }}
+          post :create, params: { spree_user: { email: user.email, password: 'secret' } }
 
           expect(order.reload.user_id).to eq 200
         end
 
         it 'does not assign orders with a different token' do
           if Spree.version.to_f > 3.6
-              order = create(:order, token: 'DEF', user_id: nil, created_by_id: nil)
+            order = create(:order, token: 'DEF', user_id: nil, created_by_id: nil)
           else
-              order = create(:order, guest_token: 'DEF', user_id: nil, created_by_id: nil)
+            order = create(:order, guest_token: 'DEF', user_id: nil, created_by_id: nil)
           end
-          post :create, params: { spree_user: { email: user.email, password: 'secret' }}
+          post :create, params: { spree_user: { email: user.email, password: 'secret' } }
 
           expect(order.reload.user_id).to be_nil
         end
@@ -144,17 +146,17 @@
           else
             order = create(:order, email: user.email, guest_token: 'ABC', user_id: nil, created_by_id: nil)
           end
-          post :create, params: { spree_user: { email: user.email, password: 'secret' }}
+          post :create, params: { spree_user: { email: user.email, password: 'secret' } }
 
           order.reload
           expect(order.user_id).to eq user.id
           expect(order.created_by_id).to eq user.id
-        end 
+        end
       end
 
       context "and html format is used" do
         it "redirects to account path after signing in" do
-          post :create, params: { spree_user: { email: user.email, password: 'secret' }}
+          post :create, params: { spree_user: { email: user.email, password: 'secret' } }
           expect(response).to redirect_to spree.account_path
         end
 
@@ -165,8 +167,8 @@
 
           it 'redirects to localized account path after signing in' do
             skip if Spree.version.to_f < 4.2
-            post :create, params: { spree_user: { email: user.email, password: 'secret' }, locale: 'fr' }
-            expect(response).to redirect_to spree.account_path(locale: 'fr')
+            post :create, params: { spree_user: { email: user.email, password: 'secret' }, locale: :fr }
+            expect(response).to redirect_to spree.account_path(locale: :fr)
           end
         end
       end
@@ -185,7 +187,7 @@
     context "using incorrect login information" do
       context "and html format is used" do
         it "renders new template again with errors" do
-          post :create, params: { spree_user: { email: user.email, password: 'wrong' }}
+          post :create, params: { spree_user: { email: user.email, password: 'wrong' } }
           expect(response).to render_template('new')
           expect(flash[:error]).to eq I18n.t(:'devise.failure.invalid')
         end
@@ -207,15 +209,15 @@
     end
 
     it "redirects to login page after signing out with default locale" do
-      post :create, params: { spree_user: { email: user.email, password: 'secret' }}
+      post :create, params: { spree_user: { email: user.email, password: 'secret' } }
       delete :destroy
       expect(response).to redirect_to(spree.login_path)
     end
 
     it "persists fr locale when redirecting to login page after signing out" do
-      post :create, params: { spree_user: { email: user.email, password: 'secret' }, locale: 'fr' }
-      delete :destroy, params: { locale: 'fr' }
-      expect(response).to redirect_to spree.login_path(locale: 'fr')
+      post :create, params: { spree_user: { email: user.email, password: 'secret' }, locale: :fr }
+      delete :destroy, params: { locale: :fr }
+      expect(response).to redirect_to spree.login_path(locale: :fr)
     end
-end
+  end
 end

spec/controllers/spree/users_controller_spec.rb

@@ -8,6 +8,8 @@
     Spree::Store.default.update(default_locale: 'en', supported_locales: 'en,fr')
   end
 
+  after { I18n.locale = :en }
+
   context '#load_object' do
     it 'redirects to signup path if user is not found' do
       allow(controller).to receive(:spree_current_user) { nil }
@@ -18,8 +20,8 @@
     context "non default locale" do
       it 'redirects to signup path with non default locale if user is not found' do
         allow(controller).to receive(:spree_current_user) { nil }
-        put :update, params: { user: { email: 'foobar@example.com' }, locale: 'fr' }
-        expect(response).to redirect_to spree.login_path(locale: 'fr')
+        put :update, params: { user: { email: 'foobar@example.com' }, locale: :fr }
+        expect(response).to redirect_to spree.login_path(locale: :fr)
       end
     end
   end
@@ -46,14 +48,14 @@
       end
 
       context 'non default locale' do
-        before { put :update, params: { user: { email: 'mynew@email-address.com' }, locale: 'fr' } }
+        before { put :update, params: { user: { email: 'mynew@email-address.com' }, locale: :fr } }
 
         it 'performs update of email' do
           expect(assigns[:user].email).to eq 'mynew@email-address.com'
         end
 
         it 'persists locale when redirecting to account' do
-          expect(response).to redirect_to spree.account_path(locale: 'fr')
+          expect(response).to redirect_to spree.account_path(locale: :fr)
         end
       end