spree_auth_devise 4.0.1 → 4.1.0.rc1

data/spec/features/password_reset_spec.rb

@@ -1,6 +1,4 @@
 RSpec.feature '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 'Reset Password', type: :feature do
   scenario 'allow 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.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 'Reset Password', type: :feature do
 
   scenario 'shows errors if no email is supplied' do
     visit spree.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/sign_in_spec.rb

@@ -10,23 +10,21 @@ RSpec.feature 'Sign In', type: :feature do
   end
 
   scenario 'let a user sign in successfully', js: true do
-    fill_in 'Email', with: @user.email
-    fill_in 'Password', with: @user.password
-    click_button 'Login'
+    log_in(email: @user.email, password: @user.password)
+    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 'show validation erros' do
     fill_in 'Email', with: @user.email
     fill_in 'Password', with: 'wrong_password'
-    click_button 'Login'
+    click_button 'Log in'
 
     expect(page).to have_text 'Invalid email or password'
-    expect(page).to have_text 'Login'
+    expect(page).to have_text 'Log in'
   end
 
   scenario 'allow a user to access a restricted page after logging in' do
@@ -35,7 +33,7 @@ RSpec.feature 'Sign In', type: :feature do
 
     fill_in 'Email', with: user.email
     fill_in 'Password', with: user.password
-    click_button 'Login'
+    click_button 'Log in'
 
     within '.user-menu' do
       expect(page).to have_text 'admin@person.com'

data/spec/features/sign_out_spec.rb

@@ -7,44 +7,37 @@ RSpec.feature 'Sign Out', type: :feature, js: true do
   end
 
   background do
-    visit spree.login_path
-    fill_in 'Email', with: user.email
-    fill_in 'Password', with: user.password
-    # Regression test for #1257
-    check 'Remember me'
-    click_button 'Login'
+    log_in(email: user.email, password: user.password)
   end
 
   scenario 'allow a signed in user to logout' do
-    click_link 'Logout'
+    log_out
+
     visit spree.root_path
-    expect(page).to have_text 'Login'
-    expect(page).not_to have_text 'Logout'
+    show_user_menu
+
+    expect(page).to have_link 'LOG IN'
+    expect(page).not_to have_link 'LOG OUT'
   end
 
   describe 'before_logout' do
-    before do
-      create(:product, name: 'RoR Mug')
-      create(:product, name: 'RoR Shirt')
-    end
-
+    let!(:mug)        { create(:product_in_stock, name: 'RoR Mug') }
+    let!(:shirt)      { create(:product, name: 'RoR Shirt') }
     let!(:other_user) { create(:user) }
 
     it 'clears token cookies' do
-      add_to_cart 'RoR Mug'
-      expect(page).to have_text 'RoR Mug'
+      add_to_cart(mug) do
+        find('.close').click
+      end
 
-      click_link 'Logout'
+      log_out
 
-      click_link 'Cart'
+      find('#link-to-cart').click
       expect(page).to have_text Spree.t(:your_cart_is_empty)
 
-      visit spree.login_path
-      fill_in 'Email', with: other_user.email
-      fill_in 'Password', with: other_user.password
-      click_button 'Login'
+      log_in(email: other_user.email, password: user.password)
+      find('#link-to-cart').click
 
-      click_link 'Cart'
       expect(page).to have_text Spree.t(:your_cart_is_empty)
     end
   end

data/spec/features/sign_up_spec.rb

@@ -6,7 +6,8 @@ RSpec.feature 'Sign Up', 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'
 
       expect(page).to have_text 'You have signed up successfully.'
       expect(Spree::User.count).to eq(1)
@@ -20,7 +21,8 @@ RSpec.feature 'Sign Up', type: :feature do
       fill_in 'Email', with: 'email@person.com'
       fill_in 'Password', with: 'password'
       fill_in 'Password Confirmation', with: ''
-      click_button 'Create'
+
+      click_button 'Sign Up'
 
       expect(page).to have_css '#errorExplanation'
       expect(Spree::User.count).to eq(0)

data/spec/mailers/user_mailer_spec.rb

@@ -1,6 +1,6 @@
 RSpec.describe Spree::UserMailer, type: :mailer do
-  let!(:store) { create(:store) }
   let(:user) { create(:user) }
+  let(:store) { Spree::Store.default }
 
   describe '#reset_password_instructions' do
     describe 'message contents' do

data/spec/spec_helper.rb

@@ -8,6 +8,16 @@ require File.expand_path('../dummy/config/environment', __FILE__)
 require 'rspec/rails'
 require 'shoulda-matchers'
 require 'ffaker'
+require 'pry'
+
+require 'spree/testing_support/auth_helpers'
+require 'spree/testing_support/checkout_helpers'
+
+require 'spree/testing_support/authorization_helpers'
+require 'spree/testing_support/capybara_ext'
+require 'spree/testing_support/controller_requests'
+require 'spree/testing_support/factories'
+require 'spree/testing_support/url_helpers'
 
 RSpec.configure do |config|
   config.filter_run focus: true
@@ -27,7 +37,13 @@ RSpec.configure do |config|
     allow(RSpec::Rails::ViewRendering::EmptyTemplateHandler)
       .to receive(:call)
       .and_return(%("")) if Rails.gem_version >= Gem::Version.new('6.0.0.beta1')
