spree_auth_devise 4.0.1 → 4.1.0.rc1

data/spec/controllers/spree/user_passwords_controller_spec.rb

@@ -6,14 +6,14 @@ RSpec.describe Spree::UserPasswordsController, type: :controller do
   describe 'GET edit' do
     context 'when the user token has not been specified' do
       it 'redirects to the new session path' do
-        spree_get :edit
+        get :edit
         expect(response).to redirect_to(
           'http://test.host/user/spree_user/sign_in'
         )
       end
 
       it 'flashes an error' do
-        spree_get :edit
+        get :edit
         expect(flash[:alert]).to include(
           "You can't access this page without coming from a password reset " \
           'email'
@@ -23,7 +23,7 @@ RSpec.describe Spree::UserPasswordsController, type: :controller do
 
     context 'when the user token has been specified' do
       it 'does something' do
-        spree_get :edit, reset_password_token: token
+        get :edit, params: { reset_password_token: token }
         expect(response.code).to eq('200')
       end
     end
@@ -32,7 +32,7 @@ RSpec.describe Spree::UserPasswordsController, type: :controller do
   context '#update' 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
-        spree_put :update, { spree_user: { password: '', password_confirmation: '', reset_password_token: token } }
+        put :update, params: { spree_user: { password: '', password_confirmation: '', reset_password_token: token } }
         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])

data/spec/controllers/spree/user_registrations_controller_spec.rb

@@ -2,11 +2,11 @@ RSpec.describe Spree::UserRegistrationsController, type: :controller do
   before { @request.env['devise.mapping'] = Devise.mappings[:spree_user] }
 
   context '#create' do
-    before { allow(controller).to receive(:after_sign_up_path_for).and_return(spree.root_path(thing: 7)) }
+    before { allow(controller).to receive(:after_sign_up_path_for).and_return(spree.account_path) }
 
-    it 'redirects to after_sign_up_path_for' do
-      spree_post :create, { spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' } }
-      expect(response).to redirect_to spree.root_path(thing: 7)
+    it 'redirects to account_path' do
+      post :create, params: { spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' } }
+      expect(response).to redirect_to spree.account_path
     end
 
     context 'with a guest token present' do
@@ -24,7 +24,7 @@ RSpec.describe Spree::UserRegistrationsController, type: :controller do
         else
           order = create(:order, guest_token: 'ABC', user_id: nil, created_by_id: nil)
         end
-        spree_post :create, spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }
+        post :create, params: { spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }}
         user = Spree::User.find_by_email('foobar@example.com')
 
         order.reload
@@ -38,7 +38,7 @@ RSpec.describe Spree::UserRegistrationsController, type: :controller do
         else
           order = create(:order, guest_token: 'ABC', user_id: 200)
         end
-        spree_post :create, spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }
+        post :create, params: { spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }}
 
         expect(order.reload.user_id).to eq 200
       end
@@ -49,7 +49,7 @@ RSpec.describe Spree::UserRegistrationsController, type: :controller do
         else
           order = create(:order, guest_token: 'DEF', user_id: nil, created_by_id: nil)
         end
-        spree_post :create, spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }
+        post :create, params: { spree_user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' }}
 
         expect(order.reload.user_id).to be_nil
       end

data/spec/controllers/spree/user_sessions_controller_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
 
           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)
-            spree_post :create, 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 +23,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
 
           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)
-            spree_post :create, 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 +34,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
             order = create(:order, email: user.email, token: 'ABC',
                            user_id: nil, created_by_id: nil,
                            completed_at: 1.minute.ago)
-            spree_post :create, 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 +43,14 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
 
           it 'does not assign orders with an existing user' do
             order = create(:order, token: 'ABC', user_id: 200)
-            spree_post :create, 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)
-            spree_post :create, 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 +72,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
           else
             order = create(:order, email: user.email, guest_token: 'ABC', user_id: nil, created_by_id: nil)
           end
-          spree_post :create, 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 +85,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
           else
             order = create(:order, guest_token: 'ABC', user_id: nil, created_by_id: nil)
           end
