spree_auth_devise 3.2.0.beta → 3.2.0

data/spec/features/confirmation_spec.rb

@@ -25,4 +25,4 @@ feature 'Confirmation' do
     expect(page).to have_text 'You have signed up successfully.'
     expect(Spree::User.last.confirmed?).to be(false)
   end
-end
+end

data/spec/features/order_spec.rb

@@ -1,5 +1,4 @@
 RSpec.feature 'Orders', :js, type: :feature do
-
   scenario 'allow a user to view their cart at any time' do
     visit spree.cart_path
     expect(page).to have_text 'Your cart is empty'

data/spec/features/password_reset_spec.rb

@@ -1,5 +1,4 @@
 RSpec.feature 'Reset Password', type: :feature do
-
   let!(:store) { create(:store) }
 
   background do

data/spec/features/sign_in_spec.rb

@@ -1,5 +1,4 @@
 RSpec.feature 'Sign In', type: :feature do
-
   background do
     @user = create(:user, email: 'email@person.com', password: 'secret', password_confirmation: 'secret')
     visit spree.login_path
@@ -44,7 +43,7 @@ RSpec.feature 'Sign In', type: :feature do
     expect(current_path).to eq '/admin/orders'
   end
 
-  it "should store the user previous location" do
+  xit "should store the user previous location" do
     visit spree.account_path
     fill_in "Email", with: @user.email
     fill_in "Password", with: @user.password

data/spec/features/sign_out_spec.rb

@@ -1,5 +1,4 @@
 RSpec.feature 'Sign Out', type: :feature do
-
   given!(:user) do
    create(:user,
           email: 'email@person.com',

data/spec/features/sign_up_spec.rb

@@ -1,5 +1,4 @@
 RSpec.feature 'Sign Up', type: :feature do
-
   context 'with valid data' do
     scenario 'create a new user' do
       visit spree.signup_path

data/spec/mailers/user_mailer_spec.rb

@@ -1,5 +1,4 @@
 RSpec.describe Spree::UserMailer, type: :mailer do
-
   let!(:store) { create(:store) }
   let(:user) { create(:user) }
 

data/spec/models/order_spec.rb

@@ -1,5 +1,4 @@
 RSpec.describe Spree::Order, type: :model do
-
   let(:order) { described_class.new }
 
   context '#associate_user!' do

data/spec/models/user_spec.rb

@@ -1,5 +1,4 @@
 RSpec.describe Spree::User, type: :model do
-
   before(:all) { Spree::Role.create name: 'admin' }
 
   it '#admin?' do
@@ -41,6 +40,9 @@ RSpec.describe Spree::User, type: :model do
     end
 
     it 'will not soft delete with completed orders' do
+      # depends on Spree Core
+      # this was introduced in Spree 3.2
+      skip "this is't supported in Spree 3.1 and lower" if Spree.version.to_f < 3.2
       order = build(:order, completed_at: Time.now)
       order.save
       user = order.user

data/spec/spec_helper.rb

@@ -8,7 +8,6 @@ require File.expand_path('../dummy/config/environment', __FILE__)
 require 'rspec/rails'
 require 'shoulda-matchers'
 require 'ffaker'
-require 'rails-controller-testing'
 
 RSpec.configure do |config|
   config.filter_run focus: true
@@ -20,12 +19,6 @@ RSpec.configure do |config|
   config.mock_with :rspec do |mock|
     mock.syntax = [:should, :expect]
   end
-
-  [:controller, :view, :request].each do |type|
-    config.include ::Rails::Controller::Testing::TestProcess, type: type
-    config.include ::Rails::Controller::Testing::TemplateAssertions, type: type
-    config.include ::Rails::Controller::Testing::Integration, type: type
-  end
 end
 
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }

data/spec/support/ability.rb

@@ -8,7 +8,7 @@ if defined? CanCan::Ability
   class AbilityDecorator
     include CanCan::Ability
 
-    def initialize(user)
+    def initialize(_user)
       cannot :manage, Spree::Order
     end
   end

data/spec/support/authentication_helpers.rb

@@ -9,6 +9,6 @@ end
 
 RSpec.configure do |config|
   config.include AuthenticationHelpers, type: :feature
-  config.include Devise::TestHelpers,   type: :controller
-  config.include Rack::Test::Methods,   type: :feature
+  config.include Devise::Test::ControllerHelpers, type: :controller
+  config.include Rack::Test::Methods, type: :feature
 end

data/spec/support/capybara.rb

@@ -3,7 +3,7 @@ require 'capybara/rails'
 require 'capybara/poltergeist'
 require 'capybara-screenshot/rspec'
 
-RSpec.configure do |config|
+RSpec.configure do |_config|
   Capybara.javascript_driver = :poltergeist
   Capybara.save_and_open_page_path = ENV['CIRCLE_ARTIFACTS'] if ENV['CIRCLE_ARTIFACTS']
 end

