spree_auth_devise 4.1.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46ff8af21fa16c063b0f61f5993e37f93072587b1e663e58089b2ea0a028b51b
-  data.tar.gz: 6d7fa7607dd17ff3b6c5231bd8295c5fef51ea7620e1e459d199b39b42649858
+  metadata.gz: 118d51e3f609cac9bc6a69453d96893824814d99a44e8be828741ebd410c9aa9
+  data.tar.gz: dcb44d6ef585b73b82665d12b04821e5f9d6393ef87626cbbd4091e060390365
 SHA512:
-  metadata.gz: 1eefe313a0b7cd621e9192d483624541790292872576927da6089350aaa14352faa00e0b2dd8f36d2920b9faf4776cc5287df6c5308d2bce9111ec95228f26a1
-  data.tar.gz: 3e941ccde2788291ec91709149786c03dab905cf142811186a43949c3ce6549b89306e8ceb7692070dbb1a7a92ef306ae0adc808d62bb18d1ad27404afbc24f0
+  metadata.gz: 0e3de0c4e4fd5adf202a9fa312f6025eaef63d9b61c8024703b418dc911d9dab405c76d3c25c6ed3f7e7d84f1bb867c2874a21e08dad903618c8632cf087531a
+  data.tar.gz: d650a6a697c44abba86562a2bc94b98ba117ce74a4a57f614f6e210690ea4f44f8e21f64aaf8a55458b8323b0e8686a48f3b313453337635aae8ffd2fe944dc3

data/.travis.yml

@@ -1,38 +1,44 @@
-sudo: required
-dist: trusty
-
-script:
-  - bundle exec rake test_app
-  - bundle exec rake spec
+os: linux
+dist: bionic
 
 addons:
-  chrome: stable
-  postgresql: 9.4
+  apt:
+    sources:
+      - google-chrome
+    packages:
+      - google-chrome-stable
 
-env:
-  - DB=mysql
-  - DB=postgres
+services:
+  - mysql
+  - postgresql
 
 language: ruby
 
 rvm:
-  - 2.5.1
-  # - 2.6.5
+  - 2.5
+  - 2.6
+
+env:
+  - DB=mysql
+  - DB=postgres
 
 gemfile:
   - gemfiles/spree_4_1.gemfile
   - gemfiles/spree_master.gemfile
 
-matrix:
-    allow_failures:
-      - gemfile: gemfiles/spree_master.gemfile
+jobs:
+  allow_failures:
+    - gemfile: gemfiles/spree_master.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 ~/
-  - rm ~/chromedriver_linux64.zip
-  - sudo mv -f ~/chromedriver /usr/local/share/
-  - sudo chmod +x /usr/local/share/chromedriver
-  - sudo ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver
+
+before_script:
+  - CHROME_MAIN_VERSION=`google-chrome-stable --version | sed -E 's/(^Google Chrome |\.[0-9]+ )//g'`
+  - CHROMEDRIVER_VERSION=`curl -s "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROME_MAIN_VERSION"`
+  - curl "https://chromedriver.storage.googleapis.com/${CHROMEDRIVER_VERSION}/chromedriver_linux64.zip" -O
+  - unzip chromedriver_linux64.zip -d ~/bin
+
+script:
+  - bundle exec rake test_app
+  - bundle exec rake spec

data/Appraisals

@@ -1,6 +1,6 @@
 appraise 'spree-4-1' do
   gem 'rails-controller-testing'
-  gem 'spree', github: 'spree/spree', branch: 'master'
+  gem 'spree', '~> 4.1'
 end
 
 appraise 'spree-master' do

data/Gemfile

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

data/Rakefile

@@ -2,14 +2,20 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
-require 'spree/testing_support/common_rake'
+require 'spree/testing_support/extension_rake'
 
 RSpec::Core::RakeTask.new
 