+
+    create(:store)
   end
+
+  config.include Spree::TestingSupport::AuthHelpers, type: :feature
+  config.include Spree::TestingSupport::CheckoutHelpers, type: :feature
+  config.include Spree::TestingSupport::UrlHelpers
 end
 
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }

data/spec/support/add_to_cart.rb

@@ -1,6 +1,6 @@
-def add_to_cart(product_name)
-  visit spree.root_path
-  click_link product_name
+def add_to_cart(product)
+  visit spree.product_path(product)
+
   if Spree.version.to_f > 3.6
     expect(page).to have_selector('form#add-to-cart-form')
     expect(page).to have_selector('button#add-to-cart-button')
@@ -10,6 +10,13 @@ def add_to_cart(product_name)
   end
   click_button 'Add To Cart'
   wait_for_condition do
-    expect(page).to have_content(Spree.t(:shopping_cart))
+    expect(page).to have_content(Spree.t(:added_to_cart))
+  end
+
+  if block_given?
+    yield
+  else
+    click_link 'View cart'
+    expect(page).to have_content 'YOUR SHOPPING BAG'
   end
 end

data/spec/support/authentication_helpers.rb

@@ -3,7 +3,7 @@ module AuthenticationHelpers
     visit '/login'
     fill_in 'Email', with: user.email
     fill_in 'Password', with: 'secret'
-    click_button 'Login'
+    click_button 'Log in'
   end
 end
 

data/spec/support/capybara.rb

@@ -1,16 +1,23 @@
 require 'capybara/rspec'
-require 'capybara/rails'
+require 'capybara-screenshot'
 require 'capybara-screenshot/rspec'
-require 'selenium-webdriver'
-
-RSpec.configure do |_config|
-  Capybara.save_and_open_page_path = ENV['CIRCLE_ARTIFACTS'] if ENV['CIRCLE_ARTIFACTS']
+require 'capybara/rails'
+require 'selenium/webdriver'
 
+RSpec.configure do
   Capybara.register_driver :chrome do |app|
+    Selenium::WebDriver.logger.level = :error
+
     Capybara::Selenium::Driver.new app,
       browser: :chrome,
-      options: Selenium::WebDriver::Chrome::Options.new(args: %w[disable-popup-blocking headless disable-gpu window-size=1920,1080])
+      options: Selenium::WebDriver::Chrome::Options.new(
+        args: %w[headless disable-gpu window-size=1920,1080 --enable-features=NetworkService,NetworkServiceInProcess --disable-features=VizDisplayCompositor],
+        log_level: :error
+      )
   end
-
   Capybara.javascript_driver = :chrome
-end
+
+  Capybara::Screenshot.register_driver(:chrome) do |driver, path|
+    driver.browser.save_screenshot(path)
+  end
+end

data/spree_auth_devise.gemspec

@@ -3,11 +3,11 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_auth_devise'
-  s.version     = '4.0.1'
+  s.version     = '4.1.0.rc1'
   s.summary     = 'Provides authentication and authorization services for use with Spree by using Devise and CanCan.'
   s.description = s.summary
 
-  s.required_ruby_version = '>= 2.2.7'
+  s.required_ruby_version = '>= 2.5.0'
 
   s.author      = 'Sean Schofield'
   s.email       = 'sean@spreecommerce.com'
@@ -19,18 +19,19 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
+  s.add_dependency 'deface', '~> 1.0'
+
   s.add_dependency 'devise', '~> 4.7'
   s.add_dependency 'devise-encryptable', '0.2.0'
 
-  spree_version = '>= 3.1.0', '< 4.1'
+  spree_version = '>= 4.1.0.alpha', '< 5.0'
   s.add_dependency 'spree_core', spree_version
   s.add_dependency 'spree_extension'
-  s.add_dependency 'deface', '~> 1.0'
 
-  s.add_development_dependency 'capybara', '~> 2.7'
+  s.add_development_dependency 'appraisal'
+  s.add_development_dependency 'capybara'
   s.add_development_dependency 'capybara-screenshot'
   s.add_development_dependency 'coffee-rails', '~> 4.2'
-  s.add_development_dependency 'sass-rails'
   s.add_development_dependency 'database_cleaner', '~> 1.5'
   s.add_development_dependency 'email_spec', '~> 2.1'
   s.add_development_dependency 'factory_bot', '~> 4.7'
@@ -38,13 +39,16 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'launchy'
   s.add_development_dependency 'mysql2'
   s.add_development_dependency 'pg'
-  s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'pry'
-  s.add_development_dependency 'rspec-rails', '~> 3.5'
+  s.add_development_dependency 'puma'
+  s.add_development_dependency 'rails-controller-testing'
+  s.add_development_dependency 'rspec-rails', '~> 4.0.0.beta2'
+  s.add_development_dependency 'sass-rails'
+  s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'shoulda-matchers', '~> 3.1'
   s.add_development_dependency 'simplecov', '~> 0.12'
   s.add_development_dependency 'spree_backend', spree_version
   s.add_development_dependency 'spree_frontend', spree_version
   s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'appraisal'
+  s.add_development_dependency 'webdrivers', '~> 4.2.0'
 end