solidus_auth_devise 2.0.0 → 2.5.0

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -1,5 +1,6 @@
-RSpec.describe Spree::CheckoutController, type: :controller do
+# frozen_string_literal: true
 
+RSpec.describe Spree::CheckoutController, type: :controller do
   let(:order) { create(:order_with_line_items, email: nil, user: nil, guest_token: token) }
   let(:user)  { build(:user, spree_api_key: 'fake') }
   let(:token) { 'some_token' }
@@ -39,11 +40,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
 
         context 'when guest checkout not allowed' do
           before do
-            Spree::Config.set(allow_guest_checkout: false)
-          end
-
-          after do
-            Spree::Config.set(allow_guest_checkout: true)
+            stub_spree_preferences(allow_guest_checkout: false)
           end
 
           it 'redirects to registration step' do
@@ -56,7 +53,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
 
     context 'when registration step disabled' do
       before do
-        Spree::Auth::Config.set(registration_step: false)
+        stub_spree_preferences(Spree::Auth::Config, registration_step: false)
       end
 
       context 'when authenticated as registered' do
@@ -80,8 +77,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
   context '#update' do
     context 'when in the confirm state' do
       before do
-        order.update_column(:email, 'spree@example.com')
-        order.update_column(:state, 'confirm')
+        order.update(email: 'spree@example.com', state: 'confirm')
 
         # So that the order can transition to complete successfully
         allow(order).to receive(:payment_required?) { false }
@@ -94,7 +90,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
           request.cookie_jar.signed[:guest_token] = 'ABC'
           post :update, params: { state: 'confirm' }
           expect(response).to redirect_to spree.token_order_path(order, 'ABC')
-          expect(flash.notice).to eq Spree.t(:order_processed_successfully)
+          expect(flash.notice).to eq I18n.t('spree.order_processed_successfully')
         end
       end
 

data/spec/controllers/spree/products_controller_spec.rb

@@ -1,5 +1,6 @@
-RSpec.describe Spree::ProductsController, type: :controller do
+# frozen_string_literal: true
 
+RSpec.describe Spree::ProductsController, type: :controller do
   let!(:product) { create(:product, available_on: 1.year.from_now) }
   let!(:user)    { build(:user, spree_api_key: 'fake') }
 
@@ -15,7 +16,9 @@ RSpec.describe Spree::ProductsController, type: :controller do
     allow(controller).to receive(:before_save_new_order)
     allow(controller).to receive(:spree_current_user) { user }
     allow(user).to receive(:has_spree_role?) { false }
-    get :show, params: { id: product.to_param }
-    expect(response.status).to eq(404)
+
+    expect {
+      get :show, params: { id: product.to_param }
+    }.to raise_error(ActiveRecord::RecordNotFound)
   end
 end

data/spec/controllers/spree/user_passwords_controller_spec.rb

@@ -1,5 +1,6 @@
-RSpec.describe Spree::UserPasswordsController, type: :controller do
+# frozen_string_literal: true
 
+RSpec.describe Spree::UserPasswordsController, type: :controller do
   let(:token) { 'some_token' }
 
   before { @request.env['devise.mapping'] = Devise.mappings[:spree_user] }
@@ -16,7 +17,7 @@ RSpec.describe Spree::UserPasswordsController, type: :controller do
       it 'flashes an error' do
         get :edit
         expect(flash[:alert]).to include(
-          "You can't access this page without coming from a password reset " +
+          "You can't access this page without coming from a password reset " \
           'email'
         )
       end
@@ -34,7 +35,7 @@ RSpec.describe Spree::UserPasswordsController, type: :controller do
     context 'when updating password with blank password' do
       it 'shows error flash message, sets spree_user with token and re-displays password edit form' do
         put :update, params: { spree_user: { password: '', password_confirmation: '', reset_password_token: token } }
-        expect(assigns(:spree_user).kind_of?(Spree::User)).to eq true
+        expect(assigns(:spree_user).is_a?(Spree::User)).to eq true
         expect(assigns(:spree_user).reset_password_token).to eq token
         expect(flash[:error]).to eq I18n.t(:cannot_be_blank, scope: [:devise, :user_passwords, :spree_user])
         expect(response).to render_template :edit

data/spec/controllers/spree/user_registrations_controller_spec.rb

@@ -1,5 +1,6 @@
-RSpec.describe Spree::UserRegistrationsController, type: :controller do
+# frozen_string_literal: true
 
+RSpec.describe Spree::UserRegistrationsController, type: :controller do
   before { @request.env['devise.mapping'] = Devise.mappings[:spree_user] }
 
   context '#create' do