-task default: :spec
+task :default do
+  if Dir["spec/dummy"].empty?
+    Rake::Task[:test_app].invoke
+    Dir.chdir("../../")
+  end
+  Rake::Task[:spec].invoke
+end
 
 desc 'Generates a dummy app for testing'
 task :test_app do
   ENV['LIB_NAME'] = 'spree/auth'
-  Rake::Task['common:test_app'].invoke("Spree::User")
+  Rake::Task['extension:test_app'].invoke
 end

data/app/controllers/spree/api/v2/storefront/account_confirmations_controller.rb

@@ -0,0 +1,20 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class AccountConfirmationsController < ::Spree::Api::V2::BaseController
+
+          def show
+            user = Spree.user_class.confirm_by_token(params[:id])
+
+            if user.errors.empty?
+              render json: { data: { state: user.respond_to?(:state) ? user.state : '' } }, status: :ok
+            else
+              render json: { error: user.errors.full_messages.to_sentence }, status: :unprocessable_entity
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/storefront/passwords_controller.rb

@@ -0,0 +1,35 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class PasswordsController < ::Spree::Api::V2::BaseController
+          include Spree::Core::ControllerHelpers::Store
+
+          def create
+            user = Spree.user_class.find_by(email: params[:user][:email])
+
+            if user&.send_reset_password_instructions(current_store)
+              head :ok
+            else
+              head :not_found
+            end
+          end
+
+          def update
+            user = Spree.user_class.reset_password_by_token(
+              password: params[:user][:password],
+              password_confirmation: params[:user][:password_confirmation],
+              reset_password_token: params[:id]
+            )
+
+            if user.errors.empty?
+              head :ok
+            else
+              render json: { error: user.errors.full_messages.to_sentence }, status: :unprocessable_entity
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/user_passwords_controller.rb

@@ -20,7 +20,7 @@ class Spree::UserPasswordsController < Devise::PasswordsController
   #   respond_with resource, :location => spree.login_path
   #
   def create
-    self.resource = resource_class.send_reset_password_instructions(params[resource_name])
+    self.resource = resource_class.send_reset_password_instructions(params[resource_name], current_store)
 
     if resource.errors.empty?
       set_flash_message(:notice, :send_instructions) if is_navigational_format?

data/app/mailers/spree/user_mailer.rb

@@ -1,9 +1,13 @@
 module Spree
   class UserMailer < BaseMailer
     def reset_password_instructions(user, token, *_args)
-      @edit_password_reset_url = spree.edit_spree_user_password_url(reset_password_token: token, host: Spree::Store.current.url)
+      current_store_id = _args.inject(:merge)[:current_store_id]
+      @current_store = Spree::Store.find(current_store_id) || Spree::Store.current
+      @locale = @current_store.has_attribute?(:default_locale) ? @current_store.default_locale : I18n.default_locale
+      I18n.locale = @locale if @locale.present?
+      @edit_password_reset_url = spree.edit_spree_user_password_url(reset_password_token: token, host: @current_store.url)
 
-      mail to: user.email, from: from_address, subject: Spree::Store.current.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :reset_password_instructions])
+      mail to: user.email, from: from_address, subject: @current_store.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :reset_password_instructions])
     end
 
     def confirmation_instructions(user, token, _opts = {})

data/app/models/spree/user.rb

@@ -27,6 +27,23 @@ module Spree
       has_spree_role?('admin')
     end
 
+    def self.send_reset_password_instructions(attributes={}, current_store)
+      recoverable = find_or_initialize_with_errors(reset_password_keys, attributes, :not_found)
+      recoverable.send_reset_password_instructions(current_store) if recoverable.persisted?
+      recoverable
+    end
+
+    def send_reset_password_instructions(current_store)
+      token = set_reset_password_token
+      send_reset_password_instructions_notification(token, current_store.id)
+
+      token
+    end
+
+    def send_reset_password_instructions_notification(token, current_store_id)
+      send_devise_notification(:reset_password_instructions, token, { current_store_id: current_store_id })
+    end
+
     protected
 
     def password_required?

