spree_auth_devise 4.1.0 → 4.2.0

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'
 

data/spec/features/sign_in_spec.rb

@@ -35,17 +35,23 @@ RSpec.feature 'Sign In', type: :feature do
     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
+      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
 
-  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
@@ -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
 

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/spree_auth_devise.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_auth_devise'
-  s.version     = '4.1.0'
+  s.version     = '4.2.0'
   s.summary     = 'Provides authentication and authorization services for use with Spree by using Devise and CanCan.'
   s.description = s.summary
 
@@ -24,31 +24,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'devise', '~> 4.7'
   s.add_dependency 'devise-encryptable', '0.2.0'
 
-  spree_version = '>= 4.1.0.alpha', '< 5.0'
+  spree_version = '>= 4.1', '< 5.0'
   s.add_dependency 'spree_core', spree_version
   s.add_dependency 'spree_extension'
 
-  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 'database_cleaner', '~> 1.5'
-  s.add_development_dependency 'email_spec', '~> 2.1'
-  s.add_development_dependency 'factory_bot', '~> 4.7'
-  s.add_development_dependency 'ffaker'
-  s.add_development_dependency 'launchy'
-  s.add_development_dependency 'mysql2'
-  s.add_development_dependency 'pg'
-  s.add_development_dependency 'pry'
-  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', '~> 4.3'
-  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 'webdrivers', '~> 4.2.0'
+  s.add_development_dependency 'spree_dev_tools'
 end