@@ -56,7 +57,7 @@ RSpec.describe Spree::UserRegistrationsController, type: :controller do
         it 'assigns orders with the correct token and no user present' do
           order = create(:order, guest_token: 'ABC', user_id: nil, created_by_id: nil)
           subject
-          user = Spree::User.find_by_email('foobar@example.com')
+          user = Spree::User.find_by(email: 'foobar@example.com')
 
           order.reload
           expect(order.user_id).to eq user.id

data/spec/controllers/spree/user_sessions_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe Spree::UserSessionsController, type: :controller do
   let(:user) { create(:user) }
 
@@ -110,4 +112,16 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
       end
     end
   end
+
+  context "#destroy" do
+    subject do
+      delete(:destroy)
+    end
+
+    it "redirects to default after signing out" do
+      subject
+      expect(controller.spree_current_user).to be_nil
+      expect(response).to redirect_to spree.root_path
+    end
+  end
 end

data/spec/controllers/spree/users_controller_spec.rb

@@ -1,14 +1,12 @@
-RSpec.describe Spree::UsersController, type: :controller do
+# frozen_string_literal: true
 
+RSpec.describe Spree::UsersController, type: :controller do
   let(:admin_user) { create(:user) }
   let(:user) { create(:user) }
   let(:role) { create(:role) }
 
-  before { allow(controller).to receive(:spree_current_user) { user } }
-
   context '#load_object' do
     it 'redirects to signup path if user is not found' do
-      allow(controller).to receive(:spree_current_user) { nil }
       put :update, params: { user: { email: 'foobar@example.com' } }
       expect(response).to redirect_to spree.login_path
     end
@@ -22,11 +20,31 @@ RSpec.describe Spree::UsersController, type: :controller do
   end
 
   context '#update' do
+    before { sign_in(user) }
+
     context 'when updating own account' 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)
+      context 'when user updated successfuly' do
+        before { put :update, params: { user: { email: 'mynew@email-address.com' } } }
+
+        it 'saves user' do
+          expect(assigns[:user].email).to eq 'mynew@email-address.com'
+        end
+
+        it 'updates spree_current_user' do
+          expect(subject.spree_current_user.email).to eq 'mynew@email-address.com'
+        end
+
+        it 'redirects to account url' do
+          expect(response).to redirect_to spree.account_url(only_path: true)
+        end
+      end
+
+      context 'when user not valid' do
+        before { put :update, params: { user: { email: '' } } }
+
+        it 'does not affect spree_current_user' do
+          expect(subject.spree_current_user.email).to eq user.email
+        end
       end
     end
 

data/spec/factories/confirmed_user.rb

@@ -1,7 +1,9 @@
-FactoryGirl.define do
+# frozen_string_literal: true
+
+FactoryBot.define do
   factory :confirmed_user, parent: :user do
-    confirmed_at { Time.now }
-    confirmation_sent_at { Time.now }
-    confirmation_token "12345"
+    confirmed_at { Time.zone.now }
+    confirmation_sent_at { Time.zone.now }
+    confirmation_token { "12345" }
   end
-end
+end

data/spec/features/account_spec.rb

@@ -1,5 +1,6 @@
-RSpec.feature 'Accounts', type: :feature do
+# frozen_string_literal: true
 
+RSpec.feature 'Accounts', type: :feature do
   context 'editing' do
     scenario 'can edit an admin user' do
       user = create(:admin_user, email: 'admin@person.com', password: 'password', password_confirmation: 'password')
@@ -14,7 +15,7 @@ RSpec.feature 'Accounts', type: :feature do
     end
 
     scenario 'can edit a new user' do
-      Spree::Auth::Config.set(signout_after_password_change: false)
+      stub_spree_preferences(Spree::Auth::Config, signout_after_password_change: false)
       visit spree.signup_path
 
       fill_in 'Email', with: 'email@person.com'
@@ -35,7 +36,7 @@ RSpec.feature 'Accounts', type: :feature do
     end
 
     scenario 'can edit an existing user account' do
-      Spree::Auth::Config.set(signout_after_password_change: false)
+      stub_spree_preferences(Spree::Auth::Config ,signout_after_password_change: false)
       user = create(:user, email: 'email@person.com', password: 'secret', password_confirmation: 'secret')
       visit spree.login_path
 

data/spec/features/admin/password_reset_spec.rb

@@ -1,24 +1,80 @@
-RSpec.feature 'Admin - Reset Password', type: :feature do
+# frozen_string_literal: true
 
+RSpec.feature 'Admin - Reset Password', type: :feature do
   let!(:store) { create(:store) }
 
   background do
     ActionMailer::Base.default_url_options[:host] = 'http://example.com'
   end
 