data/app/services/spree/account/create.rb

@@ -0,0 +1,19 @@
+module Spree
+  module Account
+    class Create
+      prepend Spree::ServiceModule::Base
+
+      def call(user_params: nil)
+        user_params ||= {}
+
+        user = Spree.user_class.new(user_params)
+
+        if user.save
+          success(user)
+        else
+          failure(user)
+        end
+      end
+    end
+  end
+end

data/app/services/spree/account/update.rb

@@ -0,0 +1,17 @@
+module Spree
+  module Account
+    class Update
+      prepend Spree::ServiceModule::Base
+
+      def call(user:, user_params: nil)
+        user_params ||= {}
+
+        if user.update(user_params)
+          success(user)
+        else
+          failure(user)
+        end
+      end
+    end
+  end
+end

data/app/views/spree/user_mailer/confirmation_instructions.text.erb

@@ -1,5 +1,5 @@
-Welcome <%= @email %>!
+<%= Spree.t('confirmation_instructions.welcome', email: @email) %>
 
-You can confirm your account email through the url below:
+<%= Spree.t('confirmation_instructions.confirm') %>
 
-<%= @confirmation_url %>
+<%= @confirmation_url %>

data/app/views/spree/user_mailer/reset_password_instructions.text.erb

@@ -1,10 +1,5 @@
-A request to reset your password has been made.
-If you did not make this request, simply ignore this email.
-
-If you did make this request just click the link below:
+<%= Spree.t('user_mailer.reset_password_instructions.instructions_1') %>
 
 <%= @edit_password_reset_url %>
 
-If the above URL does not work try copying and pasting it into your browser.
-If you continue to have problems please feel free to contact us.
-
+<%= Spree.t('user_mailer.reset_password_instructions.instructions_2') %>

data/config/locales/de.yml

@@ -1,9 +1,23 @@
 ---
 de:
+  spree:
+    admin_login: Admin Login
+    change_your_password: Kennwort zurücksetzen
+    store_credits:
+      credit_balance: Saldo des Guthabens
+    user_mailer:
+      reset_password_instructions:
+        instructions_1: "Es wurde eine Anfrage zum Zurücksetzen Ihres Passworts gestellt.\nWenn Sie diese Anfrage nicht gestellt haben, ignorieren Sie diese E-Mail.\n\nWenn Sie diese Anfrage gestellt haben, klicken Sie bitte auf den folgenden Link:"
+        instructions_2: "Falls die obige URL nicht funktioniert, bitte URL kopieren und in Ihren Browser einfügen\nWenn Sie weiterhin Probleme haben, können Sie sich gerne an uns wenden."
+      confirmation_instructions:
+        welcome: "Schön, dass Sie hier sind %{email}"
+        confirm: "Sie können Ihre Konto-E-Mail-Adresse über die folgende URL bestätigen:"
   devise:
     confirmations:
       confirmed: Ihr Konto wurde erfolgreich aktiviert.
       send_instructions: 'In ein paar Minuten erhalten Sie eine E-Mail mit Anweisungen, um Ihr Konto zu aktivieren.'
+      spree_user:
+        already_confirmed: Ihre E-Mail wurde bereits bestätigt. Bitte versuchen Sie erneut, sich anzumelden.
     failure:
       inactive: Ihr Konto wurde noch nicht aktiviert.
       invalid: Ungültige E-Mail-Adresse oder Passwort.
@@ -28,16 +42,20 @@ de:
     user_passwords:
       spree_user:
         cannot_be_blank: Ihr Passwort darf nicht leer sein.