-          spree_post :create, 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
@@ -102,7 +102,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
                            user_id: nil, created_by_id: nil,
                            completed_at: 1.minute.ago)
           end
-          spree_post :create, 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
@@ -115,7 +115,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
           else
               order = create(:order, guest_token: 'ABC', user_id: 200)
           end
-          spree_post :create, 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
@@ -126,7 +126,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
           else
               order = create(:order, guest_token: 'DEF', user_id: nil, created_by_id: nil)
           end
-          spree_post :create, 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,7 +144,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
           else
             order = create(:order, email: user.email, guest_token: 'ABC', user_id: nil, created_by_id: nil)
           end
-          spree_post :create, 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
@@ -153,15 +153,15 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
       end
 
       context "and html format is used" do
-        it "redirects to default after signing in" do
-          spree_post :create, spree_user: { email: user.email, password: 'secret' }
-          expect(response).to redirect_to spree.root_path
+        it "redirects to account path after signing in" do
+          post :create, params: { spree_user: { email: user.email, password: 'secret' }}
+          expect(response).to redirect_to spree.account_path
         end
       end
 
       context "and js format is used" do
         it "returns a json with ship and bill address" do
-          spree_post :create, spree_user: { email: user.email, password: 'secret' }, format: 'js'
+          post :create, params: { spree_user: { email: user.email, password: 'secret' }, format: 'js' }
           parsed = ActiveSupport::JSON.decode(response.body)
           expect(parsed).to have_key("user")
           expect(parsed).to have_key("ship_address")
@@ -173,7 +173,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
     context "using incorrect login information" do
       context "and html format is used" do
         it "renders new template again with errors" do
-          spree_post :create, 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
@@ -181,7 +181,7 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
 
       context "and js format is used" do
         it "returns a json with the error" do
-          spree_post :create, spree_user: { email: user.email, password: 'wrong' }, format: 'js'
+          post :create, params: { spree_user: { email: user.email, password: 'wrong' }, format: 'js' }
           parsed = ActiveSupport::JSON.decode(response.body)
           expect(parsed).to have_key("error")
         end

data/spec/controllers/spree/users_controller_spec.rb

@@ -8,14 +8,14 @@ RSpec.describe Spree::UsersController, type: :controller do
   context '#load_object' do
     it 'redirects to signup path if user is not found' do
       allow(controller).to receive(:spree_current_user) { nil }
-      spree_put :update, { user: { email: 'foobar@example.com' } }
+      put :update, params: { user: { email: 'foobar@example.com' } }
       expect(response).to redirect_to spree.login_path
     end
   end
 
   context '#create' do
     it 'creates a new user' do