-  scenario 'allows a user to supply an email for the password reset' do
-    user = create(:user, email: 'foobar@example.com', password: 'secret', password_confirmation: 'secret')
-    visit spree.admin_login_path
-    click_link 'Forgot Password?'
-    fill_in 'Email', with: 'foobar@example.com'
-    click_button 'Reset my password'
-    expect(page).to have_text 'You will receive an email with instructions'
+  context 'when an account with this email address exists' do
+    let!(:user) { create(:user, email: 'foobar@example.com', password: 'secret', password_confirmation: 'secret') }
+
+    scenario 'allows a user to supply an email for the password reset' do
+      visit spree.admin_login_path
+      click_link 'Forgot Password?'
+      fill_in_email
+      click_button 'Reset my password'
+      expect(page).to have_text 'you will receive an email with instructions'
+    end
   end
 
-  scenario 'shows errors if no email is supplied' do
+  # Revealing that an admin email address is not found allows an attacker to
+  # find admin account email addresses by trying email addresses until this
+  # error is not shown.
+  scenario 'does not reveal email addresses if they are not found' do
     visit spree.admin_login_path
     click_link 'Forgot Password?'
+    fill_in_email
     click_button 'Reset my password'
-    expect(page).to have_text "Email can't be blank"
+    expect(page).to_not have_text "Email not found"
+    expect(page).to have_text 'you will receive an email with instructions'
+  end
+
+  def fill_in_email
+    fill_in 'Email', with: 'foobar@example.com'
+  end
+
+  context 'password management' do
+    let!(:admin) do
+      create(:admin_user,
+        email: 'admin@example.com',
+        password: 'secret',
+        password_confirmation: 'secret'
+      )
+    end
+
+    let!(:user) do
+      create(:user,
+        email: 'user@example.com',
+        password: 'test123',
+        password_confirmation: 'test123'
+      )
+    end
+
+    before do
+      visit spree.admin_login_path
+      fill_in 'Email', with: admin.email
+      fill_in 'Password', with: admin.password
+      click_button 'Login'
+      visit spree.admin_users_path
+    end
+
+    context 'if currently logged-in admin' do
+      context "clicks on an user's page" do
+        it 'can reset its password' do
+          within("#spree_user_#{user.id}") do
+            click_link user.email
+          end
+
+          click_button 'Reset password'
+          expect(page).to have_content(
+            'If an account with that email address exists, '\
+            'you will receive an email with instructions about '\
+            'how to reset your password in a few minutes.'
+          )
+        end
+      end
+    end
   end
 end

data/spec/features/admin/products_spec.rb

@@ -1,5 +1,6 @@
-RSpec.feature 'Admin products', type: :feature do
+# frozen_string_literal: true
 
+RSpec.feature 'Admin products', type: :feature do
   context 'as anonymous user' do
     # Regression test for #1250
     scenario 'redirects to login page when attempting to access product listing' do

data/spec/features/admin/sign_in_spec.rb

@@ -1,5 +1,6 @@
-RSpec.feature 'Admin - Sign In', type: :feature do
+# frozen_string_literal: true
 
+RSpec.feature 'Admin - Sign In', type: :feature do
   background do
     @user = create(:user, email: 'email@person.com')
     visit spree.admin_login_path

data/spec/features/admin/sign_out_spec.rb

@@ -1,5 +1,6 @@
-RSpec.feature 'Admin - Sign Out', type: :feature do
+# frozen_string_literal: true
 
+RSpec.feature 'Admin - Sign Out', type: :feature, js: true do
   given!(:user) do
    create :user, email: 'email@person.com'
   end

data/spec/features/admin_permissions_spec.rb

@@ -1,5 +1,6 @@
-RSpec.feature 'Admin Permissions', type: :feature do
+# frozen_string_literal: true
 
+RSpec.feature 'Admin Permissions', type: :feature do
   context 'orders' do
     background do
       user = create(:admin_user, email: 'admin@person.com', password: 'password', password_confirmation: 'password')

data/spec/features/change_email_spec.rb

@@ -1,7 +1,8 @@
-RSpec.feature 'Change email', type: :feature do
+# frozen_string_literal: true
 
+RSpec.feature 'Change email', type: :feature do
   background do
-    Spree::Auth::Config.set(signout_after_password_change: false)
+    stub_spree_preferences(Spree::Auth::Config, signout_after_password_change: false)
 
     user = create(:user)
     visit spree.root_path

data/spec/features/checkout_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.feature 'Checkout', :js, type: :feature do
   given!(:store) { create(:store) }
   given!(:country) { create(:country, name: 'United States', states_required: true) }
@@ -15,17 +17,17 @@ RSpec.feature 'Checkout', :js, type: :feature do
 
   background do
     @product = create(:product, name: 'RoR Mug')
