solidus_auth_devise 2.2.0 → 2.3.0

data/spec/features/sign_out_spec.rb

@@ -1,5 +1,6 @@
-RSpec.feature 'Sign Out', type: :feature do
+# frozen_string_literal: true
 
+RSpec.feature 'Sign Out', type: :feature, js: true do
   given!(:user) do
    create(:user,
           email: 'email@person.com',
@@ -19,7 +20,7 @@ RSpec.feature 'Sign Out', type: :feature do
   scenario 'allow a signed in user to logout' do
     click_link 'Logout'
     visit spree.root_path
-    expect(page).to have_text 'Login'
-    expect(page).not_to have_text 'Logout'
+    expect(page).to have_text 'LOGIN'
+    expect(page).not_to have_text 'LOGOUT'
   end
 end

data/spec/features/sign_up_spec.rb

@@ -1,5 +1,6 @@
-RSpec.feature 'Sign Up', type: :feature do
+# frozen_string_literal: true
 
+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,6 @@
-RSpec.describe Spree::UserMailer, type: :mailer do
+# frozen_string_literal: true
 
+RSpec.describe Spree::UserMailer, type: :mailer do
   let!(:store) { create(:store) }
   let(:user) { create(:user) }
 

data/spec/models/order_spec.rb

@@ -1,5 +1,6 @@
-RSpec.describe Spree::Order, type: :model do
+# frozen_string_literal: true
 
+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,6 @@
-RSpec.describe Spree::User, type: :model do
+# frozen_string_literal: true
 
+RSpec.describe Spree::User, type: :model do
   before(:all) { Spree::Role.create name: 'admin' }
 
   it '#admin?' do

data/spec/spec_helper.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require "simplecov"
 SimpleCov.start "rails"
 
 ENV["RAILS_ENV"] ||= "test"
 
-require File.expand_path("../dummy/config/environment.rb", __FILE__)
+require File.expand_path('dummy/config/environment.rb', __dir__)
 
 require "solidus_support/extension/feature_helper"
 

data/spec/support/ability.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.configure do |config|
   config.after do
     Spree::Ability.abilities.delete(AbilityDecorator) if Spree::Ability.abilities.include?(AbilityDecorator)
@@ -8,7 +10,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AuthenticationHelpers
   def sign_in_as!(user)
     visit '/login'

data/spec/support/confirm_helpers.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module ConfirmHelpers
   def set_confirmable_option(value)
     if value
       Spree::User.devise_modules.push(:confirmable)
-      Spree::Auth::Config.set(confirmable: true)
+      stub_spree_preferences(Spree::Auth::Config, confirmable: true)
     else
       Spree::User.devise_modules.delete(:confirmable)
-      Spree::Auth::Config.set(confirmable: false)
+      stub_spree_preferences(Spree::Auth::Config, confirmable: false)
     end
   end
 end

data/spec/support/email.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.configure do |config|
   config.before do
     ActionMailer::Base.deliveries.clear

data/spec/support/preferences.rb

@@ -1,5 +1,13 @@
+# frozen_string_literal: true
+
 RSpec.configure do |config|
-  config.before do
-    Spree::Auth::Config.preference_store = Spree::Auth::Config.default_preferences
+  if SolidusSupport.reset_spree_preferences_deprecated?
+    config.before :suite do
+      Spree::TestingSupport::Preferences.freeze_preferences(Spree::Auth::Config)
+    end
+  else
+    config.before do
+      Spree::Auth::Config.preference_store = Spree::Auth::Config.default_preferences
+    end
   end
 end

data/spec/support/spree.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spree/testing_support/factories'
 require 'spree/testing_support/url_helpers'
 require 'spree/testing_support/controller_requests'

metadata

@@ -1,77 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: solidus_auth_devise
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: solidus_core
+  name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: solidus_support
+  name: devise-encryptable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: devise
+  name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 1.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 1.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: devise-encryptable
+  name: solidus_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -157,19 +157,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +184,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.71'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.71'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +240,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.142'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.142'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -291,7 +347,7 @@ files:
 - ".gem_release.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.md
@@ -329,7 +385,7 @@ files:
 - lib/assets/javascripts/spree/frontend/solidus_auth.js
 - lib/assets/stylesheets/spree/backend/solidus_auth.css
 - lib/assets/stylesheets/spree/frontend/solidus_auth.css
-- lib/controllers/backend/spree/admin/admin_controller_decorator.rb
+- lib/controllers/backend/spree/admin/base_controller_decorator.rb
 - lib/controllers/backend/spree/admin/orders/customer_details_controller_decorator.rb
 - lib/controllers/backend/spree/admin/user_passwords_controller.rb
 - lib/controllers/backend/spree/admin/user_sessions_controller.rb
@@ -407,7 +463,10 @@ homepage:
 licenses:
 - BSD-3
 metadata: {}
-post_install_message: 
+post_install_message: |-
+  NOTE: Rails 6 has removed secret_token in favor of secret_key_base, which was deprecated in
+   Rails 5.2. solidus_auth_devise will keep using secret_token, when present, as the pepper. If
+   secret_token is undefined or not available, secret_key_base will be used instead.
 rdoc_options: []
 require_paths:
 - lib
@@ -415,7 +474,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.travis.yml

@@ -1,18 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.3.1
-env:
-  matrix:
-    - SOLIDUS_BRANCH=v2.4 DB=postgres
-    - SOLIDUS_BRANCH=v2.5 DB=postgres
-    - SOLIDUS_BRANCH=v2.6 DB=postgres
-    - SOLIDUS_BRANCH=v2.7 DB=postgres
-    - SOLIDUS_BRANCH=v2.8 DB=postgres
-    - SOLIDUS_BRANCH=master DB=postgres
-    - SOLIDUS_BRANCH=v2.4 DB=mysql
-    - SOLIDUS_BRANCH=v2.5 DB=mysql
-    - SOLIDUS_BRANCH=v2.6 DB=mysql
-    - SOLIDUS_BRANCH=v2.7 DB=mysql
-    - SOLIDUS_BRANCH=v2.8 DB=mysql
-    - SOLIDUS_BRANCH=master DB=mysql

data/lib/controllers/backend/spree/admin/admin_controller_decorator.rb

@@ -1,11 +0,0 @@
-Spree::Admin::BaseController.class_eval do
-  protected
-
-  def model_class
-    const_name = controller_name.classify
-    if Spree.const_defined?(const_name, false)
-      return "Spree::#{const_name}".constantize
-    end
-    nil
-  end
-end