-      spree_post :create, { user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' } }
+      post :create, params: { user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' } }
       expect(assigns[:user].new_record?).to be false
     end
   end
@@ -23,14 +23,14 @@ RSpec.describe Spree::UsersController, type: :controller do
   context '#update' do
     context 'when updating own account' do
       it 'performs update' do
-        spree_put :update, { user: { email: 'mynew@email-address.com' } }
+        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)
       end
     end
 
     it 'does not update roles' do
-      spree_put :update, user: { spree_role_ids: [role.id] }
+      put :update, params: { user: { spree_role_ids: [role.id] }}
       expect(assigns[:user].spree_roles).to_not include role
     end
   end

data/spec/features/account_spec.rb

@@ -10,9 +10,9 @@ RSpec.feature 'Accounts', type: :feature do
 
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
-      click_button 'Login'
+      click_button 'Log in'
 
-      click_link 'My Account'
+      show_user_account
       expect(page).to have_text 'admin@person.com'
     end
 
@@ -22,11 +22,12 @@ RSpec.feature 'Accounts', type: :feature do
       fill_in 'Email', with: 'email@person.com'
       fill_in 'Password', with: 'password'
       fill_in 'Password Confirmation', with: 'password'
-      click_button 'Create'
+      click_button 'Sign Up'
 
-      click_link 'My Account'
+      show_user_account
       expect(page).to have_text 'email@person.com'
-      click_link 'Edit'
+
+      find('a.account-page-user-info-item-title-edit').click
 
       fill_in 'Password', with: 'foobar'
       fill_in 'Password Confirmation', with: 'foobar'
@@ -42,11 +43,12 @@ RSpec.feature 'Accounts', type: :feature do
 
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
-      click_button 'Login'
+      click_button 'Log in'
 
-      click_link 'My Account'
+      show_user_account
       expect(page).to have_text 'email@person.com'
-      click_link 'Edit'
+
+      find('a.account-page-user-info-item-title-edit').click
 
       fill_in 'Password', with: 'foobar'
       fill_in 'Password Confirmation', with: 'foobar'

data/spec/features/admin/password_reset_spec.rb

@@ -1,6 +1,4 @@
 RSpec.feature 'Admin - Reset Password', type: :feature do
-  let!(:store) { create(:store) }
-
   background do
     ActionMailer::Base.default_url_options[:host] = 'http://example.com'
   end
@@ -8,7 +6,7 @@ RSpec.feature 'Admin - Reset Password', type: :feature do
   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?'
+    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'
@@ -16,7 +14,7 @@ RSpec.feature 'Admin - Reset Password', type: :feature do
 
   scenario 'shows errors if no email is supplied' do
     visit spree.admin_login_path
-    click_link 'Forgot Password?'
+    click_link 'Forgot password?'
     click_button 'Reset my password'
     expect(page).to have_text "Email can't be blank"
   end

data/spec/features/admin/sign_in_spec.rb

@@ -10,14 +10,12 @@ RSpec.feature 'Admin - Sign In', type: :feature do
   end
 
   scenario 'lets a user sign in successfully', js: true do
-    fill_in 'Email', with: @user.email
-    fill_in 'Password', with: 'secret'
-    click_button 'Login'
+    log_in(email: @user.email, password: 'secret')
+    show_user_menu
 
-    expect(page).to have_text 'Logged in successfully'
     expect(page).not_to have_text 'Login'
-    expect(page).to have_text 'Logout'
-    expect(current_path).to eq '/'
+    expect(page).to have_text 'LOG OUT'
+    expect(current_path).to eq '/account'
   end
 
   scenario 'shows validation errors' do
@@ -35,7 +33,7 @@ RSpec.feature 'Admin - Sign In', type: :feature do
 
     fill_in 'Email', with: user.email
     fill_in 'Password', with: 'secret'
-    click_button 'Login'
+    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

@@ -13,7 +13,7 @@ RSpec.feature 'Admin - Sign Out', type: :feature do
   end
 
   scenario 'allows a signed in user to logout', js: true do
-    click_link 'Logout'
+    log_out
     visit spree.admin_login_path
     expect(page).to have_button 'Login'
     expect(page).not_to have_text 'Logout'

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 'Login'
+      click_button 'Log in'
     end
 
     context 'admin is restricted from accessing orders' do

data/spec/features/change_email_spec.rb

@@ -3,13 +3,7 @@ RSpec.feature 'Change email', type: :feature do
     allow_bypass_sign_in
 
     user = create(:user, email: 'old@spree.com', password: 'secret')
-    visit spree.root_path
-    click_link 'Login'
-
-    fill_in 'spree_user[email]', with: user.email
-    fill_in 'spree_user[password]', with: 'secret'
-    click_button 'Login'
-
+    log_in(email: user.email, password: 'secret')
     visit spree.edit_account_path
   end
 

data/spec/features/checkout_spec.rb

@@ -1,5 +1,4 @@
 RSpec.feature 'Checkout', :js, type: :feature do
-  given!(:store) { create(:store) }
   given!(:country) { create(:country, name: 'United States', states_required: true) }
   given!(:state)   { create(:state, name: 'Maryland', country: country) }
   given!(:shipping_method) do
@@ -9,12 +8,13 @@ RSpec.feature 'Checkout', :js, type: :feature do
     shipping_method.tap(&:save)
   end
 
+  given!(:user) { create(:user, email: 'email@person.com', password: 'password', password_confirmation: 'password') }
   given!(:zone)    { create(:zone) }
   given!(:address) { create(:address, state: state, country: country) }
+  given!(:mug) { create(:product, name: 'RoR Mug') }
 
   background do
-    @product = create(:product, name: 'RoR Mug')
-    @product.master.stock_items.first.update_column(:count_on_hand, 1)
+    mug.master.stock_items.first.update_column(:count_on_hand, 1)
 
     # Bypass gateway error on checkout | ..or stub a gateway
     Spree::Config[:allow_checkout_on_gateway_error] = true
@@ -31,71 +31,56 @@ RSpec.feature 'Checkout', :js, type: :feature do
 
     scenario 'allow a visitor to checkout as guest, without registration' do
       Spree::Auth::Config.set(registration_step: true)
-      add_to_cart 'RoR Mug'
-      click_button 'Checkout'
+      add_to_cart(mug)
+      click_link 'checkout'
 
-      expect(page).to have_content(/Checkout as a Guest/i)
+      expect(page).to have_selector(:button, 'Continue as a guest')
 
-      within('#guest_checkout') { fill_in 'Email', with: 'spree@test.com' }
+      within('#checkout_form_registration') { fill_in 'Email', with: 'spree@test.com' }
       click_button 'Continue'
 
       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).to_s
