Upgrade Rails version from 5.2.1 to 6.0.0.beta1
This commit is contained in:
parent
4b9c3a5b11
commit
fb8b286c5d
3 changed files with 99 additions and 60 deletions
9
Gemfile
9
Gemfile
|
@ -4,12 +4,14 @@ ruby '2.6.0'
|
|||
|
||||
source 'https://rubygems.org'
|
||||
|
||||
git_source(:github) { |s| "https://github.com/#{s}.git" }
|
||||
|
||||
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'.
|
||||
gem 'rails', '~> 5.2.1'
|
||||
gem 'rails', '~> 6.0.0.beta1'
|
||||
|
||||
# A set of common locale data and translations
|
||||
# to internationalize and/or localize your Rails applications.
|
||||
gem 'rails-i18n', '~> 5.1'
|
||||
gem 'rails-i18n', '~> 6.0.0.beta1'
|
||||
|
||||
# Use postgresql as the database for Active Record.
|
||||
gem 'pg', '>= 0.18', '< 2.0'
|
||||
|
@ -200,7 +202,8 @@ group :test do
|
|||
gem 'shoulda-matchers', '4.0.0.rc1'
|
||||
|
||||
# Cucumber Generator and Runtime for Rails.
|
||||
gem 'cucumber-rails', '~> 1.6', require: false
|
||||
gem 'cucumber-rails', '~> 1.6', require: false,
|
||||
github: 'libertarian-party/cucumber-rails'
|
||||
|
||||
# When a Cucumber step fails, it is useful to create a screenshot image
|
||||
# and HTML file of the current page.
|
||||
|
|
132
Gemfile.lock
132
Gemfile.lock
|
@ -1,43 +1,66 @@
|
|||
GIT
|
||||
remote: https://github.com/libertarian-party/cucumber-rails.git
|
||||
revision: c41d652fa15ebb59796b0eb6926a6456136c1f7b
|
||||
specs:
|
||||
cucumber-rails (1.6.0)
|
||||
capybara (>= 1.1.2, < 4)
|
||||
cucumber (>= 3.0.2, < 4)
|
||||
mime-types (>= 1.17, < 4)
|
||||
nokogiri (~> 1.8)
|
||||
railties (>= 4.2, < 7)
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actioncable (5.2.2)
|
||||
actionpack (= 5.2.2)
|
||||
actioncable (6.0.0.beta1)
|
||||
actionpack (= 6.0.0.beta1)
|
||||
nio4r (~> 2.0)
|
||||
websocket-driver (>= 0.6.1)
|
||||
actionmailer (5.2.2)
|
||||
actionpack (= 5.2.2)
|
||||
actionview (= 5.2.2)
|
||||
activejob (= 5.2.2)
|
||||
actionmailbox (6.0.0.beta1)
|
||||
actionpack (= 6.0.0.beta1)
|
||||
activejob (= 6.0.0.beta1)
|
||||
activerecord (= 6.0.0.beta1)
|
||||
activestorage (= 6.0.0.beta1)
|
||||
activesupport (= 6.0.0.beta1)
|
||||
mail (>= 2.7.1)
|
||||
actionmailer (6.0.0.beta1)
|
||||
actionpack (= 6.0.0.beta1)
|
||||
actionview (= 6.0.0.beta1)
|
||||
activejob (= 6.0.0.beta1)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
actionpack (5.2.2)
|
||||
actionview (= 5.2.2)
|
||||
activesupport (= 5.2.2)
|
||||
actionpack (6.0.0.beta1)
|
||||
actionview (= 6.0.0.beta1)
|
||||
activesupport (= 6.0.0.beta1)
|
||||
rack (~> 2.0)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||
actionview (5.2.2)
|
||||
activesupport (= 5.2.2)
|
||||
actiontext (6.0.0.beta1)
|
||||
actionpack (= 6.0.0.beta1)
|
||||
activerecord (= 6.0.0.beta1)
|
||||
activestorage (= 6.0.0.beta1)
|
||||
activesupport (= 6.0.0.beta1)
|
||||
nokogiri (>= 1.8.5)
|
||||
actionview (6.0.0.beta1)
|
||||
activesupport (= 6.0.0.beta1)
|
||||
builder (~> 3.1)
|
||||
erubi (~> 1.4)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
||||
activejob (5.2.2)
|
||||
activesupport (= 5.2.2)
|
||||
activejob (6.0.0.beta1)
|
||||
activesupport (= 6.0.0.beta1)
|
||||
globalid (>= 0.3.6)
|
||||
activemodel (5.2.2)
|
||||
activesupport (= 5.2.2)
|
||||
activerecord (5.2.2)
|
||||
activemodel (= 5.2.2)
|
||||
activesupport (= 5.2.2)
|
||||
arel (>= 9.0)
|
||||
activestorage (5.2.2)
|
||||
actionpack (= 5.2.2)
|
||||
activerecord (= 5.2.2)
|
||||
activemodel (6.0.0.beta1)
|
||||
activesupport (= 6.0.0.beta1)
|
||||
activerecord (6.0.0.beta1)
|
||||
activemodel (= 6.0.0.beta1)
|
||||
activesupport (= 6.0.0.beta1)
|
||||
activestorage (6.0.0.beta1)
|
||||
actionpack (= 6.0.0.beta1)
|
||||
activerecord (= 6.0.0.beta1)
|
||||
marcel (~> 0.3.1)
|
||||
activesupport (5.2.2)
|
||||
activesupport (6.0.0.beta1)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 0.7, < 2)
|
||||
minitest (~> 5.1)
|
||||
|
@ -46,7 +69,6 @@ GEM
|
|||
public_suffix (>= 2.0.2, < 4.0)
|
||||
airbrussh (1.3.1)
|
||||
sshkit (>= 1.6.1, != 1.7.0)
|
||||
arel (9.0.0)
|
||||
ast (2.4.0)
|
||||
autoprefixer-rails (9.4.7)
|
||||
execjs
|
||||
|
@ -106,12 +128,12 @@ GEM
|
|||
descendants_tracker (~> 0.0.1)
|
||||
concurrent-ruby (1.1.4)
|
||||
connection_pool (2.2.2)
|
||||
coveralls (0.8.22)
|
||||
json (>= 1.8, < 3)
|
||||
simplecov (~> 0.16.1)
|
||||
term-ansicolor (~> 1.3)
|
||||
thor (~> 0.19.4)
|
||||
tins (~> 1.6)
|
||||
coveralls (0.7.1)
|
||||
multi_json (~> 1.3)
|
||||
rest-client
|
||||
simplecov (>= 0.7)
|
||||
term-ansicolor
|
||||
thor
|
||||
crass (1.0.4)
|
||||
cucumber (3.1.2)
|
||||
builder (>= 2.1.2)
|
||||
|
@ -127,12 +149,6 @@ GEM
|
|||
cucumber-tag_expressions (~> 1.1.0)
|
||||
gherkin (~> 5.0)
|
||||
cucumber-expressions (6.0.1)
|
||||
cucumber-rails (1.6.0)
|
||||
capybara (>= 1.1.2, < 4)
|
||||
cucumber (>= 3.0.2, < 4)
|
||||
mime-types (>= 1.17, < 4)
|
||||
nokogiri (~> 1.8)
|
||||
railties (>= 4, < 6)
|
||||
cucumber-tag_expressions (1.1.1)
|
||||
cucumber-wire (0.0.1)
|
||||
database_cleaner (1.7.0)
|
||||
|
@ -261,18 +277,20 @@ GEM
|
|||
rack
|
||||
rack-test (1.1.0)
|
||||
rack (>= 1.0, < 3)
|
||||
rails (5.2.2)
|
||||
actioncable (= 5.2.2)
|
||||
actionmailer (= 5.2.2)
|
||||
actionpack (= 5.2.2)
|
||||
actionview (= 5.2.2)
|
||||
activejob (= 5.2.2)
|
||||
activemodel (= 5.2.2)
|
||||
activerecord (= 5.2.2)
|
||||
activestorage (= 5.2.2)
|
||||
activesupport (= 5.2.2)
|
||||
rails (6.0.0.beta1)
|
||||
actioncable (= 6.0.0.beta1)
|
||||
actionmailbox (= 6.0.0.beta1)
|
||||
actionmailer (= 6.0.0.beta1)
|
||||
actionpack (= 6.0.0.beta1)
|
||||
actiontext (= 6.0.0.beta1)
|
||||
actionview (= 6.0.0.beta1)
|
||||
activejob (= 6.0.0.beta1)
|
||||
activemodel (= 6.0.0.beta1)
|
||||
activerecord (= 6.0.0.beta1)
|
||||
activestorage (= 6.0.0.beta1)
|
||||
activesupport (= 6.0.0.beta1)
|
||||
bundler (>= 1.3.0)
|
||||
railties (= 5.2.2)
|
||||
railties (= 6.0.0.beta1)
|
||||
sprockets-rails (>= 2.0.0)
|
||||
rails-dom-testing (2.0.3)
|
||||
activesupport (>= 4.2.0)
|
||||
|
@ -284,15 +302,15 @@ GEM
|
|||
ruby-graphviz (~> 1.2)
|
||||
rails-html-sanitizer (1.0.4)
|
||||
loofah (~> 2.2, >= 2.2.2)
|
||||
rails-i18n (5.1.3)
|
||||
rails-i18n (6.0.0.beta1)
|
||||
i18n (>= 0.7, < 2)
|
||||
railties (>= 5.0, < 6)
|
||||
railties (5.2.2)
|
||||
actionpack (= 5.2.2)
|
||||
activesupport (= 5.2.2)
|
||||
railties (>= 6.0.0.beta1, < 7)
|
||||
railties (6.0.0.beta1)
|
||||
actionpack (= 6.0.0.beta1)
|
||||
activesupport (= 6.0.0.beta1)
|
||||
method_source
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.19.0, < 2.0)
|
||||
thor (>= 0.20.3, < 2.0)
|
||||
rainbow (3.0.0)
|
||||
rake (12.3.2)
|
||||
rb-fsevent (0.10.3)
|
||||
|
@ -398,7 +416,7 @@ GEM
|
|||
virtus (~> 1.0)
|
||||
term-ansicolor (1.7.1)
|
||||
tins (~> 1.0)
|
||||
thor (0.19.4)
|
||||
thor (0.20.3)
|
||||
thread_safe (0.3.6)
|
||||
tilt (2.0.9)
|
||||
tins (1.20.2)
|
||||
|
@ -449,7 +467,7 @@ DEPENDENCIES
|
|||
capistrano-rvm (~> 0.1)
|
||||
capybara-screenshot (~> 1.0)
|
||||
coveralls
|
||||
cucumber-rails (~> 1.6)
|
||||
cucumber-rails (~> 1.6)!
|
||||
database_cleaner (~> 1.7)
|
||||
devise (~> 4.5)
|
||||
devise-i18n (~> 1.7)
|
||||
|
@ -469,9 +487,9 @@ DEPENDENCIES
|
|||
pundit (~> 2.0)
|
||||
pundit-matchers (~> 1.6)
|
||||
rack-attack (~> 5.4)
|
||||
rails (~> 5.2.1)
|
||||
rails (~> 6.0.0.beta1)
|
||||
rails-erd (~> 1.5)
|
||||
rails-i18n (~> 5.1)
|
||||
rails-i18n (~> 6.0.0.beta1)
|
||||
recaptcha (~> 4.13)
|
||||
redis (~> 4.0)
|
||||
rest-client (~> 2.0)
|
||||
|
|
|
@ -6,3 +6,21 @@ Shoulda::Matchers.configure do |config|
|
|||
with.library :rails
|
||||
end
|
||||
end
|
||||
|
||||
module Shoulda
|
||||
module Matchers
|
||||
module ActiveModel
|
||||
class ValidatePresenceOfMatcher < ValidationMatcher
|
||||
def secure_password_being_validated?
|
||||
return false unless defined?(
|
||||
::ActiveModel::SecurePassword::InstanceMethodsOnActivation
|
||||
)
|
||||
|
||||
@attribute == :password && @subject.class.ancestors.include?(
|
||||
::ActiveModel::SecurePassword::InstanceMethodsOnActivation,
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Reference in a new issue