alchemy-devise 3.6.0 → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (57) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +32 -8
  3. data/Rakefile +8 -2
  4. data/app/models/alchemy/user.rb +2 -13
  5. data/db/migrate/20131015124700_create_alchemy_users.rb +1 -1
  6. data/db/migrate/20131225232042_add_alchemy_roles_to_alchemy_users.rb +1 -1
  7. data/db/migrate/20141209144532_add_indexes_to_alchemy_users.rb +1 -1
  8. data/lib/alchemy/devise.rb +35 -0
  9. data/lib/alchemy/devise/test_support/factories.rb +1 -1
  10. data/lib/alchemy/devise/version.rb +1 -1
  11. data/spec/controllers/admin/users_controller_spec.rb +29 -21
  12. data/spec/controllers/user_sessions_controller_spec.rb +21 -19
  13. data/spec/dummy/app/views/layouts/application.html.erb +2 -2
  14. data/spec/dummy/bin/rails +1 -5
  15. data/spec/dummy/bin/rake +0 -4
  16. data/spec/dummy/bin/rspec +0 -4
  17. data/spec/dummy/bin/setup +34 -0
  18. data/spec/dummy/bin/update +29 -0
  19. data/spec/dummy/config/application.rb +4 -14
  20. data/spec/dummy/config/boot.rb +3 -3
  21. data/spec/dummy/config/environment.rb +2 -2
  22. data/spec/dummy/config/environments/development.rb +24 -11
  23. data/spec/dummy/config/environments/production.rb +24 -17
  24. data/spec/dummy/config/environments/test.rb +6 -6
  25. data/spec/dummy/config/initializers/application_controller_renderer.rb +6 -0
  26. data/spec/dummy/config/initializers/cookies_serializer.rb +2 -0
  27. data/spec/dummy/config/initializers/new_framework_defaults.rb +25 -0
  28. data/spec/dummy/config/initializers/session_store.rb +1 -1
  29. data/spec/dummy/config/initializers/wrap_parameters.rb +2 -2
  30. data/spec/dummy/config/puma.rb +47 -0
  31. data/spec/dummy/config/routes.rb +1 -1
  32. data/spec/dummy/config/secrets.yml +3 -3
  33. data/spec/dummy/db/migrate/20131018201539_alchemy_two_point_six.alchemy.rb +1 -1
  34. data/spec/dummy/db/migrate/20131018201540_remove_do_not_index_from_alchemy_essence_texts.alchemy.rb +1 -1
  35. data/spec/dummy/db/migrate/20131018201541_remove_do_not_index_from_alchemy_essence_richtexts.alchemy.rb +1 -1
  36. data/spec/dummy/db/migrate/20141119205155_add_published_at_to_alchemy_pages.alchemy.rb +1 -1
  37. data/spec/dummy/db/migrate/20141119205156_add_missing_unique_indices_to_tags_and_taggings.alchemy.rb +1 -1
  38. data/spec/dummy/db/migrate/20141119205157_add_taggings_counter_cache_to_tags.alchemy.rb +2 -2
  39. data/spec/dummy/db/migrate/20141119205158_add_missing_taggable_index.alchemy.rb +1 -1
  40. data/spec/dummy/db/migrate/20160322214808_add_parent_element_id_to_alchemy_elements.alchemy.rb +1 -1
  41. data/spec/dummy/db/migrate/20160322214809_add_link_text_to_alchemy_essence_files.alchemy.rb +1 -1
  42. data/spec/dummy/db/migrate/20160518190421_add_locale_to_alchemy_languages.alchemy.rb +1 -1
  43. data/spec/dummy/db/migrate/20160518190425_acts_as_taggable_on_migration.acts_as_taggable_on_engine.rb +1 -1
  44. data/spec/dummy/db/migrate/20160518190426_add_missing_unique_indices.acts_as_taggable_on_engine.rb +1 -1
  45. data/spec/dummy/db/migrate/20160518190427_change_collation_for_tag_names.acts_as_taggable_on_engine.rb +1 -1
  46. data/spec/dummy/db/migrate/20160614164602_add_timebased_publishing_columns_to_pages.alchemy.rb +1 -1
  47. data/spec/dummy/db/migrate/20160614164603_add_image_file_format_to_alchemy_pictures.alchemy.rb +1 -1
  48. data/spec/dummy/db/migrate/20160627081901_change_alchemy_pages_locked_to_locked_at.alchemy.rb +1 -1
  49. data/spec/dummy/db/migrate/20161106124022_add_index_to_alchemy_pages_rgt.alchemy.rb +1 -1
  50. data/spec/dummy/db/migrate/20161106124023_add_foreign_key_indices_and_null_constraints.alchemy.rb +1 -1
  51. data/spec/dummy/db/migrate/20161106124024_add_foreign_keys.alchemy.rb +1 -1
  52. data/spec/dummy/db/migrate/20161106124026_add_missing_indexes.acts_as_taggable_on_engine.rb +1 -1
  53. data/spec/dummy/db/schema.rb +233 -250
  54. data/spec/requests/admin/users_controller_request_spec.rb +2 -2
  55. data/spec/spec_helper.rb +6 -2
  56. metadata +23 -18
  57. data/spec/dummy/bin/spring +0 -18