-      end
-      select address.state.name.to_s, from: "order_#{str_addr}_attributes_state_id"
-      check 'order_use_billing'
-
+      fill_in_address
       click_button 'Save and Continue'
       click_button 'Save and Continue'
 
-      expect(page).to have_text 'Your order has been processed successfully'
+      expect(page).to have_text 'Order placed successfully'
     end
 
     scenario 'associate an uncompleted guest order with user after logging in' do
-      user = create(:user, email: 'email@person.com', password: 'password', password_confirmation: 'password')
-      add_to_cart 'RoR Mug'
+      add_to_cart(mug)
 
       visit spree.login_path
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
-      click_button 'Login'
-      expect(page).to have_text('Cart')
-      click_link 'Cart'
+      click_button 'Log in'
+      expect(page).to have_text('Logged in successfully')
+      find('a.cart-icon').click
 
       expect(page).to have_text 'RoR Mug'
-      within('h1') { expect(page).to have_text 'Shopping Cart' }
-
-      click_button 'Checkout'
+      within('h1') { expect(page).to have_text 'YOUR SHOPPING BAG' }
 
-      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).to_s
-      end
-      select address.state.name.to_s, from: "order_#{str_addr}_attributes_state_id"
-      check 'order_use_billing'
+      click_link 'checkout'
 
+      fill_in_address
       click_button 'Save and Continue'
       click_button 'Save and Continue'
 
-      expect(page).to have_text 'Your order has been processed successfully'
+      expect(page).to have_text 'Order placed successfully'
       expect(Spree::Order.first.user).to eq user
     end
 
     # Regression test for #890
     scenario 'associate an incomplete guest order with user after successful password reset' do
-      create(:store)
-      user = create(:user, email: 'email@person.com', password: 'password', password_confirmation: 'password')
-      add_to_cart 'RoR Mug'
+      add_to_cart(mug)
 
       visit spree.login_path
-      click_link 'Forgot Password?'
-      fill_in 'spree_user_email', with: 'email@person.com'
+      click_link 'Forgot password?'
+      fill_in('Email', with: 'email@person.com')
+      find('#spree_user_email').set('email@person.com')
+
       click_button 'Reset my password'
 
       # Need to do this now because the token stored in the DB is the encrypted version
@@ -109,49 +94,39 @@ RSpec.feature 'Checkout', :js, type: :feature do
       fill_in 'Password Confirmation', with: 'password'
       click_button 'Update'
 
-      expect(page).to have_text('Cart')
-      click_link 'Cart'
+      expect(page).to have_text('Your password was changed successfully')
+      find('a.cart-icon').click
       expect(page).to have_text('RoR Mug')