+        no_token: Sie können nicht auf diese Seite zugreifen, wenn Sie den Link aus einer E-Mail zum Zurücksetzen des Kennworts nicht verwenden. Wenn Sie den Link aus einer E-Mail zum Zurücksetzen des Passworts verwenden, stellen Sie bitte sicher, dass Sie die vollständige URL verwendet haben.
         send_instructions: In ein paar Minuten erhalten Sie eine E-Mail mit Anweisungen um Ihr Passwort zurücksetzen.
         updated: Ihr Passwort wurde erfolgreich geändert.
     user_registrations:
       destroyed: Ihr Konto wurde erfolgreich gelöscht. Auf Wiedersehen!
       inactive_signed_up: 'Sie haben sich erfolgreich registriert. Wir konnten Sie jedoch nicht anmelden, da Ihr Konto %{reason} ist.'
+      signed_up_but_unconfirmed: Eine Nachricht mit einem Bestätigungslink wurde an Ihre E-Mail-Adresse gesendet. Bitte folgen Sie dem Link, um Ihr Konto zu aktivieren.
       signed_up: Herzlich Willkommen! Sie haben sich erfolgreich registriert.
       updated: Sie haben Ihr Konto erfolgreich aktualisiert.
     user_sessions:
       signed_in: Erfolgreich angemeldet.
       signed_out: Erfolgreich abgemeldet.
+      already_signed_in: Bereits angemeldet.
+      already_signed_out: Bereits abgemeldet.
   errors:
     messages:
       already_confirmed: wurde bereits bestätigt

data/config/locales/en.yml

@@ -5,6 +5,13 @@ en:
     change_your_password: "Change your password"
     store_credits:
       credit_balance: Store Credit Balance
+    user_mailer:
+      reset_password_instructions:
+        instructions_1: "A request to reset your password has been made.\nIf you did not make this request, simply ignore this email.\n\nIf you did make this request just click the link below:"
+        instructions_2: "If the above URL does not work try copying and pasting it into your browser.\nIf you continue to have problems please feel free to contact us."
+      confirmation_instructions:
+        welcome: "Welcome %{email}!"
+        confirm: "You can confirm your account email through the url below:"
   devise:
     confirmations:
       confirmed: Your account was successfully confirmed. You are now signed in.
@@ -26,8 +33,6 @@ en:
         subject: Reset password instructions
       unlock_instructions:
         subject: Unlock Instructions
-      confirmation_instructions:
-        subject: Confirmation instructions
     oauth_callbacks:
       failure: 'Could not authorize you from %{kind} because %{reason}.'
       success: 'Successfully authorized from %{kind} account.'

data/config/locales/zh-TW.yml

@@ -0,0 +1,60 @@
+---
+zh-TW:
+  spree:
+    admin_login: "管理員登入"
+    change_your_password: "更改密碼"
+    store_credits:
+      credit_balance: 商城購物金餘額
+  devise:
+    confirmations:
+      confirmed: 你的帳號已經確認完成，現在你已經登入網站了。
+      send_instructions: 你會在幾分鐘內收到一封帳號確認信來確認你的帳號。
+      spree_user:
+        already_confirmed: Email 已確認，請登入。
+    failure:
+      inactive: 你的帳號尚未啟用。
+      invalid: 帳號或密碼有誤。
+      invalid_token: 錯誤的認證代碼。
+      locked: 你的帳號已經被停權，請聯絡客服人員。
+      timeout: 你的登入已經逾時，請重新登入。
+      unauthenticated: 你需要登入來繼續。
+      unconfirmed: 你的帳號需要確認來繼續。
+    mailer:
+      confirmation_instructions:
+        subject: 帳號確認教學
+      reset_password_instructions:
+        subject: 重設密碼教學
+      unlock_instructions:
+        subject: 帳號解鎖教學
+    oauth_callbacks:
+      failure: '由於%{reason}，無法透過%{kind}確認你的帳號。'
+      success: '成功的由%{kind}認證你的帳號。'
+    unlocks:
+      send_instructions: 你在幾分鐘後會收到一封 Email 教你如何解鎖帳號。
+      unlocked: 你的帳號已經解鎖，現在你已經登入網站了。
+    user_passwords:
+      spree_user:
+        cannot_be_blank: 密碼不能為空白。
+        no_token: "你只能透過重新設定密碼的 Email 內的連結來訪問此頁面。如果你真的是透過那封 Email 來此頁面，請確定你是透過完整的網址過來的。"
+        send_instructions: 你在幾分鐘後會收到一封 Email 教你如何更改密碼。
+        updated: 你的密碼已經更改成功，你已成功登入。
+    user_registrations:
+      destroyed: 再見！你的帳號已經被取消了，但我們希望能再服務你。
+      inactive_signed_up: '你已經成功註冊，但由於%{reason}的原因，導致帳號無法登入。'
+      signed_up_but_unconfirmed: 確認信件已經寄到您的信箱，請按照上面的教學完成您的註冊。
+      signed_up: 歡迎！你已經成功註冊了。
+      updated: 你的帳號已經成功更新。
+    user_sessions:
+      signed_in: 登入成功
+      signed_out: 登出成功
+      already_signed_in: 已經登入
+      already_signed_out: 已經登入
+  errors:
+    messages:
+      already_confirmed: 已確認
+      email_is_invalid: Email 不能為空值
+      not_found: 找不到
+      not_locked: 沒有被鎖住
+      not_saved:
+        one: '%{resource}由於以下的一個錯誤導致無法被儲存：'
+        other: '%{resource}由於以下的%{count}個錯誤導致無法被儲存：'

