spree_auth_devise 4.0.0.rc2 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bd194ed9eb91f84ac2e23e55550e5ad19620c53bdd9d1be39bb0cc21ba2412d
-  data.tar.gz: e5cbde0bc175fad0cea460e53eaa1ac6216412044d9557c7a964f4f00186c147
+  metadata.gz: 46ff8af21fa16c063b0f61f5993e37f93072587b1e663e58089b2ea0a028b51b
+  data.tar.gz: 6d7fa7607dd17ff3b6c5231bd8295c5fef51ea7620e1e459d199b39b42649858
 SHA512:
-  metadata.gz: da728a02b621de5f0d2f46d09b09e7e3886c62eb4856ed08a991fa6b8117cb6d57432f6f9cdb5348f9e105cfcc60ffe61b0795e840c1d716ed0e72af6dd38224
-  data.tar.gz: 1c43394077a9847aed202a49a103830fbd0da359be5c4c120d19e57f395e8d018aa63a7b55186681b468458949715e9d1853545a8e90d0fed286a85e8414734e
+  metadata.gz: 1eefe313a0b7cd621e9192d483624541790292872576927da6089350aaa14352faa00e0b2dd8f36d2920b9faf4776cc5287df6c5308d2bce9111ec95228f26a1
+  data.tar.gz: 3e941ccde2788291ec91709149786c03dab905cf142811186a43949c3ce6549b89306e8ceb7692070dbb1a7a92ef306ae0adc808d62bb18d1ad27404afbc24f0

data/.circleci/config.yml

@@ -0,0 +1,41 @@
+version: 2
+
+jobs:
+  update_staging_repository:
+    docker:
+      - image: circleci/ruby:2.6.3
+    steps:
+      - add_ssh_keys:
+          fingerprints:
+            - 54:50:5e:4e:80:6d:2e:26:43:c6:99:bd:39:b2:71:dc
+      - run: mkdir -p ~/.ssh
+      - run: ssh-keyscan -H github.com >> ~/.ssh/known_hosts
+      - run: ssh-add -D
+      - run: ssh-add ~/.ssh/id_rsa_54505e4e806d2e2643c699bd39b271dc
+      - run: git clone -b master git@github.com:spark-solutions/spree-designs.git
+      - run: gem install bundler -v 1.17.3
+      - run:
+          command: bundle update spree_auth_devise
+          working_directory: ~/project/spree-designs
+      - run:
+          command: |
+            git config user.name 'AutoDeploy'
+            git config user.email 'autodeploy@sparksolutions.co'
+          working_directory: ~/project/spree-designs
+      - run:
+          command: |
+            git add -A
+            git commit -m "Auto-commit v#${CIRCLE_BUILD_NUM}"
+          working_directory: ~/project/spree-designs
+      - run:
+          command: git push origin master
+          working_directory: ~/project/spree-designs
+
+workflows:
+  version: 2
+  update_staging_repository:
+    jobs:
+      - update_staging_repository:
+          filters:
+            branches:
+              only: master

data/.gitignore

