From b243a54ce5a9812748b1000b1e41e2b85d3efaf1 Mon Sep 17 00:00:00 2001 From: redfast00 Date: Sat, 24 Aug 2019 21:34:00 +0200 Subject: [PATCH 1/2] Update devise --- Gemfile | 2 +- Gemfile.lock | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 9e0cd63..099f0c0 100644 --- a/Gemfile +++ b/Gemfile @@ -68,7 +68,7 @@ gem 'bootstrap-will_paginate', '0.0.10' gem 'paperclip', '>= 5.2.0' # Use devise for users and admins -gem 'devise', '3.5.6' +gem "devise", ">= 4.6.0" gem 'omniauth-oauth2', '1.3.1' # Use cancancan for authorization diff --git a/Gemfile.lock b/Gemfile.lock index c987be3..59fa6fa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -103,12 +103,11 @@ GEM delayed_job_active_record (4.1.4) activerecord (>= 3.0, < 6.1) delayed_job (>= 3.0, < 5) - devise (3.5.6) + devise (4.7.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 3.2.6, < 5) + railties (>= 4.1.0) responders - thread_safe (~> 0.1) warden (~> 1.2.3) diff-lcs (1.3) docile (1.1.5) @@ -324,7 +323,7 @@ DEPENDENCIES daemons (= 1.2.3) delayed_job (~> 4.0) delayed_job_active_record - devise (= 3.5.6) + devise (>= 4.6.0) factory_girl_rails (= 4.6.0) faker (= 1.4.2) friendly_id (~> 5.1.0) From e61365a8185685b8bdd5589db7575e2f21fe9fbe Mon Sep 17 00:00:00 2001 From: redfast00 Date: Sat, 24 Aug 2019 21:53:19 +0200 Subject: [PATCH 2/2] Update spec files for new devise version --- spec/rails_helper.rb | 32 +++++++++++++++++- spec/spec_helper.rb | 80 -------------------------------------------- 2 files changed, 31 insertions(+), 81 deletions(-) diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 88ff2d0..e1d338d 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -3,7 +3,8 @@ ENV['RAILS_ENV'] ||= 'test' require File.expand_path('../../config/environment', __FILE__) # Prevent database truncation if the environment is production abort("The Rails environment is running in production mode!") if Rails.env.production? -require 'spec_helper' +require 'factory_girl' +require 'devise' require 'rspec/rails' # Add additional requires below this line. Rails is not loaded until this point! @@ -49,4 +50,33 @@ RSpec.configure do |config| # The different available types are documented in the features, such as in # https://relishapp.com/rspec/rspec-rails/docs config.infer_spec_type_from_file_location! + config.include FactoryGirl::Syntax::Methods + # config.include Devise::Test::ControllerHelpers, type: :controller + config.include Devise::Test::ControllerHelpers, type: :controller + config.include Devise::Test::ControllerHelpers, type: :view + # rspec-expectations config goes here. You can use an alternate + # assertion/expectation library such as wrong or the stdlib/minitest + # assertions if you prefer. + config.expect_with :rspec do |expectations| + # This option will default to `true` in RSpec 4. It makes the `description` + # and `failure_message` of custom matchers include text for helper methods + # defined using `chain`, e.g.: + # be_bigger_than(2).and_smaller_than(4).description + # # => "be bigger than 2 and smaller than 4" + # ...rather than: + # # => "be bigger than 2" + expectations.include_chain_clauses_in_custom_matcher_descriptions = true + end + + # rspec-mocks config goes here. You can use an alternate test double + # library (such as bogus or mocha) by changing the `mock_with` option here. + config.mock_with :rspec do |mocks| + # Prevents you from mocking or stubbing a method that does not exist on + # a real object. This is generally recommended, and will default to + # `true` in RSpec 4. + mocks.verify_partial_doubles = true + end + + + config.order = :random end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 0bb4bbb..6141711 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -19,83 +19,3 @@ Coveralls.wear! # users commonly want. # # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration -require 'factory_girl' -require 'devise' - -RSpec.configure do |config| - config.include FactoryGirl::Syntax::Methods - config.include Devise::TestHelpers, type: :controller - - # rspec-expectations config goes here. You can use an alternate - # assertion/expectation library such as wrong or the stdlib/minitest - # assertions if you prefer. - config.expect_with :rspec do |expectations| - # This option will default to `true` in RSpec 4. It makes the `description` - # and `failure_message` of custom matchers include text for helper methods - # defined using `chain`, e.g.: - # be_bigger_than(2).and_smaller_than(4).description - # # => "be bigger than 2 and smaller than 4" - # ...rather than: - # # => "be bigger than 2" - expectations.include_chain_clauses_in_custom_matcher_descriptions = true - end - - # rspec-mocks config goes here. You can use an alternate test double - # library (such as bogus or mocha) by changing the `mock_with` option here. - config.mock_with :rspec do |mocks| - # Prevents you from mocking or stubbing a method that does not exist on - # a real object. This is generally recommended, and will default to - # `true` in RSpec 4. - mocks.verify_partial_doubles = true - end - -# The settings below are suggested to provide a good initial experience -# with RSpec, but feel free to customize to your heart's content. -=begin - # These two settings work together to allow you to limit a spec run - # to individual examples or groups you care about by tagging them with - # `:focus` metadata. When nothing is tagged with `:focus`, all examples - # get run. - config.filter_run :focus - config.run_all_when_everything_filtered = true - - # Allows RSpec to persist some state between runs in order to support - # the `--only-failures` and `--next-failure` CLI options. We recommend - # you configure your source control system to ignore this file. - config.example_status_persistence_file_path = "spec/examples.txt" - - # Limits the available syntax to the non-monkey patched syntax that is - # recommended. For more details, see: - # - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax - # - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/ - # - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching - config.disable_monkey_patching! - - # Many RSpec users commonly either run the entire suite or an individual - # file, and it's useful to allow more verbose output when running an - # individual spec file. - if config.files_to_run.one? - # Use the documentation formatter for detailed output, - # unless a formatter has already been configured - # (e.g. via a command-line flag). - config.default_formatter = 'doc' - end - - # Print the 10 slowest examples and example groups at the - # end of the spec run, to help surface which specs are running - # particularly slow. - config.profile_examples = 10 - - # Run specs in random order to surface order dependencies. If you find an - # order dependency and want to debug it, you can fix the order by providing - # the seed, which is printed after each run. - # --seed 1234 - config.order = :random - - # Seed global randomization in this process using the `--seed` CLI option. - # Setting this allows you to use `--seed` to deterministically reproduce - # test failures related to randomization by passing the same `--seed` value - # as the one that triggered the failure. - Kernel.srand config.seed -=end -end