data/spec/support/confirm_helpers.rb

@@ -8,4 +8,4 @@ end
 
 RSpec.configure do |c|
   c.include ConfirmHelpers
-end
+end

data/spec/support/database_cleaner.rb

@@ -1,18 +1,17 @@
 require 'database_cleaner'
 
 RSpec.configure do |config|
-
   config.before(:suite) do
     DatabaseCleaner.strategy = :transaction
     DatabaseCleaner.clean_with :truncation
   end
 
-  config.before do
+  config.before(:each) do
     DatabaseCleaner.strategy = RSpec.current_example.metadata[:js] ? :truncation : :transaction
     DatabaseCleaner.start
   end
 
-  config.after do
+  config.after(:each) do
     DatabaseCleaner.clean
   end
 end

data/spec/support/spree.rb

@@ -4,22 +4,6 @@ require 'spree/testing_support/controller_requests'
 require 'spree/testing_support/authorization_helpers'
 require 'spree/testing_support/capybara_ext'
 
-# Monkey patch for pending: https://github.com/spree/spree/pull/5182
-module Spree
-  module TestingSupport
-    module AuthorizationHelpers
-      module Controller
-        def stub_authorization!(&block)
-          ability_class = build_ability(&block)
-          before do
-            allow(controller).to receive(:current_ability).and_return(ability_class.new(nil))
-          end
-        end
-      end
-    end
-  end
-end
-
 RSpec.configure do |config|
   config.include Spree::TestingSupport::UrlHelpers
   config.include Spree::TestingSupport::ControllerRequests, type: :controller

data/spree_auth_devise.gemspec

@@ -3,24 +3,24 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_auth_devise'
-  s.version     = '3.2.0.beta'
+  s.version     = '3.2.0'
   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.2'
+  s.required_ruby_version = '>= 2.2.7'
 
   s.author      = 'Sean Schofield'
   s.email       = 'sean@spreecommerce.com'
   s.homepage    = 'http://spreecommerce.com'
-  s.license     = %q{BSD-3}
+  s.license     = 'BSD-3'
 
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- spec/*`.split("\n")
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'devise', '~> 4.0.0'
-  s.add_dependency 'devise-encryptable', '0.1.2'
+  s.add_dependency 'devise', '~> 4.3.0'
+  s.add_dependency 'devise-encryptable', '0.2.0'
 
   spree_version = '>= 3.1.0', '< 4.0'
   s.add_dependency 'spree_core', spree_version
@@ -43,5 +43,5 @@ Gem::Specification.new do |s|
   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 'rails-controller-testing'
+  s.add_development_dependency 'appraisal'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_auth_devise
 version: !ruby/object:Gem::Version
-  version: 3.2.0.beta
+  version: 3.2.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: devise-encryptable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
@@ -323,7 +323,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails-controller-testing
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -346,12 +346,12 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.md
 - README.md
 - Rakefile
-- Versionfile
 - app/controllers/metal_decorator.rb
 - app/mailers/spree/user_mailer.rb
 - app/models/spree/auth_configuration.rb
@@ -359,10 +359,10 @@ files:
 - app/overrides/auth_shared_login_bar.rb
 - app/overrides/spree/admin/shared/_header/auth_admin_login_navigation_bar.html.erb.deface
 - bin/rails
-- circle.yml
 - config.ru
 - config/initializers/devise.rb
 - config/initializers/warden.rb
+- config/locales/bg.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es.yml
@@ -383,6 +383,9 @@ files:
 - db/migrate/20141002154641_add_confirmable_to_users.rb
 - db/migrate/20150416152553_add_missing_indices_on_user.rb
 - db/seeds.rb
+- gemfiles/spree_3_1.gemfile
+- gemfiles/spree_3_2.gemfile
+- gemfiles/spree_master.gemfile
 - lib/assets/javascripts/spree/backend/spree_auth.js.erb
 - lib/assets/javascripts/spree/frontend/account.js.coffee
 - lib/assets/javascripts/spree/frontend/spree_auth.js.erb
@@ -478,16 +481,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Provides authentication and authorization services for use with Spree by

data/Versionfile

@@ -1,5 +0,0 @@
-"2.2.x" => { :branch => "2-2-stable" }
-"2.1.x" => { :branch => "2-1-stable" }
-"2.0.x" => { :branch => "2-0-stable" }
-"1.3.x" => { :branch => "1-3-stable" }
-"1.2.x" => { :branch => "1-2-stable" }

data/circle.yml

@@ -1,13 +0,0 @@
-machine:
-  environment:
-    DB: postgres
-  services:
-    - postgresql
-  ruby:
-    version: '2.2.4'
-
-dependencies:
-  pre:
-    - gem install bundler
-  post:
-    - bundle exec rake test_app