@@ -16,7 +16,7 @@ RSpec.describe Alchemy::Admin::UsersController, type: :request do
16
16
  context 'on create' do
17
17
  it 'does not raise DoubleRender error' do
18
18
  expect {
19
- post admin_users_path, user: attributes_for(:alchemy_user).merge(send_credentials: '1')
19
+ post admin_users_path, params: {user: attributes_for(:alchemy_user).merge(send_credentials: '1')}
20
20
  }.to_not raise_error
21
21
  end
22
22
  end
@@ -25,7 +25,7 @@ RSpec.describe Alchemy::Admin::UsersController, type: :request do
25
25
  it 'does not raise DoubleRender error' do
26
26
  user = create(:alchemy_member_user)
27
27
  expect {
28
- patch admin_user_path(user), user: {send_credentials: '1'}
28
+ patch admin_user_path(user), params: {user: {send_credentials: '1'}}
29
29
  }.to_not raise_error
30
30
  end
31
31
  end
@@ -15,7 +15,7 @@ require "rails/test_help"
15
15
  require "rspec/rails"
16
16
  require 'rspec/active_model/mocks'
17
17
  require "capybara/rails"
18
- require 'factory_girl'
18
+ require 'factory_bot'
19
19
  require 'alchemy/seeder'
20
20
  require 'alchemy/test_support/controller_requests'
21
21
  require 'alchemy/test_support/integration_helpers'
@@ -27,6 +27,9 @@ ActionMailer::Base.default_url_options[:host] = "test.com"
27
27
  Capybara.default_driver = :rack_test
28
28
  Capybara.default_selector = :css
29
29
  Capybara.ignore_hidden_elements = false
30
+ ActiveJob::Base.queue_adapter = :test
31
+
32
+ ActiveSupport::Deprecation.silenced = true
30
33
 
31
34
  RSpec.configure do |config|
32
35
  config.infer_spec_type_from_file_location!
@@ -35,7 +38,8 @@ RSpec.configure do |config|
35
38
  config.include Devise::TestHelpers, :type => :controller
36
39
  config.include Alchemy::TestSupport::ControllerRequests, :type => :controller
37
40
  config.include Alchemy::Engine.routes.url_helpers
38
- config.include FactoryGirl::Syntax::Methods
41
+ config.include FactoryBot::Syntax::Methods
42
+ config.include ActiveJob::TestHelper
39
43
  [:controller, :feature, :request].each do |type|
40
44
  config.include Alchemy::TestSupport::IntegrationHelpers, type: type