@@ -20,3 +20,4 @@ public/spree
 .ruby-gemset
 gemfiles/*.gemfile.lock
 *.gem
+.bundle

data/.travis.yml

@@ -17,36 +17,18 @@ language: ruby
 
 rvm:
   - 2.5.1
-  - 2.4.4
-  - 2.3.7
+  # - 2.6.5
 
 gemfile:
-  - gemfiles/spree_3_2.gemfile
-  - gemfiles/spree_3_5.gemfile
-  - gemfiles/spree_3_7.gemfile
-  - gemfiles/spree_4_0.gemfile
+  - gemfiles/spree_4_1.gemfile
   - gemfiles/spree_master.gemfile
 
 matrix:
     allow_failures:
       - gemfile: gemfiles/spree_master.gemfile
-    exclude:
-      - rvm: 2.3.7
-        gemfile: gemfiles/spree_4_0.gemfile
-      - rvm: 2.4.4
-        gemfile: gemfiles/spree_4_0.gemfile
-      - rvm: 2.3.7
-        gemfile: gemfiles/spree_master.gemfile
-      - rvm: 2.4.4
-        gemfile: gemfiles/spree_master.gemfile
-      - rvm: 2.5.1
-        gemfile: gemfiles/spree_3_2.gemfile
-      - rvm: 2.5.1
-        gemfile: gemfiles/spree_3_2.gemfile
-      - rvm: 2.5.1
-        gemfile: gemfiles/spree_3_5.gemfile
 
 before_install:
+  - gem update bundler
   - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"
   - wget -N https://chromedriver.storage.googleapis.com/2.35/chromedriver_linux64.zip -P ~/
   - unzip ~/chromedriver_linux64.zip -d ~/

data/Appraisals

@@ -1,25 +1,9 @@
-appraise 'spree-3-2' do
-  gem 'spree', '~> 3.2.0'
-  gem 'rails-controller-testing'
-end
-
-appraise 'spree-3-5' do
-  gem 'spree', '~> 3.5.0'
-  gem 'rails-controller-testing'
-end
-
-appraise 'spree-3-7' do
-  gem 'sass-rails'
-  gem 'spree', '~> 3.7.0.rc3'
-  gem 'rails-controller-testing'
-end
-
-appraise 'spree-4-0' do
-  gem 'spree', github: 'spree/spree', tag: 'v4.0.0.beta'
+appraise 'spree-4-1' do
   gem 'rails-controller-testing'
+  gem 'spree', github: 'spree/spree', branch: 'master'
 end
 
 appraise 'spree-master' do
-  gem 'spree', github: 'spree/spree', branch: 'master'
   gem 'rails-controller-testing'
+  gem 'spree', github: 'spree/spree', branch: 'master'
 end

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem "rails-controller-testing"
-gem 'spree', github: 'spree/spree', branch: 'master'
+gem 'rails-controller-testing'
+gem 'spree', '~> 4.1.0'
 
 gemspec

data/README.md

@@ -10,20 +10,11 @@ Provides authentication services for [Spree](https://spreecommerce.org), using t
 
 1. Add this extension to your Gemfile with this line:
 
-  #### Spree >= 3.1
-
-  ```ruby
-  gem 'spree_auth_devise', '~> 3.3'
-  ```
-
-  #### Spree 3.0 and Spree 2.x
-
   ```ruby
-  gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: 'X-X-stable'
+  gem 'spree_auth_devise'
   ```
-
-  The `branch` option is important: it must match the version of Spree you're using.
-  For example, use `3-0-stable` if you're using Spree `3-0-stable` or any `3.0.x` version.
+  
+  if you run into any version-mismatch problems please run `bundle update`
 
 2. Install the gem using Bundler:
   ```ruby

data/app/controllers/spree/user_confirmations_controller.rb

@@ -6,6 +6,30 @@ class Spree::UserConfirmationsController < Devise::ConfirmationsController
   include Spree::Core::ControllerHelpers::Order
   include Spree::Core::ControllerHelpers::Store
 
+  before_action :set_current_order
+
+  # GET /resource/confirmation?confirmation_token=abcdef
+  def show
+    self.resource = resource_class.confirm_by_token(params[:confirmation_token])
+    yield resource if block_given?
+
+    if resource.errors.empty?
+      set_flash_message!(:notice, :confirmed)
+      respond_with_navigational(resource) do
+        redirect_to after_confirmation_path_for(resource_name, resource)
+      end
+    elsif resource.confirmed?
+      set_flash_message(:error, :already_confirmed)
+      respond_with_navigational(resource) do
+        redirect_to after_confirmation_path_for(resource_name, resource)
+      end
+    else
+      respond_with_navigational(resource.errors, status: :unprocessable_entity) do
+        render :new
+      end
+    end
+  end
+
   protected
 
   def after_confirmation_path_for(resource_name, resource)

data/app/controllers/spree/user_passwords_controller.rb

@@ -10,6 +10,8 @@ class Spree::UserPasswordsController < Devise::PasswordsController
     include SpreeI18n::ControllerLocaleHelper
   end
 
+  before_action :set_current_order
+
   # Overridden due to bug in Devise.
   #   respond_with resource, :location => new_session_path(resource_name)
   # is generating bad url /session/new.user

data/app/controllers/spree/user_registrations_controller.rb

@@ -11,6 +11,7 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
   end
 
   before_action :check_permissions, only: [:edit, :update]
+  before_action :set_current_order
   skip_before_action :require_no_authentication
 
   # GET /resource/sign_up
@@ -29,7 +30,7 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
         set_flash_message :notice, :signed_up
         sign_up(resource_name, resource)
         session[:spree_user_signup] = true
-        respond_with resource, location: after_sign_up_path_for(resource)
+        redirect_to_checkout_or_account_path(resource)
       else
         set_flash_message :notice, :"signed_up_but_#{resource.inactive_message}"
         expire_data_after_sign_in!
@@ -75,9 +76,34 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
     'devise.user_registrations'
   end
 
+  def after_sign_up_path_for(resource)
+    after_sign_in_redirect(resource) if is_navigational_format?
+  end
+
+  def after_inactive_sign_up_path_for(resource)
+    scope = Devise::Mapping.find_scope!(resource)
+    router_name = Devise.mappings[scope].router_name
+    context = router_name ? send(router_name) : self
+    context.respond_to?(:login_path) ? context.login_path : "/login"
+  end
+
   private
 
   def spree_user_params
     params.require(:spree_user).permit(Spree::PermittedAttributes.user_attributes)
   end
+
+  def after_sign_in_redirect(resource_or_scope)
+    stored_location_for(resource_or_scope) || account_path
+  end
+
+  def redirect_to_checkout_or_account_path(resource)
+    resource_path = after_sign_up_path_for(resource)
+
+    if resource_path == spree.checkout_state_path(:address)
+      respond_with resource, location: spree.checkout_state_path(:address)
+    else
+      respond_with resource, location: spree.account_path
+    end
+  end
 end

data/app/controllers/spree/user_sessions_controller.rb

@@ -10,6 +10,8 @@ class Spree::UserSessionsController < Devise::SessionsController
     include SpreeI18n::ControllerLocaleHelper
   end
 
+  before_action :set_current_order
+
   def create
     authenticate_spree_user!
 
@@ -17,7 +19,7 @@ class Spree::UserSessionsController < Devise::SessionsController
       respond_to do |format|
         format.html {
           flash[:success] = Spree.t(:logged_in_succesfully)
-          redirect_back_or_default(after_sign_in_path_for(spree_current_user))
+          redirect_back_or_default(after_sign_in_redirect(spree_current_user))
         }
         format.js {
           render json: { user: spree_current_user,
@@ -54,4 +56,24 @@ class Spree::UserSessionsController < Devise::SessionsController
     redirect_to(session["spree_user_return_to"] || default)
     session["spree_user_return_to"] = nil
   end
+
+  def after_sign_in_redirect(resource_or_scope)
+    stored_location_for(resource_or_scope) || account_path
+  end
+
+  def respond_to_on_destroy
+    # We actually need to hardcode this as Rails default responder doesn't
+    # support returning empty response on GET request
+    respond_to do |format|
+      format.all { head :no_content }
+      format.any(*navigational_formats) { redirect_to after_sign_out_redirect(resource_name) }
+    end
+  end
+
+  def after_sign_out_redirect(resource_or_scope)
+    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 : "/"
+  end
 end

data/app/views/spree/user_passwords/edit.html.erb

@@ -1,22 +1,25 @@
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @spree_user } %>
-<div class="col-lg-6 offset-lg-3">
-  <div class="card mb-3">
-    <div class="card-header">
-      <h3 class="card-title mb-0 h6"><%= Spree.t(:change_your_password) %></h3>
-    </div>
-    <div class="card-body">
-      <%= form_for @spree_user, :as => :spree_user, :url => spree.update_password_path, :method => :put do |f| %>
-        <div class="form-group">
-          <%= f.label :password, Spree.t(:password) %>
-          <%= f.password_field :password, :class => "form-control" %>
-        </div>
-        <div class="form-group">
-          <%= f.label :password_confirmation, Spree.t(:confirm_password) %>
-          <%= f.password_field :password_confirmation, :class => "form-control" %>
+
+<div class="container user-passwords">
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <div class="card mb-3 user-passwords-no-border">
+        <h3 class="spree-mb-large spree-mt-large spree-header"><%= Spree.t(:change_your_password) %></h3>
+        <div class="card-body">
+          <%= form_for @spree_user, as: :spree_user, url: spree.update_password_path, method: :put do |f| %>
+            <div class="form-group">
+              <%= f.label :password, Spree.t(:password), class: 'spree-flat-label' %>
+              <%= f.password_field :password, class: "spree-flat-input" %>
+            </div>
+            <div class="form-group">
+              <%= f.label :password_confirmation, Spree.t(:confirm_password), class: 'spree-flat-label' %>
+              <%= f.password_field :password_confirmation, class: "spree-flat-input" %>
+            </div>
+            <%= f.hidden_field :reset_password_token %>
+            <%= f.submit Spree.t(:update), class: 'btn btn-primary btn-block spree-btn mt-2' %>
+          <% end %>
         </div>
-        <%= f.hidden_field :reset_password_token %>
-        <%= f.submit Spree.t(:update), :class => 'btn btn-lg btn-success btn-block' %>
-      <% end %>
+      </div>
     </div>
   </div>
 </div>

data/app/views/spree/user_passwords/new.html.erb

@@ -1,21 +1,23 @@
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @spree_user } %>
-<div class="col-lg-6 offset-lg-3" id="forgot-password">
-  <div class="card mb-3">
-    <div class="card-header">
-      <h3 class="card-title mb-0 h6"><%= Spree.t(:forgot_password) %></h3>
-    </div>
-    <div class="card-body">
-      <p><%= Spree.t(:instructions_to_reset_password) %></p>
 
-      <%= form_for Spree::User.new, :as => :spree_user, :url => spree.reset_password_path do |f| %>
-        <div class="form-group">
-          <%= f.label :email, Spree.t(:email) %>
-          <%= f.email_field :email, :class => "form-control" %>
-        </div>
-        <div>
-          <%= f.submit Spree.t(:reset_password), :class => 'btn btn-lg btn-success btn-block' %>
+<div class="container user-passwords">
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3" id="forgot-password">
+      <div class="card mb-3 user-passwords-no-border">
+        <h3 class="spree-mb-large spree-mt-large spree-header"><%= Spree.t(:forgot_password) %></h3>
+        <div class="card-body">
+          <p><%= Spree.t(:instructions_to_reset_password) %></p>
+
+          <%= form_for Spree.user_class.new, as: :spree_user, url: spree.reset_password_path do |f| %>
+            <div class="form-group">
+              <%= f.email_field :email, class: "spree-flat-input", placeholder: Spree.t(:email) %>
+            </div>
+            <div>
+              <%= f.submit Spree.t(:reset_password), class: 'btn btn-primary btn-block spree-btn mt-2' %>
+            </div>
+          <% end %>
         </div>
-      <% end %>
+      </div>
     </div>
   </div>
 </div>

data/app/views/spree/user_registrations/new.html.erb

@@ -1,22 +1,17 @@
 <% @body_id = 'signup' %>
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @user } %>
 <div class="col-lg-6 offset-lg-3">
-  <div class="card mb-3">
-      <div class="card-header">
-        <h3 class="card-title mb-0 h6"><%= Spree.t(:new_customer) %></h3>
-      </div>
-      <div id="new-customer" class="card-body" data-hook="login">
-          <%= form_for resource, :as => :spree_user, :url => spree.registration_path do |f| %>
-            <div data-hook="signup_inside_form">
-              <%= render :partial => 'spree/shared/user_form', :locals => { :f => f } %>
-              <div><%= f.submit Spree.t(:create), :class => 'btn btn-lg btn-success btn-block' %></div>
-            </div>
-          <% end %>
-          <div class="text-center">
-            <%= Spree.t(:or) %>
-              <%= link_to Spree.t(:login_as_existing), spree.login_path %>
-          </div>
-          <div data-hook="login_extras"></div>
+  <h3 class="spree-header spree-mb-large spree-mt-large"><%= Spree.t(:new_customer) %></h3>
+  <div id="new-customer" data-hook="login">
+    <%= form_for resource, as: :spree_user, url: spree.registration_path do |f| %>
+      <div data-hook="signup_inside_form">
+        <%= render partial: 'spree/shared/user_form', locals: { f: f, remember_me_field: true } %>
+        <div><%= f.submit Spree.t(:sign_up), class: 'btn btn-primary btn-block spree-btn mb-5' %></div>
       </div>
+    <% end %>
+
+    <h3 class="spree-header header-sm spree-mt-medium mb-3 mb-sm-4 mb-xl-4"><%= Spree.t('already_have_account') %></h3>
+    <%= link_to Spree.t(:log_in), spree.login_path, class: 'btn btn-block btn-outline-primary spree-btn spree-mb-large' %>
+    <div data-hook="login_extras"></div>
   </div>
 </div>

data/app/views/spree/user_sessions/new.html.erb

@@ -1,17 +1,16 @@
 <% @body_id = 'login' %>
-<div class="col-lg-6 <%= request.path == spree.login_path ? "offset-lg-3" : "" %>">
-  <div class="card mb-3">
-      <div class="card-header">
-        <h3 class="card-title mb-0 h6"><%= Spree.t(:login_as_existing) %></h3>
-      </div>
-      <div id="existing-customer" class="card-body" data-hook="login">
-          <%= render :partial => 'spree/shared/login' %>
-          <div class="text-center">
-            <%= Spree.t(:or) %>
-                <%= link_to Spree.t(:create_a_new_account), spree.signup_path %> |
-                <%= link_to Spree.t(:forgot_password), spree.recover_password_path %>
-          </div>
+<div class="container user-sessions user-sessions-new">
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <div class="mb-3">
+        <div id="existing-customer" data-hook="login">
+          <%= render partial: 'spree/shared/login' %>
           <div data-hook="login_extras"></div>
+        </div>
+        <div class="col-lg-11 mx-auto" data-hook="registration">
+          <%= render partial: 'spree/shared/registration', locals: { registration_button: 'registration-button' } %>
+        </div>
       </div>
+    </div>
   </div>
 </div>

data/config/locales/en.yml

@@ -9,6 +9,8 @@ en:
     confirmations:
       confirmed: Your account was successfully confirmed. You are now signed in.
       send_instructions: You will receive an email with instructions about how to confirm your account in a few minutes.
+      spree_user:
+        already_confirmed: Email was already confirmed, please try signing in.
     failure:
       inactive: Your account was not activated yet.
       invalid: Invalid email or password.
@@ -41,7 +43,7 @@ en:
     user_registrations:
       destroyed: Bye! Your account was successfully cancelled. We hope to see you again soon.
       inactive_signed_up: 'You have signed up successfully. However, we could not sign you in because your account is %{reason}.'
-      signed_up_but_unconfirmed: You have signed up successfully.
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
       signed_up: Welcome! You have signed up successfully.
       updated: You updated your account successfully.
     user_sessions:

data/config/routes.rb

@@ -1,6 +1,6 @@
 Spree::Core::Engine.add_routes do
   devise_for :spree_user,
-             class_name: 'Spree::User',
+             class_name: Spree.user_class.to_s,
              controllers: { sessions: 'spree/user_sessions',
                                registrations: 'spree/user_registrations',
                                passwords: 'spree/user_passwords',
@@ -27,12 +27,11 @@ Spree::Core::Engine.add_routes do
   get '/checkout/registration' => 'checkout#registration', :as => :checkout_registration
   put '/checkout/registration' => 'checkout#update_registration', :as => :update_checkout_registration
 
-  get '/account_link' => 'store#account_link'
   resource :account, controller: 'users'
 
   namespace :admin, path: Spree.admin_path do
     devise_for :spree_user,
-               class_name: 'Spree::User',
+               class_name: Spree.user_class.to_s,
                controllers: { sessions: 'spree/admin/user_sessions',
                                  passwords: 'spree/admin/user_passwords' },
                skip: [:unlocks, :omniauth_callbacks, :registrations],

data/db/migrate/20120203010234_add_reset_password_sent_at_to_spree_users.rb

@@ -1,7 +1,7 @@
 class AddResetPasswordSentAtToSpreeUsers < SpreeExtension::Migration[4.2]
   def change
-    Spree::User.reset_column_information
-    unless Spree::User.column_names.include?("reset_password_sent_at")
+    Spree.user_class.reset_column_information
+    unless Spree.user_class.column_names.include?("reset_password_sent_at")
       add_column :spree_users, :reset_password_sent_at, :datetime
     end
   end

data/gemfiles/{spree_3_5.gemfile → spree_4_1.gemfile}

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails-controller-testing"
-gem "spree", "~> 3.5.0"
+gem "spree", github: "spree/spree", branch: "master"
 
 gemspec path: "../"

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

@@ -6,7 +6,7 @@ module Spree::CheckoutControllerDecorator
   end
 
   def registration
-    @user = Spree::User.new
+    @user = Spree.user_class.new
   end
 
   def update_registration
@@ -14,7 +14,7 @@ module Spree::CheckoutControllerDecorator
       redirect_to spree.checkout_state_path(:address)
     else
       flash[:error] = t(:email_is_invalid, scope: [:errors, :messages])
-      @user = Spree::User.new
+      @user = Spree.user_class.new
       render 'registration'
     end
   end

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

@@ -1,16 +1,20 @@
 class Spree::UsersController < Spree::StoreController
-  skip_before_action :set_current_order, only: :show
-  prepend_before_action :load_object, only: [:show, :edit, :update]
+  before_action :set_current_order, except: :show
   prepend_before_action :authorize_actions, only: :new
 
   include Spree::Core::ControllerHelpers
 
   def show
+    load_object
     @orders = @user.orders.complete.order('completed_at desc')
   end
 
+  def edit
+    load_object
+  end
+
   def create
-    @user = Spree::User.new(user_params)
+    @user = Spree.user_class.new(user_params)
     if @user.save
 
       if current_order
@@ -24,10 +28,11 @@ class Spree::UsersController < Spree::StoreController
   end
 
   def update
-    if @user.update_attributes(user_params)
+    load_object
+    if @user.update(user_params)
       if params[:user][:password].present?
         # this logic needed b/c devise wants to log us out after password changes
-        Spree::User.reset_password_by_token(params[:user])
+        Spree.user_class.reset_password_by_token(params[:user])
         if Spree::Auth::Config[:signout_after_password_change]
           sign_in(@user, event: :authentication)
         else
@@ -52,7 +57,7 @@ class Spree::UsersController < Spree::StoreController
   end
 
   def authorize_actions
-    authorize! params[:action].to_sym, Spree::User.new
+    authorize! params[:action].to_sym, Spree.user_class.new
   end
 
   def accurate_title

data/lib/generators/spree/auth/install/install_generator.rb

@@ -10,10 +10,6 @@ module Spree
           paths.flatten
         end
 
-        def add_javascripts
-          append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/spree_auth\n"
-        end
-
         def generate_devise_key
           return if ENV['CI']
           template 'config/initializers/devise.rb', 'config/initializers/devise.rb'

data/lib/spree/testing_support/auth_helpers.rb

@@ -0,0 +1,36 @@
+module Spree
+  module TestingSupport
+    module AuthHelpers
+      def log_in(email:, password:, remember_me: true)
+        visit spree.login_path
+
+        fill_in 'Email', with: email
+        fill_in 'Password', with: password
+
+        # Regression test for #1257
+        first('label', text: 'Remember me').click if remember_me
+        click_button 'Log in'
+
+        expect(page).to have_content 'Logged in successfully'
+      end
+
+      def log_out
+        show_user_menu
+        click_link 'LOG OUT'
+
+        expect(page).to have_content 'Signed out successfully'
+      end
+
+      def show_user_menu
+        find("button[aria-label='Show user menu']").click
+      end
+
+      def show_user_account
+        within '#nav-bar' do
+          show_user_menu
+          click_link 'MY ACCOUNT'
+        end
+      end
+    end
+  end
+end

data/lib/spree/testing_support/checkout_helpers.rb

@@ -0,0 +1,24 @@
+module Spree
+  module TestingSupport
+    module CheckoutHelpers
+      def fill_in_address
+        address = 'order_bill_address_attributes'
+        fill_in "#{address}_firstname", with: 'Ryan'
+        fill_in "#{address}_lastname", with: 'Bigg'
+        fill_in "#{address}_address1", with: '143 Swan Street'
+        fill_in "#{address}_city", with: 'Richmond'
+        select country.name, from: "#{address}_country_id"
+        select state.name, from: "#{address}_state_id"
+        fill_in "#{address}_zipcode", with: '12345'
+        fill_in "#{address}_phone", with: '(555) 555-5555'
+      end
+
+      def fill_in_credit_card_info(invalid: false)
+        fill_in 'name_on_card', with: 'Spree Commerce'
+        fill_in 'card_number', with: invalid ? '123' : '4111 1111 1111 1111'
+        fill_in 'card_expiry', with: '12 / 24'
+        fill_in 'card_code', with: '123'
+      end
+    end
+  end
+end