alchemy-devise 3.6.0 → 4.0.0

data/spec/requests/admin/users_controller_request_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Alchemy::Admin::UsersController, type: :request do
     context 'on create' do
       it 'does not raise DoubleRender error' do
         expect {
-          post admin_users_path, user: attributes_for(:alchemy_user).merge(send_credentials: '1')
+          post admin_users_path, params: {user: attributes_for(:alchemy_user).merge(send_credentials: '1')}
         }.to_not raise_error
       end
     end
@@ -25,7 +25,7 @@ RSpec.describe Alchemy::Admin::UsersController, type: :request do
       it 'does not raise DoubleRender error' do
         user =  create(:alchemy_member_user)
         expect {
-          patch admin_user_path(user), user: {send_credentials: '1'}
+          patch admin_user_path(user), params: {user: {send_credentials: '1'}}
         }.to_not raise_error
       end
     end

data/spec/spec_helper.rb

@@ -15,7 +15,7 @@ require "rails/test_help"
 require "rspec/rails"
 require 'rspec/active_model/mocks'
 require "capybara/rails"
-require 'factory_girl'
+require 'factory_bot'
 require 'alchemy/seeder'
 require 'alchemy/test_support/controller_requests'
 require 'alchemy/test_support/integration_helpers'
@@ -27,6 +27,9 @@ ActionMailer::Base.default_url_options[:host] = "test.com"
 Capybara.default_driver = :rack_test
 Capybara.default_selector = :css
 Capybara.ignore_hidden_elements = false
+ActiveJob::Base.queue_adapter = :test
+
+ActiveSupport::Deprecation.silenced = true
 
 RSpec.configure do |config|
   config.infer_spec_type_from_file_location!
@@ -35,7 +38,8 @@ RSpec.configure do |config|
   config.include Devise::TestHelpers, :type => :controller
   config.include Alchemy::TestSupport::ControllerRequests, :type => :controller
   config.include Alchemy::Engine.routes.url_helpers
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
+  config.include ActiveJob::TestHelper
   [:controller, :feature, :request].each do |type|
     config.include Alchemy::TestSupport::IntegrationHelpers, type: type
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-devise
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 4.0.0.beta
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta
+        version: '4.99'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 4.0.0.beta
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta
+        version: '4.99'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.4
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.99'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.4
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.99'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -65,7 +65,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -106,9 +106,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-description: Devise based user authentication for Alchemy CMS.
+description: Devise based user authentication for AlchemyCMS.
 email:
-- tvd@magiclabs.de
+- thomas@vondeyen.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -194,7 +194,8 @@ files:
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
 - spec/dummy/bin/rspec
-- spec/dummy/bin/spring
+- spec/dummy/bin/setup
+- spec/dummy/bin/update
 - spec/dummy/config.ru
 - spec/dummy/config/alchemy/config.yml
 - spec/dummy/config/alchemy/config.yml.defaults
@@ -207,6 +208,7 @@ files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/application_controller_renderer.rb
 - spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
@@ -215,10 +217,12 @@ files:
 - spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/new_framework_defaults.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
+- spec/dummy/config/puma.rb
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/config/spring.rb
@@ -1542,9 +1546,6 @@ post_install_message: |+
 
     $ bin/rails g alchemy:devise:install
 
-  NOTE: If you are upgrading from Alchemy::Devise 2.0 or older and have overwritten the mailer views, you need to upgrade them!
-  See: https://github.com/plataformatec/devise/blob/master/CHANGELOG.md#310---2013-09-05
-
 rdoc_options: []
 require_paths:
 - lib
@@ -1563,7 +1564,7 @@ rubyforge_project:
 rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: Devise based user authentication for Alchemy CMS.
+summary: Devise based user authentication for AlchemyCMS.
 test_files:
 - spec/spec_helper.rb
 - spec/dummy/app/controllers/application_controller.rb
@@ -1572,10 +1573,11 @@ test_files:
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/bin/update
 - spec/dummy/bin/rake
+- spec/dummy/bin/setup
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rspec
-- spec/dummy/bin/spring
 - spec/dummy/bin/rails
 - spec/dummy/config/secrets.yml
 - spec/dummy/config/routes.rb
@@ -1586,13 +1588,16 @@ test_files:
 - spec/dummy/config/spring.rb
 - spec/dummy/config/environment.rb
 - spec/dummy/config/application.rb
+- spec/dummy/config/puma.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/boot.rb
+- spec/dummy/config/initializers/application_controller_renderer.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/initializers/new_framework_defaults.rb
 - spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/devise.rb

data/spec/dummy/bin/spring

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-
-# This file loads spring without using Bundler, in order to be fast
-# It gets overwritten when you run the `spring binstub` command
-
-unless defined?(Spring)
-  require "rubygems"
-  require "bundler"
-
-  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    spring \((.*?)\)$.*?^$/m)
-    ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
-    ENV["GEM_HOME"] = ""
-    Gem.paths = ENV
-
-    gem "spring", match[1]
-    require "spring/binstub"
-  end
-end