spree_auth_devise 4.1.0 → 4.3.3

data/spec/features/admin/sign_in_spec.rb

@@ -33,9 +33,16 @@ 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
+      click_button 'Login'
+      within '.navbar .dropdown-menu' do
+        expect(page).to have_text 'admin@person.com'
+      end
+    else
+      click_button 'Log in'
+      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'
 
@@ -87,9 +87,9 @@ RSpec.feature 'Checkout', :js, type: :feature do
       # The 'plain-text' version is sent in the email and there's one way to get that!
       reset_password_email = ActionMailer::Base.deliveries.first
       token_url_regex = /^http:\/\/www.example.com\/user\/spree_user\/password\/edit\?reset_password_token=(.*)$/
-      token = token_url_regex.match(reset_password_email.body.to_s)[1]
+      token = token_url_regex.match(reset_password_email.body.encoded)[1]
 
-      visit spree.edit_spree_user_password_path(reset_password_token: token)
+      visit spree.edit_spree_user_password_path(reset_password_token: token.strip).tr("%0D","")
       fill_in 'Password', with: 'password'
       fill_in 'Password Confirmation', with: 'password'
       click_button 'Update'

data/spec/features/confirmation_spec.rb

@@ -1,13 +1,10 @@
 require 'spec_helper'
 
-RSpec.feature 'Confirmation', type: :feature, reload_user: true do
+RSpec.feature 'Confirmation', type: :feature, confirmable: true do
   before do
-    set_confirmable_option(true)
-    Spree::UserMailer.stub(:confirmation_instructions).and_return(double(deliver: true))
+    expect(Spree::UserMailer).to receive(:confirmation_instructions).with(anything, anything, { current_store_id: Spree::Store.current.id }).and_return(double(deliver: true))
   end
 
-  after(:each) { set_confirmable_option(false) }
-
   background do
     ActionMailer::Base.default_url_options[:host] = 'http://example.com'
   end

data/spec/features/sign_in_spec.rb

@@ -33,19 +33,26 @@ RSpec.feature 'Sign In', type: :feature do
 
     fill_in 'Email', with: user.email
     fill_in 'Password', with: user.password
-    click_button 'Log in'
 
-    within '.user-menu' do
-      expect(page).to have_text 'admin@person.com'
+    if Spree.version.to_f > 4.1
+      click_button 'Login'
+      within '.navbar .dropdown-menu' do
+        expect(page).to have_text 'admin@person.com'
+      end
+    else
+      click_button 'Log in'
+      within '.user-menu' do
+        expect(page).to have_text 'admin@person.com'
+      end
     end
     expect(current_path).to eq '/admin/orders'
   end
 
-  xit "should store the user previous location" do
+  it 'should store the user previous location' do
     visit spree.account_path
-    fill_in "Email", with: @user.email
-    fill_in "Password", with: @user.password
-    click_button "Login"
-    expect(current_path).to eq "/account"
+    fill_in 'Email', with: @user.email
+    fill_in 'Password', with: @user.password
+    click_button 'Log in'
+    expect(current_path).to eq '/account'
   end
 end

data/spec/features/sign_out_spec.rb

@@ -26,9 +26,7 @@ RSpec.feature 'Sign Out', type: :feature, js: true do
     let!(:other_user) { create(:user) }
 
     it 'clears token cookies' do
-      add_to_cart(mug) do
-        find('.close').click
-      end
+      add_to_cart(mug)
 
       log_out
 

data/spec/mailers/user_mailer_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe Spree::UserMailer, type: :mailer do
   describe '#reset_password_instructions' do
     describe 'message contents' do
       before do
-        @message = described_class.reset_password_instructions(user, 'token goes here')
+        @message = described_class.reset_password_instructions(user, 'token goes here', { current_store_id: Spree::Store.current.id })
       end
 
       context 'subject includes' do
@@ -22,7 +22,7 @@ RSpec.describe Spree::UserMailer, type: :mailer do
 
       context 'body includes' do
         it 'password reset url' do
-          expect(@message.body.raw_source).to include "http://#{store.url}/user/spree_user/password/edit"
+          expect(@message.body.encoded).to include "http://#{store.url}/user/spree_user/password/edit"
         end
       end
     end
@@ -30,7 +30,7 @@ RSpec.describe Spree::UserMailer, type: :mailer do
     describe 'legacy support for User object' do
       it 'sends an email' do
         expect {
-          described_class.reset_password_instructions(user, 'token goes here').deliver_now
+          described_class.reset_password_instructions(user, 'token goes here', { current_store_id: Spree::Store.current.id }).deliver_now
         }.to change(ActionMailer::Base.deliveries, :size).by(1)
       end
     end

