spree_auth_devise 4.3.3 → 4.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88bd67ceeb209cf0a5429d736103ffad339942eefd7cf7f75d6b84dfbb25a553
-  data.tar.gz: 261b34f941e7f6584dfa9fb4a50dc76c8b4aae6f9785db618ef630da1f881312
+  metadata.gz: 3e12256ddf3e493e918afe0f529f5abf35fe8db54ac04623081c96f82c4b8bb1
+  data.tar.gz: 898d1757061761ff25aeb56dbc09a8c111d21881051526fd0e842c30a6d264e4
 SHA512:
-  metadata.gz: 489cf73cb272c2318cc35761e736a9b65fb0549e8ba938550fdf63ed16727a562180e22bfd6f210a6e6384fd8e4bb589e9a4bebf37d0e287e0c712c83e1e7214
-  data.tar.gz: 9e16a12db4e028e6318896d5fded01acda724348587a5f6628e437c81be41ccb4f4c6e537aac344c0ed05d223c27cfc03bcf275513ea7d84fa15eafd1f6b271a
+  metadata.gz: b54d41d158228c72e3167d8354f1ba352030533885776a3a7c2a30dc675ac2055627bf48c5da724e5104e0004b4f8cfca1504ded6ceaed0e4c632edc9c95cce4
+  data.tar.gz: dfc8ac967964ee75c706e138c015b627e303798c7bbb88fe4ee63077149717ece0c8474d7888cc6280ea2c0a4fad363ecf1f1f4516f47ef80fe93c0abbf8cfe5

data/app/controllers/spree/user_confirmations_controller.rb

@@ -6,13 +6,16 @@ class Spree::UserConfirmationsController < Devise::ConfirmationsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
-  if defined?(Spree::Core::ControllerHelpers::Currency)
-    include Spree::Core::ControllerHelpers::Currency
-  end
+  include SpreeI18n::ControllerLocaleHelper if defined?(SpreeI18n::ControllerLocaleHelper)
 
-  if defined?(Spree::Core::ControllerHelpers::Locale)
-    include Spree::Core::ControllerHelpers::Locale
-  end
+  include Spree::Core::ControllerHelpers::Currency if defined?(Spree::Core::ControllerHelpers::Currency)
+  include Spree::Core::ControllerHelpers::Locale if defined?(Spree::Core::ControllerHelpers::Locale)
+
+  include Spree::LocaleUrls if defined?(Spree::LocaleUrls)
+
+  helper 'spree/locale' if defined?(Spree::LocaleHelper)
+  helper 'spree/currency' if defined?(Spree::CurrencyHelper)
+  helper 'spree/store' if defined?(Spree::StoreHelper)
 
   before_action :set_current_order
 

data/app/controllers/spree/user_passwords_controller.rb

@@ -6,17 +6,16 @@ class Spree::UserPasswordsController < Devise::PasswordsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
-  if defined?(Spree::Core::ControllerHelpers::Currency)
-    include Spree::Core::ControllerHelpers::Currency
-  end
+  include SpreeI18n::ControllerLocaleHelper if defined?(SpreeI18n::ControllerLocaleHelper)
 
-  if defined?(Spree::Core::ControllerHelpers::Locale)
-    include Spree::Core::ControllerHelpers::Locale
-  end
+  include Spree::Core::ControllerHelpers::Currency if defined?(Spree::Core::ControllerHelpers::Currency)
+  include Spree::Core::ControllerHelpers::Locale if defined?(Spree::Core::ControllerHelpers::Locale)
 
-  if defined?(SpreeI18n::ControllerLocaleHelper)
-    include SpreeI18n::ControllerLocaleHelper
-  end
+  include Spree::LocaleUrls if defined?(Spree::LocaleUrls)
+
+  helper 'spree/locale' if defined?(Spree::LocaleHelper)
+  helper 'spree/currency' if defined?(Spree::CurrencyHelper)
+  helper 'spree/store' if defined?(Spree::StoreHelper)
 
   before_action :set_current_order
 

data/app/controllers/spree/user_registrations_controller.rb

@@ -6,17 +6,16 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
-  if defined?(Spree::Core::ControllerHelpers::Currency)
-    include Spree::Core::ControllerHelpers::Currency
-  end
+  include SpreeI18n::ControllerLocaleHelper if defined?(SpreeI18n::ControllerLocaleHelper)
 
-  if defined?(Spree::Core::ControllerHelpers::Locale)
-    include Spree::Core::ControllerHelpers::Locale
-  end
+  include Spree::Core::ControllerHelpers::Currency if defined?(Spree::Core::ControllerHelpers::Currency)
+  include Spree::Core::ControllerHelpers::Locale if defined?(Spree::Core::ControllerHelpers::Locale)
 