data/config/routes.rb

@@ -44,4 +44,14 @@ Spree::Core::Engine.add_routes do
       get '/logout' => 'user_sessions#destroy', :as => :logout
     end
   end
+
+  namespace :api, defaults: { format: 'json' } do
+    namespace :v2 do
+      namespace :storefront do
+        resource :account, controller: :account, only: %i[show create update]
+        resources :account_confirmations, only: %i[show]
+        resources :passwords, controller: :passwords, only: %i[create update]
+      end
+    end
+  end
 end

data/gemfiles/spree_4_1.gemfile

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

data/lib/controllers/api/spree/api/v2/storefront/account_controller_decorator.rb

@@ -0,0 +1,41 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        module AccountControllerDecorator
+          def self.prepended(base)
+            base.skip_before_action :require_spree_current_user, only: [:create]
+          end
+
+          def create
+            result = Spree::Account::Create.call(user_params: spree_user_params)
+
+            render_payload(result)
+          end
+
+          def update
+            result = Spree::Account::Update.call(user: spree_current_user, user_params: spree_user_params)
+
+            render_payload(result)
+          end
+
+          private
+
+          def render_payload(result)
+            if result.success?
+              render_serialized_payload { serialize_resource(result.value) }
+            else
+              render_error_payload(result.error)
+            end
+          end
+
+          def spree_user_params
+            params.require(:user).permit(Spree::PermittedAttributes.user_attributes)
+          end
+        end
+      end
+    end
+  end
+end
+
+::Spree::Api::V2::Storefront::AccountController.prepend(Spree::Api::V2::Storefront::AccountControllerDecorator)

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

@@ -1,18 +1,14 @@
 class Spree::UsersController < Spree::StoreController
   before_action :set_current_order, except: :show
+  prepend_before_action :load_object, only: [:show, :edit, :update]
   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_class.new(user_params)
     if @user.save
@@ -28,7 +24,6 @@ class Spree::UsersController < Spree::StoreController
   end
 
   def update
-    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

data/lib/spree/auth/engine.rb

@@ -42,7 +42,12 @@ module Spree
             'lib/assets/javascripts/spree/frontend/spree_auth.js',
             'lib/assets/javascripts/spree/frontend/spree_auth.css'
           ]