41
45
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alchemy-devise
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.6.0
4
+ version: 4.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thomas von Deyen
@@ -16,40 +16,40 @@ dependencies:
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: '3.5'
19
+ version: 4.0.0.beta
20
20
  - - "<"
21
21
  - !ruby/object:Gem::Version
22
- version: 4.0.0.beta
22
+ version: '4.99'
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
27
  - - ">="
28
28
  - !ruby/object:Gem::Version
29
- version: '3.5'
29
+ version: 4.0.0.beta
30
30
  - - "<"
31
31
  - !ruby/object:Gem::Version
32
- version: 4.0.0.beta
32
+ version: '4.99'
33
33
  - !ruby/object:Gem::Dependency
34
34
  name: devise
35
35
  requirement: !ruby/object:Gem::Requirement
36
36
  requirements:
37
37
  - - ">="
38
38
  - !ruby/object:Gem::Version
39
- version: 3.5.4
39
+ version: '4.0'
40
40
  - - "<"
41
41
  - !ruby/object:Gem::Version
42
- version: '4.0'
42
+ version: '4.99'
43
43
  type: :runtime
44
44
  prerelease: false
45
45
  version_requirements: !ruby/object:Gem::Requirement
46
46
  requirements:
47
47
  - - ">="
48
48
  - !ruby/object:Gem::Version
49
- version: 3.5.4
49
+ version: '4.0'
50
50
  - - "<"
51
51
  - !ruby/object:Gem::Version
52
- version: '4.0'
52
+ version: '4.99'
53
53
  - !ruby/object:Gem::Dependency
54
54
  name: capybara
55
55
  requirement: !ruby/object:Gem::Requirement
@@ -65,7 +65,7 @@ dependencies:
65
65
  - !ruby/object:Gem::Version
66
66
  version: '0'
67
67
  - !ruby/object:Gem::Dependency
68
- name: factory_girl_rails
68
+ name: factory_bot_rails
69
69
  requirement: !ruby/object:Gem::Requirement
70
70
  requirements:
71
71
  - - ">="
@@ -106,9 +106,9 @@ dependencies:
106
106
  - - "~>"
107
107
  - !ruby/object:Gem::Version
108
108
  version: '3.1'
109
- description: Devise based user authentication for Alchemy CMS.
109
+ description: Devise based user authentication for AlchemyCMS.
110
110
  email:
111
- - tvd@magiclabs.de
111
+ - thomas@vondeyen.com
112
112
  executables: []
113
113
  extensions: []
114
114
  extra_rdoc_files: []
@@ -194,7 +194,8 @@ files:
194
194
  - spec/dummy/bin/rails
195
195
  - spec/dummy/bin/rake
196
196
  - spec/dummy/bin/rspec
197
- - spec/dummy/bin/spring
197
+ - spec/dummy/bin/setup
198
+ - spec/dummy/bin/update
198
199
  - spec/dummy/config.ru
199
200
  - spec/dummy/config/alchemy/config.yml
200
201
  - spec/dummy/config/alchemy/config.yml.defaults
@@ -207,6 +208,7 @@ files:
207
208
  - spec/dummy/config/environments/development.rb
208
209
  - spec/dummy/config/environments/production.rb
209
210
  - spec/dummy/config/environments/test.rb
211
+ - spec/dummy/config/initializers/application_controller_renderer.rb
210
212
  - spec/dummy/config/initializers/assets.rb
211
213
  - spec/dummy/config/initializers/backtrace_silencers.rb
212
214
  - spec/dummy/config/initializers/cookies_serializer.rb
@@ -215,10 +217,12 @@ files:
215
217
  - spec/dummy/config/initializers/filter_parameter_logging.rb
216
218
  - spec/dummy/config/initializers/inflections.rb
217
219
  - spec/dummy/config/initializers/mime_types.rb
220
+ - spec/dummy/config/initializers/new_framework_defaults.rb
218
221
  - spec/dummy/config/initializers/secret_token.rb