-    @product.master.stock_items.first.update_column(:count_on_hand, 1)
+    @product.master.stock_items.first.set_count_on_hand(1)
 
     # Bypass gateway error on checkout | ..or stub a gateway
-    Spree::Config[:allow_checkout_on_gateway_error] = true
+    stub_spree_preferences(allow_checkout_on_gateway_error: true)
 
     visit spree.root_path
   end
 
   # Regression test for https://github.com/solidusio/solidus/issues/1588
   scenario 'leaving and returning to address step' do
-    Spree::Auth::Config.set(registration_step: true)
+    stub_spree_preferences(Spree::Auth::Config, registration_step: true)
     click_link 'RoR Mug'
     click_button 'Add To Cart'
     within('h1') { expect(page).to have_text 'Shopping Cart' }
@@ -58,15 +60,9 @@ RSpec.feature 'Checkout', :js, type: :feature do
       expect(page).to have_text(/Billing Address/i)
       expect(page).to have_text(/Shipping Address/i)
 
-      str_addr = 'bill_address'
-      select 'United States', from: "order_#{str_addr}_attributes_country_id"
-      %w(firstname lastname address1 city zipcode phone).each do |field|
-        fill_in "order_#{str_addr}_attributes_#{field}", with: "#{address.send(field)}"
-      end
-      select "#{address.state.name}", from: "order_#{str_addr}_attributes_state_id"
-      check 'order_use_billing'
-
+      fill_addresses_fields_with(address)
       click_button 'Save and Continue'
+
       click_button 'Save and Continue'
       click_button 'Save and Continue'
       click_button 'Place Order'
@@ -90,15 +86,9 @@ RSpec.feature 'Checkout', :js, type: :feature do
 
       click_button 'Checkout'
 
-      str_addr = 'bill_address'
-      select 'United States', from: "order_#{str_addr}_attributes_country_id"
-      %w(firstname lastname address1 city zipcode phone).each do |field|
-        fill_in "order_#{str_addr}_attributes_#{field}", with: "#{address.send(field)}"
-      end
-      select "#{address.state.name}", from: "order_#{str_addr}_attributes_state_id"
-      check 'order_use_billing'
-
+      fill_addresses_fields_with(address)
       click_button 'Save and Continue'
+
       click_button 'Save and Continue'
       click_button 'Save and Continue'
       click_button 'Place Order'
@@ -109,7 +99,7 @@ RSpec.feature 'Checkout', :js, type: :feature do
 
     # Regression test for #890
     scenario 'associate an incomplete guest order with user after successful password reset' do
-      user = create(:user, email: 'email@person.com', password: 'password', password_confirmation: 'password')
+      create(:user, email: 'email@person.com', password: 'password', password_confirmation: 'password')
       click_link 'RoR Mug'
       click_button 'Add To Cart'
 
@@ -132,14 +122,7 @@ RSpec.feature 'Checkout', :js, type: :feature do
       click_link 'Cart'
       click_button 'Checkout'
 
-      str_addr = 'bill_address'
-      select 'United States', from: "order_#{str_addr}_attributes_country_id"
-      %w(firstname lastname address1 city zipcode phone).each do |field|
-        fill_in "order_#{str_addr}_attributes_#{field}", with: "#{address.send(field)}"
-      end
-      select "#{address.state.name}", from: "order_#{str_addr}_attributes_state_id"
-      check 'order_use_billing'
-
+      fill_addresses_fields_with(address)
       click_button 'Save and Continue'
 
       expect(page).not_to have_text 'Email is invalid'
@@ -161,21 +144,15 @@ RSpec.feature 'Checkout', :js, type: :feature do
 
       expect(page).to have_text 'You have signed up successfully.'
 
-      str_addr = 'bill_address'
-      select 'United States', from: "order_#{str_addr}_attributes_country_id"
-      %w(firstname lastname address1 city zipcode phone).each do |field|
-        fill_in "order_#{str_addr}_attributes_#{field}", with: "#{address.send(field)}"
-      end
-      select "#{address.state.name}", from: "order_#{str_addr}_attributes_state_id"
-      check 'order_use_billing'
-
+      fill_addresses_fields_with(address)
       click_button 'Save and Continue'
+
       click_button 'Save and Continue'
       click_button 'Save and Continue'
       click_button 'Place Order'
 
       expect(page).to have_text 'Your order has been processed successfully'
-      expect(Spree::Order.first.user).to eq Spree::User.find_by_email('email@person.com')
+      expect(Spree::Order.first.user).to eq Spree::User.find_by(email: 'email@person.com')
     end
   end
 end