-          Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/frontend/*/*_decorator*.rb")) do |c|
+          Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/frontend/**/*_decorator*.rb")) do |c|
+            Rails.configuration.cache_classes ? require(c) : load(c)
+          end
+        end
+        if Spree::Auth::Engine.api_available?
+          Dir.glob(File.join(File.dirname(__FILE__), "../../controllers/api/**/*_decorator*.rb")) do |c|
             Rails.configuration.cache_classes ? require(c) : load(c)
           end
         end
@@ -61,6 +66,10 @@ module Spree
         @@frontend_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Frontend::Engine')
       end
 
+      def self.api_available?
+        @@api_available ||= ::Rails::Engine.subclasses.map(&:instance).map{ |e| e.class.to_s }.include?('Spree::Api::Engine')
+      end
+
       if backend_available?
         paths["app/controllers"] << "lib/controllers/backend"
         paths["app/views"] << "lib/views/backend"
@@ -71,6 +80,10 @@ module Spree
         paths["app/views"] << "lib/views/frontend"
       end
 
+      if api_available?
+        paths["app/controllers"] << "lib/controllers/api"
+      end
+
       config.to_prepare &method(:activate).to_proc
     end
   end

data/spec/controllers/spree/api/v2/storefront/passwords_controller_spec.rb

@@ -0,0 +1,63 @@
+RSpec.describe Spree::Api::V2::Storefront::PasswordsController, type: :controller do
+  let(:user) { create(:user) }
+  let(:password) { 'new_password' }
+  let(:store) { create(:store) }
+
+  describe 'POST create' do
+    before { post :create, params: params }
+
+    context 'when the user email has not been specified' do
+      let(:params) { { user: { email: '' } } }
+      it 'responds with not found status' do
+        expect(response.code).to eq('404')
+      end
+    end
+
+    context 'when the user email not found' do
+      let(:params) { { user: { email: 'dummy_email@example.com' } } }
+      it 'responds with not found status' do
+        expect(response.code).to eq('404')
+      end
+    end
+
+    context 'when the user email has been specified' do
+      let(:params) { { user: { email: user.email } } }
+      it_behaves_like 'returns 200 HTTP status'
+    end
+  end
+
+  describe 'PATCH update' do
+    before { patch :update, params: params }
+
+    context 'when updating password with blank password' do
+      let(:params) {
+        {
+          id: user.send_reset_password_instructions(Spree::Store.current),
+          user: {
+            password: '',
+            password_confirmation: ''
+          }
+        }
+      }
+
+      it 'responds with error' do
+        expect(response.code).to eq('422')
+        expect(JSON.parse(response.body)['error']).to eq("Password can't be blank")
+      end
+    end
+
+    context 'when updating password with specified password' do
+      let(:params) {
+        {
+          id: user.send_reset_password_instructions(Spree::Store.current),
+          user: {
+            password: password,
+            password_confirmation: password
+          }
+        }
+      }
+
+      it_behaves_like 'returns 200 HTTP status'
+    end
+  end
+end

data/spec/features/admin/sign_in_spec.rb

@@ -34,8 +34,14 @@ RSpec.feature 'Admin - Sign In', type: :feature do
     fill_in 'Email', with: user.email
     fill_in 'Password', with: 'secret'
     click_button 'Log in'
-    within '.user-menu' do
-      expect(page).to have_text 'admin@person.com'
+    if Spree.version.to_f > 4.1
+      within '.navbar .dropdown-menu' do
+        expect(page).to have_text 'admin@person.com'
+      end
+    else
+      within '.user-menu' do
+        expect(page).to have_text 'admin@person.com'
+      end
     end
     expect(current_path).to eq '/admin/orders'
   end

data/spec/features/checkout_spec.rb

@@ -60,7 +60,7 @@ RSpec.feature 'Checkout', :js, type: :feature do
       find('a.cart-icon').click
 
       expect(page).to have_text 'RoR Mug'
-      within('h1') { expect(page).to have_text 'YOUR SHOPPING BAG' }
+      within('h1') { expect(page).to have_text 'YOUR SHOPPING CART' }
 
       click_link 'checkout'