-  if defined?(SpreeI18n::ControllerLocaleHelper)
-    include SpreeI18n::ControllerLocaleHelper
-  end
+  include Spree::LocaleUrls if defined?(Spree::LocaleUrls)
+
+  helper 'spree/locale' if defined?(Spree::LocaleHelper)
+  helper 'spree/currency' if defined?(Spree::CurrencyHelper)
+  helper 'spree/store' if defined?(Spree::StoreHelper)
 
   before_action :check_permissions, only: [:edit, :update]
   before_action :set_current_order

data/app/controllers/spree/user_sessions_controller.rb

@@ -6,17 +6,16 @@ class Spree::UserSessionsController < Devise::SessionsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
-  if defined?(Spree::Core::ControllerHelpers::Currency)
-    include Spree::Core::ControllerHelpers::Currency
-  end
+  include SpreeI18n::ControllerLocaleHelper if defined?(SpreeI18n::ControllerLocaleHelper)
 
-  if defined?(Spree::Core::ControllerHelpers::Locale)
-    include Spree::Core::ControllerHelpers::Locale
-  end
+  include Spree::Core::ControllerHelpers::Currency if defined?(Spree::Core::ControllerHelpers::Currency)
+  include Spree::Core::ControllerHelpers::Locale if defined?(Spree::Core::ControllerHelpers::Locale)
 
-  if defined?(SpreeI18n::ControllerLocaleHelper)
-    include SpreeI18n::ControllerLocaleHelper
-  end
+  include Spree::LocaleUrls if defined?(Spree::LocaleUrls)
+
+  helper 'spree/locale' if defined?(Spree::LocaleHelper)
+  helper 'spree/currency' if defined?(Spree::CurrencyHelper)
+  helper 'spree/store' if defined?(Spree::StoreHelper)
 
   before_action :set_current_order
 
@@ -66,7 +65,7 @@ class Spree::UserSessionsController < Devise::SessionsController
   end
 
   def after_sign_in_redirect(resource_or_scope)
-    stored_location_for(resource_or_scope) || account_path
+    stored_location_for(resource_or_scope) || spree.account_path
   end
 
   def respond_to_on_destroy
@@ -82,6 +81,6 @@ class Spree::UserSessionsController < Devise::SessionsController
     scope = Devise::Mapping.find_scope!(resource_or_scope)
     router_name = Devise.mappings[scope].router_name
     context = router_name ? send(router_name) : self
-    context.respond_to?(:login_path) ? context.login_path : "/"
+    context.respond_to?(:login_path) ? context.login_path : spree.root_path
   end
 end

data/lib/controllers/frontend/spree/users_controller.rb

@@ -34,7 +34,7 @@ class Spree::UsersController < Spree::StoreController
           bypass_sign_in(@user)
         end
       end
-      redirect_to spree.account_url, notice: Spree.t(:account_updated)
+      redirect_to spree.account_path, notice: Spree.t(:account_updated)
     else
       render :edit
     end

data/lib/spree/auth/version.rb

@@ -1,6 +1,6 @@
 module Spree
   module Auth
-    VERSION = '4.3.3'.freeze
+    VERSION = '4.3.4'.freeze
 
     def gem_version
       Gem::Version.new(VERSION)

data/lib/spree/testing_support/auth_helpers.rb

@@ -1,34 +1,42 @@
 module Spree
   module TestingSupport
     module AuthHelpers
-      def log_in(email:, password:, remember_me: true)
-        visit spree.login_path
+      def login_button
+        Spree.version.to_f == 4.1 ? Spree.t(:log_in) : Spree.t(:login)
+      end
+
+      def logout_button
+        Spree.version.to_f == 4.1 ? Spree.t('nav_bar.log_out') : Spree.t(:logout).upcase
+      end
+
+      def log_in(email:, password:, remember_me: true, locale: nil)
+        visit spree.login_path(locale: locale)
 
-        fill_in 'Email', with: email
-        fill_in 'Password', with: password
+        fill_in Spree.t(:email), with: email
+        fill_in Spree.t(:password), with: password
 
         # Regression test for #1257
-        first('label', text: 'Remember me').click if remember_me
-        click_button 'Log in'
+        first('label', text: Spree.t(:remember_me)).click if remember_me
+        click_button login_button
 
-        expect(page).to have_content 'Logged in successfully'
+        expect(page).to have_content Spree.t(:logged_in_succesfully)
       end
 
       def log_out
         show_user_menu
-        click_link 'LOG OUT'
+        click_link logout_button
 
         expect(page).to have_content 'Signed out successfully'
       end
 
       def show_user_menu