-      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).to_s
-      end
-      select address.state.name.to_s, from: "order_#{str_addr}_attributes_state_id"
-      check 'order_use_billing'
+      click_link 'checkout'
 
+      fill_in_address
       click_button 'Save and Continue'
 
       expect(page).not_to have_text 'Email is invalid'
     end
 
     scenario 'allow a user to register during checkout' do
-      add_to_cart 'RoR Mug'
-      click_button 'Checkout'
+      add_to_cart(mug)
+      click_link 'checkout'
 
-      expect(page).to have_text 'Registration'
+      expect(page).to have_selector(:link, 'Sign Up')
 
-      fill_in 'Email', with: 'email@person.com', match: :first
+      click_link 'Sign Up'
+
+      fill_in 'Email', with: 'test@person.com'
       fill_in 'Password', with: 'spree123'
       fill_in 'Password Confirmation', with: 'spree123'
-      click_button 'Create'
-      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).to_s
-      end
-      select address.state.name.to_s, from: "order_#{str_addr}_attributes_state_id"
-      check 'order_use_billing'
+      click_button 'Sign Up'
+
+      expect(page).to have_text 'You have signed up successfully.'
 
+      fill_in_address
       click_button 'Save and Continue'
       click_button 'Save and Continue'
 
-      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(page).to have_text 'Order placed successfully'
+      expect(Spree::Order.first.user).to eq Spree::User.find_by_email('test@person.com')
     end
   end
 end

data/spec/features/confirmation_spec.rb

@@ -8,8 +8,6 @@ RSpec.feature 'Confirmation', type: :feature, reload_user: true do
 
   after(:each) { set_confirmable_option(false) }
 
-  let!(:store) { create(:store) }
-
   background do
     ActionMailer::Base.default_url_options[:host] = 'http://example.com'
   end
@@ -20,7 +18,7 @@ RSpec.feature 'Confirmation', type: :feature, reload_user: true do
     fill_in 'Email', with: 'email@person.com'
     fill_in 'Password', with: 'password'
     fill_in 'Password Confirmation', with: 'password'
-    click_button 'Create'
+    click_button 'Sign Up'
 
     expect(page).to have_text 'You have signed up successfully.'
     expect(Spree::User.last.confirmed?).to be(false)

data/spec/features/order_spec.rb

@@ -6,46 +6,40 @@ RSpec.feature 'Orders', :js, type: :feature do
 
   # regression test for spree/spree#1687
   scenario 'merge incomplete orders from different sessions' do
-    skip %{
-      TODO: has been broken for ~2 months as of:
-      https://github.com/spree/spree_auth_devise/commit/3157b47b22c559817d34ec34024587d8aa6136dc
-      I dont think we can decode these sessions anymore since Rails 4 switched to encrypted cookies I believe devise stores session encrypted.
-    }
-    create(:product, name: 'RoR Mug')
-    create(:product, name: 'RoR Shirt')
+    ror_mug = create(:product, name: 'RoR Mug')
+    ror_shirt = create(:product, name: 'RoR Shirt')
 
     user = create(:user, email: 'email@person.com', password: 'password', password_confirmation: 'password')
 
     using_session('first') do
-      add_to_cart 'RoR Mug'
+      add_to_cart ror_mug
 
       visit spree.login_path
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
-      click_button 'Login'
+      click_button 'Log in'
 
-      click_link 'Cart'
+      visit spree.cart_path
       expect(page).to have_text 'RoR Mug'
     end
 
     using_session('second') do
-      add_to_cart 'RoR Shirt'
+      add_to_cart ror_shirt
 
       visit spree.login_path
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
-      click_button 'Login'
+      click_button 'Log in'
 
       # Order should have been merged with first session
-      click_link 'Cart'
+      visit spree.cart_path
       expect(page).to have_text 'RoR Mug'
       expect(page).to have_text 'RoR Shirt'
     end
 
     using_session('first') do
       visit spree.root_path
-
-      click_link 'Cart'
+      visit spree.cart_path
 
       # Order should have been merged with second session
       expect(page).to have_text 'RoR Mug'