219
222
  - spec/dummy/config/initializers/session_store.rb
220
223
  - spec/dummy/config/initializers/wrap_parameters.rb
221
224
  - spec/dummy/config/locales/en.yml
225
+ - spec/dummy/config/puma.rb
222
226
  - spec/dummy/config/routes.rb
223
227
  - spec/dummy/config/secrets.yml
224
228
  - spec/dummy/config/spring.rb
@@ -1542,9 +1546,6 @@ post_install_message: |+
1542
1546
 
1543
1547
  $ bin/rails g alchemy:devise:install
1544
1548
 
1545
- NOTE: If you are upgrading from Alchemy::Devise 2.0 or older and have overwritten the mailer views, you need to upgrade them!
1546
- See: https://github.com/plataformatec/devise/blob/master/CHANGELOG.md#310---2013-09-05
1547
-
1548
1549
  rdoc_options: []
1549
1550
  require_paths:
1550
1551
  - lib
@@ -1563,7 +1564,7 @@ rubyforge_project:
1563
1564
  rubygems_version: 2.6.13
1564
1565
  signing_key:
1565
1566
  specification_version: 4
1566
- summary: Devise based user authentication for Alchemy CMS.
1567
+ summary: Devise based user authentication for AlchemyCMS.
1567
1568
  test_files:
1568
1569
  - spec/spec_helper.rb
1569
1570
  - spec/dummy/app/controllers/application_controller.rb
@@ -1572,10 +1573,11 @@ test_files:
1572
1573
  - spec/dummy/app/assets/javascripts/application.js
1573
1574
  - spec/dummy/app/assets/stylesheets/application.css
1574
1575
  - spec/dummy/app/helpers/application_helper.rb
1576
+ - spec/dummy/bin/update
1575
1577
  - spec/dummy/bin/rake
1578
+ - spec/dummy/bin/setup
1576
1579
  - spec/dummy/bin/bundle
1577
1580
  - spec/dummy/bin/rspec
1578
- - spec/dummy/bin/spring
1579
1581
  - spec/dummy/bin/rails
1580
1582
  - spec/dummy/config/secrets.yml
1581
1583
  - spec/dummy/config/routes.rb
@@ -1586,13 +1588,16 @@ test_files:
1586
1588
  - spec/dummy/config/spring.rb
1587
1589
  - spec/dummy/config/environment.rb
1588
1590
  - spec/dummy/config/application.rb
1591
+ - spec/dummy/config/puma.rb
1589
1592
  - spec/dummy/config/database.yml
1590
1593
  - spec/dummy/config/boot.rb
1594
+ - spec/dummy/config/initializers/application_controller_renderer.rb
1591
1595
  - spec/dummy/config/initializers/backtrace_silencers.rb
1592
1596
  - spec/dummy/config/initializers/mime_types.rb
1593
1597
  - spec/dummy/config/initializers/filter_parameter_logging.rb
1594
1598
  - spec/dummy/config/initializers/session_store.rb
1595
1599
  - spec/dummy/config/initializers/wrap_parameters.rb
1600
+ - spec/dummy/config/initializers/new_framework_defaults.rb
1596
1601
  - spec/dummy/config/initializers/assets.rb
1597
1602
  - spec/dummy/config/initializers/cookies_serializer.rb
1598
1603
  - spec/dummy/config/initializers/devise.rb
@@ -1,18 +0,0 @@
1
- #!/usr/bin/env ruby
2
-
3
- # This file loads spring without using Bundler, in order to be fast
4
- # It gets overwritten when you run the `spring binstub` command
5
-
6
- unless defined?(Spring)
7
- require "rubygems"
8
- require "bundler"
9
-
10
- if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ spring \((.*?)\)$.*?^$/m)
11
- ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
12
- ENV["GEM_HOME"] = ""
13
- Gem.paths = ENV
14
-
15
- gem "spring", match[1]
16
- require "spring/binstub"
17
- end
18
- end