-        find("button[aria-label='Show user menu']").click
+        find("button[aria-label='#{Spree.t('nav_bar.show_user_menu')}']").click
       end
 
       def show_user_account
         within '#nav-bar' do
           show_user_menu
-          click_link 'MY ACCOUNT'
+          click_link Spree.t(:my_account).upcase
         end
       end
     end

data/spec/controllers/spree/user_sessions_controller_spec.rb

@@ -137,7 +137,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
           request.cookie_jar.signed[:guest_token] = 'ABC'
           request.cookie_jar.signed[:token] = 'DEF'
         end
-          
+
         it 'assigns the correct token attribute for the order' do 
           if Spree.version.to_f > 3.6
             order = create(:order, email: user.email, token: 'ABC', user_id: nil, created_by_id: nil)
@@ -157,6 +157,18 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
           post :create, params: { spree_user: { email: user.email, password: 'secret' }}
           expect(response).to redirect_to spree.account_path
         end
+
+        context 'different locale' do
+          before do
+            Spree::Store.default.update(default_locale: 'en', supported_locales: 'en,fr') if Spree.version.to_f >= 4.2
+          end
+
+          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')
+          end
+        end
       end
 
       context "and js format is used" do

data/spec/controllers/spree/users_controller_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe Spree::UsersController, type: :controller do
       it 'performs update' do
         put :update, params: { user: { email: 'mynew@email-address.com' } }
         expect(assigns[:user].email).to eq 'mynew@email-address.com'
-        expect(response).to redirect_to spree.account_url(only_path: true)
+        expect(response).to redirect_to spree.account_path
       end
     end
 

data/spec/features/account_spec.rb

@@ -10,7 +10,7 @@ RSpec.feature 'Accounts', type: :feature do
 
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
-      click_button 'Log in'
+      click_button login_button
 
       show_user_account
       expect(page).to have_text 'admin@person.com'
@@ -43,7 +43,7 @@ RSpec.feature 'Accounts', type: :feature do
 
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
-      click_button 'Log in'
+      click_button login_button
 
       show_user_account
       expect(page).to have_text 'email@person.com'

data/spec/features/admin/orders_spec.rb

@@ -1,6 +1,7 @@
 RSpec.feature 'Admin orders', type: :feature do
   background do
-    sign_in_as! create(:admin_user)
+    user = create(:admin_user)
+    log_in email: user.email, password: user.password
   end
 
   # Regression #203

data/spec/features/admin/sign_in_spec.rb

@@ -13,8 +13,8 @@ RSpec.feature 'Admin - Sign In', type: :feature do
     log_in(email: @user.email, password: 'secret')
     show_user_menu
 
-    expect(page).not_to have_text 'Login'
-    expect(page).to have_text 'LOG OUT'
+    expect(page).not_to have_text login_button.upcase
+    expect(page).to have_text logout_button.upcase
     expect(current_path).to eq '/account'
   end
 
@@ -33,13 +33,13 @@ RSpec.feature 'Admin - Sign In', type: :feature do
 
     fill_in 'Email', with: user.email
     fill_in 'Password', with: 'secret'
+    click_button login_button
+
     if Spree.version.to_f > 4.1
-      click_button 'Login'
       within '.navbar .dropdown-menu' do
         expect(page).to have_text 'admin@person.com'
       end
     else
-      click_button 'Log in'
       within '.user-menu' do
         expect(page).to have_text 'admin@person.com'
       end

data/spec/features/admin/sign_out_spec.rb

@@ -9,13 +9,13 @@ RSpec.feature 'Admin - Sign Out', type: :feature do
     fill_in 'Password', with: 'secret'
     # Regression test for #1257
     check 'Remember me'
-    click_button 'Login'
+    click_button Spree.t(:login)
   end
 
   scenario 'allows a signed in user to logout', js: true do
     log_out
     visit spree.admin_login_path
-    expect(page).to have_button 'Login'
-    expect(page).not_to have_text 'Logout'
+    expect(page).to have_button Spree.t(:login)
+    expect(page).not_to have_text Spree.t(:logout)
   end
 end

data/spec/features/admin_permissions_spec.rb

@@ -7,7 +7,7 @@ RSpec.feature 'Admin Permissions', type: :feature do
 
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
-      click_button 'Log in'
+      click_button login_button
     end
 
     context 'admin is restricted from accessing orders' do

data/spec/features/checkout_spec.rb

@@ -55,7 +55,7 @@ RSpec.feature 'Checkout', :js, type: :feature do
       visit spree.login_path
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
-      click_button 'Log in'
+      click_button login_button
       expect(page).to have_text('Logged in successfully')
       find('a.cart-icon').click
 