data/spec/models/user_spec.rb

@@ -1,5 +1,6 @@
 RSpec.describe Spree::User, type: :model do
   before(:all) { Spree::Role.create name: 'admin' }
+  let!(:store) { create(:store) }
 
   it '#admin?' do
     expect(create(:admin_user).admin?).to be true
@@ -8,8 +9,9 @@ RSpec.describe Spree::User, type: :model do
 
   it 'generates the reset password token' do
     user = build(:user)
-    expect(Spree::UserMailer).to receive(:reset_password_instructions).with(user, anything, {}).and_return(double(deliver: true))
-    user.send_reset_password_instructions
+    current_store = Spree::Store.current
+    expect(Spree::UserMailer).to receive(:reset_password_instructions).with(user, anything, { current_store_id: current_store.id }).and_return(double(deliver: true))
+    user.send_reset_password_instructions(current_store)
     expect(user.reset_password_token).not_to be_nil
   end
 
@@ -63,17 +65,48 @@ RSpec.describe Spree::User, type: :model do
     end
   end
 
-  describe "confirmable", reload_user: true do
-    it "is confirmable if the confirmable option is enabled" do
-      set_confirmable_option(true)
-      Spree::UserMailer.stub(:confirmation_instructions).and_return(double(deliver: true))
+  describe "confirmable" do
+    it "is confirmable if the confirmable option is enabled", confirmable: true do
+      Spree::UserMailer.stub(:confirmation_instructions).with(anything, anything, { current_store_id: Spree::Store.current.id }).and_return(double(deliver: true))
       expect(Spree.user_class.devise_modules).to include(:confirmable)
-      set_confirmable_option(false)
     end
 
-    it "is not confirmable if the confirmable option is disabled" do
-      set_confirmable_option(false)
-      expect(Spree.user_class.devise_modules).to_not include(:confirmable)
+    it "is not confirmable if the confirmable option is disabled", confirmable: false do
+      expect(Spree.user_class.devise_modules).not_to include(:confirmable)
+    end
+  end
+
+  describe "#send_confirmation_instructions", retry: 2 do
+    let(:default_store) { Spree::Store.default }
+
+    context "when current store not exists" do
+      it 'takes default store and sends confirmation instruction', confirmable: true do
+        user = Spree.user_class.new
+        user.email = FFaker::Internet.email
+        user.password = user.password_confirmation = 'pass1234'
+        user.save
+        
+        expect(Spree::UserMailer).to receive(:confirmation_instructions).with(
+          user, anything, { current_store_id: default_store.id }).and_return(double(deliver: true)
+        )
+
+        user.send_confirmation_instructions(nil)
+      end
+    end
+
+    context "when current store exists" do
+      it 'takes current store and sends confirmation instruction', confirmable: true do
+        user = Spree.user_class.new
+        user.email = FFaker::Internet.email
+        user.password = user.password_confirmation = 'pass1234'
+        user.save
+
+        expect(Spree::UserMailer).to receive(:confirmation_instructions).with(
+          user, anything, { current_store_id: store.id }).and_return(double(deliver: true)
+        )
+
+        user.send_confirmation_instructions(store)
+      end
     end
   end
 end

data/spec/requests/spree/api/v2/storefront/account_confirmation_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe 'Storefront API v2 Account Confirmation spec', type: :request do
+  describe 'account_confirmations#show' do
+
+    before do
+      Spree::User.stub(:confirm_by_token, confirmation_token: confirmation_token).and_return user
+      get "/api/v2/storefront/account_confirmations/#{confirmation_token}"
+    end
+
+    context 'valid confirmation_token param' do
+      let(:user) { create(:user, confirmation_token: '12345') }
+      let(:confirmation_token) { user.confirmation_token }
+
+      it_behaves_like 'returns 200 HTTP status'
+
+      it 'returns user state' do
+        expect(JSON.parse(response.body)['data']['state']).to eq('')
+      end
+    end
+
+    context 'invalid confirmation_token param' do
+      let(:user) do
+        user = create(:user)
+        user.errors.add(:confirmation_token, :invalid)
+        return user
+      end
+      let(:confirmation_token) { 'dummy_token' }
+
+      it 'return 422 status' do
+        expect(response.code).to eq('422')
+      end
+
+      it 'return JSON API payload of error' do
+        expect(JSON.parse(response.body)['error']).to eq("Confirmation token is invalid")
+      end
+    end
+
+    context 'blank confirmation_token param' do
+      let(:user) { build(:user) }
+      let(:confirmation_token) { '' }
+
+      it 'return 301 status' do
+        expect(response.code).to eq('301')
+      end
+    end
+  end
+end