data/spec/features/order_spec.rb

@@ -17,7 +17,7 @@ RSpec.feature 'Orders', :js, type: :feature do
       visit spree.login_path
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
-      click_button 'Log in'
+      click_button login_button
 
       visit spree.cart_path
       expect(page).to have_text 'RoR Mug'
@@ -29,7 +29,7 @@ RSpec.feature 'Orders', :js, type: :feature do
       visit spree.login_path
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
-      click_button 'Log in'
+      click_button login_button
 
       # Order should have been merged with first session
       visit spree.cart_path

data/spec/features/sign_in_spec.rb

@@ -13,15 +13,15 @@ RSpec.feature 'Sign In', type: :feature do
     log_in(email: @user.email, password: @user.password)
     show_user_menu
 
-    expect(page).not_to have_text 'Login'
-    expect(page).to have_text 'LOG OUT'
+    expect(page).not_to have_text login_button.upcase
+    expect(page).to have_text logout_button.upcase
     expect(current_path).to eq '/account'
   end
 
   scenario 'show validation erros' do
     fill_in 'Email', with: @user.email
     fill_in 'Password', with: 'wrong_password'
-    click_button 'Log in'
+    click_button login_button
 
     expect(page).to have_text 'Invalid email or password'
     expect(page).to have_text 'Log in'
@@ -35,12 +35,12 @@ RSpec.feature 'Sign In', type: :feature do
     fill_in 'Password', with: user.password
 
     if Spree.version.to_f > 4.1
-      click_button 'Login'
+      click_button login_button
       within '.navbar .dropdown-menu' do
         expect(page).to have_text 'admin@person.com'
       end
     else
-      click_button 'Log in'
+      click_button login_button
       within '.user-menu' do
         expect(page).to have_text 'admin@person.com'
       end
@@ -52,7 +52,29 @@ RSpec.feature 'Sign In', type: :feature do
     visit spree.account_path
     fill_in 'Email', with: @user.email
     fill_in 'Password', with: @user.password
-    click_button 'Log in'
+    click_button login_button
     expect(current_path).to eq '/account'
   end
+
+  context 'localized' do
+    before do
+      if Spree.version.to_f >= 4.2
+        add_french_locales
+        Spree::Store.default.update(default_locale: 'en', supported_locales: 'en,fr')
+        I18n.locale = :fr
+      end
+    end
+
+    after { I18n.locale = :en }
+
+    scenario 'let a user sign in successfully', js: true do
+      skip if Spree.version.to_f < 4.2
+      log_in(email: @user.email, password: @user.password, locale: 'fr')
+      show_user_menu
+
+      expect(page).not_to have_text Spree.t(:login).upcase
+      expect(page).to have_text Spree.t(:logout).upcase
+      expect(current_url).to match(/\/account\?locale\=fr$/)
+    end
+  end
 end

data/spec/features/sign_out_spec.rb

@@ -16,8 +16,8 @@ RSpec.feature 'Sign Out', type: :feature, js: true do
     visit spree.root_path
     show_user_menu
 
-    expect(page).to have_link 'LOG IN'
-    expect(page).not_to have_link 'LOG OUT'
+    expect(page).to have_link login_button.upcase
+    expect(page).not_to have_link logout_button.upcase
   end
 
   describe 'before_logout' do

data/spec/spec_helper.rb

@@ -9,10 +9,14 @@ require 'spree_dev_tools/rspec/spec_helper'
 # in spec/support/ and its subdirectories.
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].sort.each { |f| require f }
 
+require 'spree/testing_support/locale_helpers' if Spree.version.to_f >= 4.2
+
 RSpec.configure do |config|
   config.before(:each) do
     allow(RSpec::Rails::ViewRendering::EmptyTemplateHandler)
       .to receive(:call)
       .and_return(%("")) if Rails.gem_version >= Gem::Version.new('6.0.0.beta1')
   end
+
+  config.include Spree::TestingSupport::LocaleHelpers if defined?(Spree::TestingSupport::LocaleHelpers)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_auth_devise
 version: !ruby/object:Gem::Version
-  version: 4.3.3
+  version: 4.3.4
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -222,9 +222,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree_auth_devise/issues
-  changelog_uri: https://github.com/spree/spree_auth_devise/releases/tag/v4.3.3
+  changelog_uri: https://github.com/spree/spree_auth_devise/releases/tag/v4.3.4
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree_auth_devise/tree/v4.3.3
+  source_code_uri: https://github.com/spree/spree_auth_devise/tree/v4.3.4
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -241,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Provides authentication and authorization services for use with Spree by