data/spec/requests/spree/api/v2/storefront/account_spec.rb

@@ -0,0 +1,101 @@
+require 'spec_helper'
+
+describe 'Storefront API v2 Account spec', type: :request do
+  describe 'account#create' do
+    before { post '/api/v2/storefront/account', params: params }
+
+    context 'valid user params' do
+      let(:params) do
+        {
+          "user": {
+            "email": "hello@example.com",
+            "password": "password123",
+            "password_confirmation": "password123"
+          }
+        }
+      end
+
+      it_behaves_like 'returns 200 HTTP status'
+
+      it 'return JSON API payload of User' do
+        expect(JSON.parse(response.body)['data']['attributes']['email']).to eq('hello@example.com')
+      end
+    end
+
+    context 'invalid user params' do
+      let(:params) do
+        {
+          "user": {
+            "email": "hello@example.com",
+            "password": "password123",
+            "password_confirmation": ""
+          }
+        }
+      end
+
+      it 'return JSON API payload of error' do
+        expect(JSON.parse(response.body)['error']).to eq("Password Confirmation doesn't match Password")
+      end
+    end
+
+  end
+
+  describe 'account#update' do
+    include_context 'API v2 tokens'
+
+    let!(:user)  { create(:user_with_addresses) }
+    let(:headers) { headers_bearer }
+
+    before { patch '/api/v2/storefront/account', params: params, headers: headers }
+
+    context 'valid user params' do
+      let(:params) do
+        {
+          "user": {
+            "email": "spree@example.com",
+            "password": "password123",
+            "password_confirmation": "password123"
+          }
+        }
+      end
+
+      it_behaves_like 'returns 200 HTTP status'
+
+      it 'return JSON API payload of User' do
+        expect(JSON.parse(response.body)['data']['attributes']['email']).to eq('spree@example.com')
+      end
+    end
+
+    context 'valid user params without passwords' do
+      let(:params) do
+        {
+          "user": {
+            "email": "spree@example.com"
+          }
+        }
+      end
+
+      it_behaves_like 'returns 200 HTTP status'
+
+      it 'return JSON API payload of User' do
+        expect(JSON.parse(response.body)['data']['attributes']['email']).to eq('spree@example.com')
+      end
+    end
+
+    context 'invalid user params' do
+      let(:params) do
+        {
+          "user": {
+            "email": "spree@example.com",
+            "password": "password123",
+            "password_confirmation": ""
+          }
+        }
+      end
+
+      it 'return JSON API payload of error' do
+        expect(JSON.parse(response.body)['error']).to eq("Password Confirmation doesn't match Password")
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,49 +1,18 @@
-require 'simplecov'
-SimpleCov.start 'rails'
+# Configure Rails Environment
+ENV['RAILS_ENV'] = 'test'
 
-ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../dummy/config/environment.rb', __FILE__)
 
-require File.expand_path('../dummy/config/environment', __FILE__)
+require 'spree_dev_tools/rspec/spec_helper'
 
-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'
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].sort.each { |f| require f }
 
 RSpec.configure do |config|
-  config.filter_run focus: true
-  config.infer_spec_type_from_file_location!
-  config.raise_errors_for_deprecations!
-  config.run_all_when_everything_filtered = true
-  config.use_transactional_fixtures = false
-
-  config.mock_with :rspec do |mock|
-    mock.syntax = [:should, :expect]
-  end
-
-  config.order = :random
-  Kernel.srand(config.seed)
-
   config.before(:each) do
     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/confirm_helpers.rb

@@ -1,11 +1,24 @@
-module ConfirmHelpers
-  def set_confirmable_option(value)
-    Spree::Auth::Config[:confirmable] = value
-    Spree.send(:remove_const, 'User')
-    load File.expand_path("../../../app/models/spree/user.rb", __FILE__)
+RSpec.configure do |config|
+  config.around do |example|
+    if example.metadata.key?(:confirmable)
+      old_user = Spree::User
+
+      begin
+        example.run
+      ensure
+        Spree.const_set('User', old_user)
+      end
+    else
+      example.run
+    end
   end
-end
 
-RSpec.configure do |c|
-  c.include ConfirmHelpers
+  config.before do |example|
+    if example.metadata.key?(:confirmable)
+      Spree::Auth::Config[:confirmable] = example.metadata[:confirmable]
+
+      Spree.send(:remove_const, :User)
+      load File.expand_path('../../../app/models/spree/user.rb', __FILE__)
+    end
+  end
 end