From d97bdd6cab8dcb4e344f18d44db7a73fc906e58f Mon Sep 17 00:00:00 2001 From: Gui Vieira Date: Wed, 1 Jan 2020 12:20:50 -0800 Subject: [PATCH] Update test versions and dependencies (#1269) --- .travis.yml | 21 +- Appraisals | 72 ++-- gemfiles/rails_4_2.gemfile | 17 +- gemfiles/rails_4_2.gemfile.lock | 134 ++++---- gemfiles/rails_5_0.gemfile | 17 +- gemfiles/rails_5_0.gemfile.lock | 148 ++++----- gemfiles/rails_5_1.gemfile | 17 +- gemfiles/rails_5_1.gemfile.lock | 221 ++++++------- gemfiles/rails_5_2.gemfile | 17 +- gemfiles/rails_5_2.gemfile.lock | 245 +++++++------- gemfiles/rails_6_0.gemfile | 31 +- gemfiles/rails_6_0.gemfile.lock | 310 +++++++++--------- .../active_model_integration_spec.rb | 2 +- spec/acceptance/independent_matchers_spec.rb | 8 +- .../multiple_libraries_integration_spec.rb | 8 +- spec/acceptance/rails_integration_spec.rb | 16 +- .../acceptance/helpers/step_helpers.rb | 2 - 17 files changed, 607 insertions(+), 679 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac6109c2..a5241375 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,24 +7,25 @@ env: - DATABASE_ADAPTER=sqlite3 - DATABASE_ADAPTER=postgresql rvm: - - 2.4.6 - - 2.5.5 - - 2.6.3 + - 2.6.5 + - 2.5.7 + - 2.4.9 gemfile: - - gemfiles/rails_4_2.gemfile - - gemfiles/rails_5_0.gemfile - - gemfiles/rails_5_1.gemfile - - gemfiles/rails_5_2.gemfile - gemfiles/rails_6_0.gemfile + - gemfiles/rails_5_2.gemfile + - gemfiles/rails_5_1.gemfile + - gemfiles/rails_5_0.gemfile + - gemfiles/rails_4_2.gemfile matrix: exclude: - - rvm: 2.4.6 - gemfile: gemfiles/rails_6_0.gemfile - - rvm: 2.6.3 + - rvm: 2.6.5 gemfile: gemfiles/rails_4_2.gemfile + - rvm: 2.4.9 + gemfile: gemfiles/rails_6_0.gemfile cache: bundler # Source: before_install: + - nvm install 12 - gem update --system '2.7.8' --no-document - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true - gem install bundler -v '< 2' --no-document diff --git a/Appraisals b/Appraisals index d8feefd5..1123ebf6 100644 --- a/Appraisals +++ b/Appraisals @@ -3,16 +3,9 @@ # best to keep the gems here in the same order as they're listed there so you # can compare them more easily. -shared_jruby_dependencies = proc do - gem 'activerecord-jdbc-adapter', platform: :jruby - gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby - gem 'jdbc-sqlite3', platform: :jruby - gem 'jruby-openssl', platform: :jruby - gem 'therubyrhino', platform: :jruby -end - -shared_rails_dependencies = proc do - gem 'sqlite3', '~> 1.3.6', platform: :ruby +# Needed for Rails 5+ controller tests +controller_test_dependency = proc do + gem 'rails-controller-testing', '>= 1.0.1' end shared_spring_dependencies = proc do @@ -21,13 +14,11 @@ shared_spring_dependencies = proc do end shared_test_dependencies = proc do - gem 'rspec-rails', '~> 3.6' + gem 'rspec-rails', '~> 3.9' gem 'shoulda-context', '~> 1.2.0' end shared_dependencies = proc do - instance_eval(&shared_jruby_dependencies) - instance_eval(&shared_rails_dependencies) instance_eval(&shared_spring_dependencies) instance_eval(&shared_test_dependencies) end @@ -35,7 +26,7 @@ end appraise 'rails_4_2' do instance_eval(&shared_dependencies) - gem 'rails', '~> 4.2.11.1' + gem 'rails', '4.2.11.1' gem 'sass-rails', '~> 5.0' gem 'uglifier', '>= 1.3.0' gem 'coffee-rails', '~> 4.1.0' @@ -49,14 +40,17 @@ appraise 'rails_4_2' do gem 'activeresource', '4.0.0' gem 'json', '~> 1.4' gem 'protected_attributes', '~> 1.0.6' - gem 'pg', '~> 0.15', platform: :ruby + + # Database adapters + gem 'pg', '~> 0.18' + gem 'sqlite3', '~> 1.3.6' end appraise 'rails_5_0' do instance_eval(&shared_dependencies) + instance_eval(&controller_test_dependency) - gem 'rails', '~> 5.0.7.2' - gem 'rails-controller-testing', '>= 1.0.1' + gem 'rails', '5.0.7.2' gem 'puma', '~> 3.0' gem 'sass-rails', '~> 5.0' gem 'jquery-rails' @@ -66,15 +60,16 @@ appraise 'rails_5_0' do gem 'listen', '~> 3.0.5' gem 'spring-watcher-listen', '~> 2.0.0' - # Other dependencies - gem 'pg', '~> 1.1', platform: :ruby + # Database adapters + gem 'pg', '~> 0.18' + gem 'sqlite3', '~> 1.3.6' end appraise 'rails_5_1' do instance_eval(&shared_dependencies) + instance_eval(&controller_test_dependency) - gem 'rails', '~> 5.1.6.2' - gem 'rails-controller-testing', '>= 1.0.1' + gem 'rails', '5.1.7' gem 'puma', '~> 3.7' gem 'sass-rails', '~> 5.0' gem 'turbolinks', '~> 5' @@ -85,15 +80,16 @@ appraise 'rails_5_1' do gem 'listen', '>= 3.0.5', '< 3.2' gem 'spring-watcher-listen', '~> 2.0.0' - # Other dependencies - gem 'pg', '~> 1.1', platform: :ruby + # Database adapters + gem 'pg', '~> 0.18' + gem 'sqlite3', '~> 1.3.6' end appraise 'rails_5_2' do instance_eval(&shared_dependencies) + instance_eval(&controller_test_dependency) - gem 'rails', '~> 5.2.2.1' - gem 'rails-controller-testing', '>= 1.0.1' + gem 'rails', '5.2.4.1' gem 'puma', '~> 3.11' gem 'bootsnap', '>= 1.1.0', require: false gem 'sass-rails', '~> 5.0' @@ -106,30 +102,32 @@ appraise 'rails_5_2' do gem 'listen', '>= 3.0.5', '< 3.2' gem 'spring-watcher-listen', '~> 2.0.0' - # Other dependencies - gem 'pg', '~> 1.1', platform: :ruby + # Database adapters + gem 'pg', '~> 0.18' + gem 'sqlite3', '~> 1.3.6' end if Gem::Requirement.new('>= 2.5.0').satisfied_by?(Gem::Version.new(RUBY_VERSION)) appraise 'rails_6_0' do instance_eval(&shared_dependencies) + instance_eval(&controller_test_dependency) - gem 'rails', '~> 6.0.0.beta3' - gem 'puma', '~> 3.11' - gem 'bootsnap', '>= 1.4.1', require: false - gem 'sass-rails', '~> 5.0' - gem 'webpacker', '>= 4.0.0.rc3' + gem 'rails', '6.0.2.1' + gem 'puma', '~> 4.1' + gem 'bootsnap', '>= 1.4.2', require: false + gem 'sass-rails', '>= 6' + gem 'webpacker', '~> 4.0' gem 'turbolinks', '~> 5' - gem 'jbuilder', '~> 2.5' + gem 'jbuilder', '~> 2.7' gem 'bcrypt', '~> 3.1.7' gem 'capybara', '>= 2.15' gem 'listen', '>= 3.0.5', '< 3.2' gem 'spring-watcher-listen', '~> 2.0.0' gem 'selenium-webdriver' - gem 'chromedriver-helper' + gem 'webdrivers' - # Other dependencies - gem 'rails-controller-testing', '>= 1.0.1' - gem 'pg', '~> 1.1', platform: :ruby + # Database adapters + gem 'pg', '>= 0.18', '< 2.0' + gem 'sqlite3', '~> 1.4' end end diff --git a/gemfiles/rails_4_2.gemfile b/gemfiles/rails_4_2.gemfile index a1496597..e5bead64 100644 --- a/gemfiles/rails_4_2.gemfile +++ b/gemfiles/rails_4_2.gemfile @@ -6,8 +6,8 @@ gem "appraisal", "2.2.0" gem "bundler", "~> 1.1" gem "pry" gem "pry-byebug" -gem "rake", "12.3.2" -gem "rspec", "~> 3.6" +gem "rake", "13.0.1" +gem "rspec", "~> 3.9" gem "rubocop", require: false gem "rubocop-rails", require: false gem "zeus", require: false @@ -15,17 +15,11 @@ gem "fssm" gem "pygments.rb" gem "redcarpet" gem "yard" -gem "activerecord-jdbc-adapter", platform: :jruby -gem "activerecord-jdbcsqlite3-adapter", platform: :jruby -gem "jdbc-sqlite3", platform: :jruby -gem "jruby-openssl", platform: :jruby -gem "therubyrhino", platform: :jruby -gem "sqlite3", "~> 1.3.6", platform: :ruby gem "spring" gem "spring-commands-rspec" -gem "rspec-rails", "~> 3.6" +gem "rspec-rails", "~> 3.9" gem "shoulda-context", "~> 1.2.0" -gem "rails", "~> 4.2.11.1" +gem "rails", "4.2.11.1" gem "sass-rails", "~> 5.0" gem "uglifier", ">= 1.3.0" gem "coffee-rails", "~> 4.1.0" @@ -37,4 +31,5 @@ gem "bcrypt", "~> 3.1.7" gem "activeresource", "4.0.0" gem "json", "~> 1.4" gem "protected_attributes", "~> 1.0.6" -gem "pg", "~> 0.15", platform: :ruby +gem "pg", "~> 0.18" +gem "sqlite3", "~> 1.3.6" diff --git a/gemfiles/rails_4_2.gemfile.lock b/gemfiles/rails_4_2.gemfile.lock index 308f168c..1053af8c 100644 --- a/gemfiles/rails_4_2.gemfile.lock +++ b/gemfiles/rails_4_2.gemfile.lock @@ -39,16 +39,15 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - ansi (1.5.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) arel (6.0.4) ast (2.4.0) - bcrypt (3.1.11) - builder (3.2.3) - byebug (9.1.0) + bcrypt (3.1.13) + builder (3.2.4) + byebug (11.0.1) coderay (1.1.2) coffee-rails (4.1.1) coffee-script (>= 2.2.0) @@ -58,52 +57,51 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.1.5) - crass (1.0.4) + crass (1.0.5) diff-lcs (1.3) erubis (2.7.0) execjs (2.7.0) - ffi (1.9.18) + ffi (1.11.3) fssm (0.2.10) globalid (0.4.2) activesupport (>= 4.2.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jaro_winkler (1.5.2) - jbuilder (2.7.0) + jaro_winkler (1.5.4) + jbuilder (2.9.1) activesupport (>= 4.2.0) - multi_json (>= 1.2) - jquery-rails (4.3.1) + jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.6) - loofah (2.2.3) + loofah (2.4.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - method_source (0.9.0) - mini_mime (1.0.1) + method_source (0.9.2) + mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.11.3) - multi_json (1.12.2) - nokogiri (1.10.3) + minitest (5.13.0) + multi_json (1.14.1) + nokogiri (1.10.7) mini_portile2 (~> 2.4.0) - parallel (1.17.0) - parser (2.6.3.0) + parallel (1.19.1) + parser (2.7.0.0) ast (~> 2.4.0) pg (0.21.0) protected_attributes (1.0.9) activemodel (>= 4.0.1, < 5.0) - pry (0.11.3) + pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) - pry-byebug (3.5.1) - byebug (~> 9.1) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) - pygments.rb (1.1.2) + pygments.rb (1.2.1) multi_json (>= 1.0.0) - rack (1.6.11) + rack (1.6.12) rack-test (0.6.3) rack (>= 1.0) rails (4.2.11.1) @@ -123,8 +121,8 @@ GEM activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) rails-observers (0.1.5) activemodel (>= 4.0) railties (4.2.11.1) @@ -133,50 +131,50 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) - rake (12.3.2) - rb-fsevent (0.10.2) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) + rake (13.0.1) + rb-fsevent (0.10.3) + rb-inotify (0.10.1) + ffi (~> 1.0) rdoc (4.3.0) - redcarpet (3.4.0) - rspec (3.6.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-core (3.6.0) - rspec-support (~> 3.6.0) - rspec-expectations (3.6.0) + redcarpet (3.5.0) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.0) + rspec-support (~> 3.9.0) + rspec-expectations (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-mocks (3.6.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-rails (3.6.1) + rspec-support (~> 3.9.0) + rspec-rails (3.9.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-support (~> 3.6.0) - rspec-support (3.6.0) - rubocop (0.71.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.0) + rubocop (0.78.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rails (2.0.1) + rubocop-rails (2.4.1) rack (>= 1.1) - rubocop (>= 0.70.0) + rubocop (>= 0.72.0) ruby-progressbar (1.10.1) - sass (3.5.2) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.6) + sass-rails (5.0.7) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) @@ -186,8 +184,7 @@ GEM json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) shoulda-context (1.2.2) - spring (2.0.2) - activesupport (>= 4.2) + spring (2.1.0) spring-commands-rspec (1.0.4) spring (>= 0.9.1) sprockets (3.7.2) @@ -198,18 +195,18 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - thor (0.20.3) + thor (1.0.1) thread_safe (0.3.6) - tilt (2.0.8) - turbolinks (5.0.1) - turbolinks-source (~> 5) - turbolinks-source (5.0.3) - tzinfo (1.2.5) + tilt (2.0.10) + turbolinks (5.2.1) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.6) thread_safe (~> 0.1) - uglifier (3.2.0) + uglifier (4.2.0) execjs (>= 0.3.0, < 3) unicode-display_width (1.6.0) - yard (0.9.9) + yard (0.9.20) zeus (0.15.14) method_source (>= 0.6.7) @@ -217,8 +214,6 @@ PLATFORMS ruby DEPENDENCIES - activerecord-jdbc-adapter - activerecord-jdbcsqlite3-adapter activeresource (= 4.0.0) appraisal (= 2.2.0) bcrypt (~> 3.1.7) @@ -226,20 +221,18 @@ DEPENDENCIES coffee-rails (~> 4.1.0) fssm jbuilder (~> 2.0) - jdbc-sqlite3 jquery-rails - jruby-openssl json (~> 1.4) - pg (~> 0.15) + pg (~> 0.18) protected_attributes (~> 1.0.6) pry pry-byebug pygments.rb - rails (~> 4.2.11.1) - rake (= 12.3.2) + rails (= 4.2.11.1) + rake (= 13.0.1) redcarpet - rspec (~> 3.6) - rspec-rails (~> 3.6) + rspec (~> 3.9) + rspec-rails (~> 3.9) rubocop rubocop-rails sass-rails (~> 5.0) @@ -248,7 +241,6 @@ DEPENDENCIES spring spring-commands-rspec sqlite3 (~> 1.3.6) - therubyrhino turbolinks uglifier (>= 1.3.0) yard diff --git a/gemfiles/rails_5_0.gemfile b/gemfiles/rails_5_0.gemfile index ec631a88..91f2a1ae 100644 --- a/gemfiles/rails_5_0.gemfile +++ b/gemfiles/rails_5_0.gemfile @@ -6,8 +6,8 @@ gem "appraisal", "2.2.0" gem "bundler", "~> 1.1" gem "pry" gem "pry-byebug" -gem "rake", "12.3.2" -gem "rspec", "~> 3.6" +gem "rake", "13.0.1" +gem "rspec", "~> 3.9" gem "rubocop", require: false gem "rubocop-rails", require: false gem "zeus", require: false @@ -15,18 +15,12 @@ gem "fssm" gem "pygments.rb" gem "redcarpet" gem "yard" -gem "activerecord-jdbc-adapter", platform: :jruby -gem "activerecord-jdbcsqlite3-adapter", platform: :jruby -gem "jdbc-sqlite3", platform: :jruby -gem "jruby-openssl", platform: :jruby -gem "therubyrhino", platform: :jruby -gem "sqlite3", "~> 1.3.6", platform: :ruby gem "spring" gem "spring-commands-rspec" -gem "rspec-rails", "~> 3.6" +gem "rspec-rails", "~> 3.9" gem "shoulda-context", "~> 1.2.0" -gem "rails", "~> 5.0.7.2" gem "rails-controller-testing", ">= 1.0.1" +gem "rails", "5.0.7.2" gem "puma", "~> 3.0" gem "sass-rails", "~> 5.0" gem "jquery-rails" @@ -35,4 +29,5 @@ gem "jbuilder", "~> 2.5" gem "bcrypt", "~> 3.1.7" gem "listen", "~> 3.0.5" gem "spring-watcher-listen", "~> 2.0.0" -gem "pg", "~> 1.1", platform: :ruby +gem "pg", "~> 0.18" +gem "sqlite3", "~> 1.3.6" diff --git a/gemfiles/rails_5_0.gemfile.lock b/gemfiles/rails_5_0.gemfile.lock index c7a936ad..bff752bf 100644 --- a/gemfiles/rails_5_0.gemfile.lock +++ b/gemfiles/rails_5_0.gemfile.lock @@ -38,65 +38,63 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - ansi (1.5.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) arel (7.1.4) ast (2.4.0) - bcrypt (3.1.11) - builder (3.2.3) - byebug (9.1.0) + bcrypt (3.1.13) + builder (3.2.4) + byebug (11.0.1) coderay (1.1.2) concurrent-ruby (1.1.5) - crass (1.0.4) + crass (1.0.5) diff-lcs (1.3) erubis (2.7.0) - ffi (1.9.18) + ffi (1.11.3) fssm (0.2.10) globalid (0.4.2) activesupport (>= 4.2.0) - i18n (1.6.0) + i18n (1.7.0) concurrent-ruby (~> 1.0) - jaro_winkler (1.5.2) - jbuilder (2.7.0) + jaro_winkler (1.5.4) + jbuilder (2.9.1) activesupport (>= 4.2.0) - multi_json (>= 1.2) - jquery-rails (4.3.1) + jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.2.3) + loofah (2.4.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) method_source (0.9.2) - mini_mime (1.0.1) + mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.11.3) - multi_json (1.12.2) - nio4r (2.3.1) - nokogiri (1.10.3) + minitest (5.13.0) + multi_json (1.14.1) + nio4r (2.5.2) + nokogiri (1.10.7) mini_portile2 (~> 2.4.0) - parallel (1.17.0) - parser (2.6.3.0) + parallel (1.19.1) + parser (2.7.0.0) ast (~> 2.4.0) - pg (1.1.4) - pry (0.11.3) + pg (0.21.0) + pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) - pry-byebug (3.5.1) - byebug (~> 9.1) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) - puma (3.10.0) - pygments.rb (1.1.2) + puma (3.12.2) + pygments.rb (1.2.1) multi_json (>= 1.0.0) - rack (2.0.7) + rack (2.0.8) rack-test (0.6.3) rack (>= 1.0) rails (5.0.7.2) @@ -111,15 +109,15 @@ GEM bundler (>= 1.3.0) railties (= 5.0.7.2) sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.1) - actionpack (~> 5.x) - actionview (~> 5.x) - activesupport (~> 5.x) + rails-controller-testing (1.0.4) + actionpack (>= 5.0.1.x) + actionview (>= 5.0.1.x) + activesupport (>= 5.0.1.x) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) railties (5.0.7.2) actionpack (= 5.0.7.2) activesupport (= 5.0.7.2) @@ -127,57 +125,56 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) - rake (12.3.2) - rb-fsevent (0.10.2) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - redcarpet (3.4.0) - rspec (3.6.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-core (3.6.0) - rspec-support (~> 3.6.0) - rspec-expectations (3.6.0) + rake (13.0.1) + rb-fsevent (0.10.3) + rb-inotify (0.10.1) + ffi (~> 1.0) + redcarpet (3.5.0) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.0) + rspec-support (~> 3.9.0) + rspec-expectations (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-mocks (3.6.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.6.0) - rspec-rails (3.6.1) + rspec-support (~> 3.9.0) + rspec-rails (3.9.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.6.0) - rspec-expectations (~> 3.6.0) - rspec-mocks (~> 3.6.0) - rspec-support (~> 3.6.0) - rspec-support (3.6.0) - rubocop (0.71.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.0) + rubocop (0.78.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rails (2.0.1) + rubocop-rails (2.4.1) rack (>= 1.1) - rubocop (>= 0.70.0) + rubocop (>= 0.72.0) ruby-progressbar (1.10.1) - sass (3.5.2) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.6) + sass-rails (5.0.7) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) shoulda-context (1.2.2) - spring (2.0.2) - activesupport (>= 4.2) + spring (2.1.0) spring-commands-rspec (1.0.4) spring (>= 0.9.1) spring-watcher-listen (2.0.1) @@ -191,19 +188,19 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - thor (0.20.3) + thor (1.0.1) thread_safe (0.3.6) - tilt (2.0.8) - turbolinks (5.0.1) - turbolinks-source (~> 5) - turbolinks-source (5.0.3) - tzinfo (1.2.5) + tilt (2.0.10) + turbolinks (5.2.1) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.6) thread_safe (~> 0.1) unicode-display_width (1.6.0) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) - yard (0.9.9) + websocket-extensions (0.1.4) + yard (0.9.20) zeus (0.15.14) method_source (>= 0.6.7) @@ -211,28 +208,24 @@ PLATFORMS ruby DEPENDENCIES - activerecord-jdbc-adapter - activerecord-jdbcsqlite3-adapter appraisal (= 2.2.0) bcrypt (~> 3.1.7) bundler (~> 1.1) fssm jbuilder (~> 2.5) - jdbc-sqlite3 jquery-rails - jruby-openssl listen (~> 3.0.5) - pg (~> 1.1) + pg (~> 0.18) pry pry-byebug puma (~> 3.0) pygments.rb - rails (~> 5.0.7.2) + rails (= 5.0.7.2) rails-controller-testing (>= 1.0.1) - rake (= 12.3.2) + rake (= 13.0.1) redcarpet - rspec (~> 3.6) - rspec-rails (~> 3.6) + rspec (~> 3.9) + rspec-rails (~> 3.9) rubocop rubocop-rails sass-rails (~> 5.0) @@ -241,7 +234,6 @@ DEPENDENCIES spring-commands-rspec spring-watcher-listen (~> 2.0.0) sqlite3 (~> 1.3.6) - therubyrhino turbolinks (~> 5) yard zeus diff --git a/gemfiles/rails_5_1.gemfile b/gemfiles/rails_5_1.gemfile index 42933295..7ff5c2c2 100644 --- a/gemfiles/rails_5_1.gemfile +++ b/gemfiles/rails_5_1.gemfile @@ -6,8 +6,8 @@ gem "appraisal", "2.2.0" gem "bundler", "~> 1.1" gem "pry" gem "pry-byebug" -gem "rake", "12.3.2" -gem "rspec", "~> 3.6" +gem "rake", "13.0.1" +gem "rspec", "~> 3.9" gem "rubocop", require: false gem "rubocop-rails", require: false gem "zeus", require: false @@ -15,18 +15,12 @@ gem "fssm" gem "pygments.rb" gem "redcarpet" gem "yard" -gem "activerecord-jdbc-adapter", platform: :jruby -gem "activerecord-jdbcsqlite3-adapter", platform: :jruby -gem "jdbc-sqlite3", platform: :jruby -gem "jruby-openssl", platform: :jruby -gem "therubyrhino", platform: :jruby -gem "sqlite3", "~> 1.3.6", platform: :ruby gem "spring" gem "spring-commands-rspec" -gem "rspec-rails", "~> 3.6" +gem "rspec-rails", "~> 3.9" gem "shoulda-context", "~> 1.2.0" -gem "rails", "~> 5.1.6.2" gem "rails-controller-testing", ">= 1.0.1" +gem "rails", "5.1.7" gem "puma", "~> 3.7" gem "sass-rails", "~> 5.0" gem "turbolinks", "~> 5" @@ -36,4 +30,5 @@ gem "capybara", "~> 2.13" gem "selenium-webdriver" gem "listen", ">= 3.0.5", "< 3.2" gem "spring-watcher-listen", "~> 2.0.0" -gem "pg", "~> 1.1", platform: :ruby +gem "pg", "~> 0.18" +gem "sqlite3", "~> 1.3.6" diff --git a/gemfiles/rails_5_1.gemfile.lock b/gemfiles/rails_5_1.gemfile.lock index c02cd102..7a21a895 100644 --- a/gemfiles/rails_5_1.gemfile.lock +++ b/gemfiles/rails_5_1.gemfile.lock @@ -1,55 +1,54 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.1.6.2) - actionpack (= 5.1.6.2) + actioncable (5.1.7) + actionpack (= 5.1.7) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.6.2) - actionpack (= 5.1.6.2) - actionview (= 5.1.6.2) - activejob (= 5.1.6.2) + actionmailer (5.1.7) + actionpack (= 5.1.7) + actionview (= 5.1.7) + activejob (= 5.1.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.6.2) - actionview (= 5.1.6.2) - activesupport (= 5.1.6.2) + actionpack (5.1.7) + actionview (= 5.1.7) + activesupport (= 5.1.7) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.6.2) - activesupport (= 5.1.6.2) + actionview (5.1.7) + activesupport (= 5.1.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.6.2) - activesupport (= 5.1.6.2) + activejob (5.1.7) + activesupport (= 5.1.7) globalid (>= 0.3.6) - activemodel (5.1.6.2) - activesupport (= 5.1.6.2) - activerecord (5.1.6.2) - activemodel (= 5.1.6.2) - activesupport (= 5.1.6.2) + activemodel (5.1.7) + activesupport (= 5.1.7) + activerecord (5.1.7) + activemodel (= 5.1.7) + activesupport (= 5.1.7) arel (~> 8.0) - activesupport (5.1.6.2) + activesupport (5.1.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - ansi (1.5.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) arel (8.0.0) ast (2.4.0) - bcrypt (3.1.12) - builder (3.2.3) - byebug (10.0.2) + bcrypt (3.1.13) + builder (3.2.4) + byebug (11.0.1) capybara (2.18.0) addressable mini_mime (>= 0.1.3) @@ -57,125 +56,123 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (>= 2.0, < 4.0) - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) + childprocess (3.0.0) coderay (1.1.2) concurrent-ruby (1.1.5) - crass (1.0.4) + crass (1.0.5) diff-lcs (1.3) - erubi (1.8.0) - ffi (1.9.25) + erubi (1.9.0) + ffi (1.11.3) fssm (0.2.10) globalid (0.4.2) activesupport (>= 4.2.0) - i18n (1.6.0) + i18n (1.7.0) concurrent-ruby (~> 1.0) - jaro_winkler (1.5.2) - jbuilder (2.7.0) + jaro_winkler (1.5.4) + jbuilder (2.9.1) activesupport (>= 4.2.0) - multi_json (>= 1.2) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.2.3) + loofah (2.4.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) method_source (0.9.2) - mini_mime (1.0.1) + mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.11.3) - multi_json (1.13.1) - nio4r (2.3.1) - nokogiri (1.10.3) + minitest (5.13.0) + multi_json (1.14.1) + nio4r (2.5.2) + nokogiri (1.10.7) mini_portile2 (~> 2.4.0) - parallel (1.17.0) - parser (2.6.3.0) + parallel (1.19.1) + parser (2.7.0.0) ast (~> 2.4.0) - pg (1.1.3) - pry (0.11.3) + pg (0.21.0) + pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) - pry-byebug (3.6.0) - byebug (~> 10.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) - public_suffix (3.0.3) - puma (3.12.0) + public_suffix (4.0.1) + puma (3.12.2) pygments.rb (1.2.1) multi_json (>= 1.0.0) - rack (2.0.7) + rack (2.0.8) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.1.6.2) - actioncable (= 5.1.6.2) - actionmailer (= 5.1.6.2) - actionpack (= 5.1.6.2) - actionview (= 5.1.6.2) - activejob (= 5.1.6.2) - activemodel (= 5.1.6.2) - activerecord (= 5.1.6.2) - activesupport (= 5.1.6.2) + rails (5.1.7) + actioncable (= 5.1.7) + actionmailer (= 5.1.7) + actionpack (= 5.1.7) + actionview (= 5.1.7) + activejob (= 5.1.7) + activemodel (= 5.1.7) + activerecord (= 5.1.7) + activesupport (= 5.1.7) bundler (>= 1.3.0) - railties (= 5.1.6.2) + railties (= 5.1.7) sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.2) - actionpack (~> 5.x, >= 5.0.1) - actionview (~> 5.x, >= 5.0.1) - activesupport (~> 5.x) + rails-controller-testing (1.0.4) + actionpack (>= 5.0.1.x) + actionview (>= 5.0.1.x) + activesupport (>= 5.0.1.x) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - railties (5.1.6.2) - actionpack (= 5.1.6.2) - activesupport (= 5.1.6.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (5.1.7) + actionpack (= 5.1.7) + activesupport (= 5.1.7) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) - rake (12.3.2) + rake (13.0.1) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - redcarpet (3.4.0) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.2) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + redcarpet (3.5.0) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.0) + rspec-support (~> 3.9.0) + rspec-expectations (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.1) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.9.0) + rspec-rails (3.9.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.2) - rubocop (0.71.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.0) + rubocop (0.78.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rails (2.0.1) + rubocop-rails (2.4.1) rack (>= 1.1) - rubocop (>= 0.70.0) + rubocop (>= 0.72.0) ruby-progressbar (1.10.1) ruby_dep (1.5.0) - rubyzip (1.2.2) - sass (3.5.7) + rubyzip (2.0.0) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -186,12 +183,11 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - selenium-webdriver (3.14.0) - childprocess (~> 0.5) - rubyzip (~> 1.2) + selenium-webdriver (3.142.6) + childprocess (>= 0.5, < 4.0) + rubyzip (>= 1.2.2) shoulda-context (1.2.2) - spring (2.0.2) - activesupport (>= 4.2) + spring (2.1.0) spring-commands-rspec (1.0.4) spring (>= 0.9.1) spring-watcher-listen (2.0.1) @@ -205,21 +201,21 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - thor (0.20.3) + thor (1.0.1) thread_safe (0.3.6) - tilt (2.0.8) - turbolinks (5.2.0) + tilt (2.0.10) + turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (1.2.5) + tzinfo (1.2.6) thread_safe (~> 0.1) unicode-display_width (1.6.0) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) - xpath (3.1.0) + websocket-extensions (0.1.4) + xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.16) + yard (0.9.20) zeus (0.15.14) method_source (>= 0.6.7) @@ -227,28 +223,24 @@ PLATFORMS ruby DEPENDENCIES - activerecord-jdbc-adapter - activerecord-jdbcsqlite3-adapter appraisal (= 2.2.0) bcrypt (~> 3.1.7) bundler (~> 1.1) capybara (~> 2.13) fssm jbuilder (~> 2.5) - jdbc-sqlite3 - jruby-openssl listen (>= 3.0.5, < 3.2) - pg (~> 1.1) + pg (~> 0.18) pry pry-byebug puma (~> 3.7) pygments.rb - rails (~> 5.1.6.2) + rails (= 5.1.7) rails-controller-testing (>= 1.0.1) - rake (= 12.3.2) + rake (= 13.0.1) redcarpet - rspec (~> 3.6) - rspec-rails (~> 3.6) + rspec (~> 3.9) + rspec-rails (~> 3.9) rubocop rubocop-rails sass-rails (~> 5.0) @@ -258,7 +250,6 @@ DEPENDENCIES spring-commands-rspec spring-watcher-listen (~> 2.0.0) sqlite3 (~> 1.3.6) - therubyrhino turbolinks (~> 5) yard zeus diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile index 75740d37..6d38c91c 100644 --- a/gemfiles/rails_5_2.gemfile +++ b/gemfiles/rails_5_2.gemfile @@ -6,8 +6,8 @@ gem "appraisal", "2.2.0" gem "bundler", "~> 1.1" gem "pry" gem "pry-byebug" -gem "rake", "12.3.2" -gem "rspec", "~> 3.6" +gem "rake", "13.0.1" +gem "rspec", "~> 3.9" gem "rubocop", require: false gem "rubocop-rails", require: false gem "zeus", require: false @@ -15,18 +15,12 @@ gem "fssm" gem "pygments.rb" gem "redcarpet" gem "yard" -gem "activerecord-jdbc-adapter", platform: :jruby -gem "activerecord-jdbcsqlite3-adapter", platform: :jruby -gem "jdbc-sqlite3", platform: :jruby -gem "jruby-openssl", platform: :jruby -gem "therubyrhino", platform: :jruby -gem "sqlite3", "~> 1.3.6", platform: :ruby gem "spring" gem "spring-commands-rspec" -gem "rspec-rails", "~> 3.6" +gem "rspec-rails", "~> 3.9" gem "shoulda-context", "~> 1.2.0" -gem "rails", "~> 5.2.2.1" gem "rails-controller-testing", ">= 1.0.1" +gem "rails", "5.2.4.1" gem "puma", "~> 3.11" gem "bootsnap", ">= 1.1.0", require: false gem "sass-rails", "~> 5.0" @@ -38,4 +32,5 @@ gem "selenium-webdriver" gem "chromedriver-helper" gem "listen", ">= 3.0.5", "< 3.2" gem "spring-watcher-listen", "~> 2.0.0" -gem "pg", "~> 1.1", platform: :ruby +gem "pg", "~> 0.18" +gem "sqlite3", "~> 1.3.6" diff --git a/gemfiles/rails_5_2.gemfile.lock b/gemfiles/rails_5_2.gemfile.lock index b0cf14ad..78c3f802 100644 --- a/gemfiles/rails_5_2.gemfile.lock +++ b/gemfiles/rails_5_2.gemfile.lock @@ -1,63 +1,62 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.2.1) - actionpack (= 5.2.2.1) + actioncable (5.2.4.1) + actionpack (= 5.2.4.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.2.1) - actionpack (= 5.2.2.1) - actionview (= 5.2.2.1) - activejob (= 5.2.2.1) + actionmailer (5.2.4.1) + actionpack (= 5.2.4.1) + actionview (= 5.2.4.1) + activejob (= 5.2.4.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.2.1) - actionview (= 5.2.2.1) - activesupport (= 5.2.2.1) - rack (~> 2.0) + actionpack (5.2.4.1) + actionview (= 5.2.4.1) + activesupport (= 5.2.4.1) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.2.1) - activesupport (= 5.2.2.1) + actionview (5.2.4.1) + activesupport (= 5.2.4.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.2.1) - activesupport (= 5.2.2.1) + activejob (5.2.4.1) + activesupport (= 5.2.4.1) globalid (>= 0.3.6) - activemodel (5.2.2.1) - activesupport (= 5.2.2.1) - activerecord (5.2.2.1) - activemodel (= 5.2.2.1) - activesupport (= 5.2.2.1) + activemodel (5.2.4.1) + activesupport (= 5.2.4.1) + activerecord (5.2.4.1) + activemodel (= 5.2.4.1) + activesupport (= 5.2.4.1) arel (>= 9.0) - activestorage (5.2.2.1) - actionpack (= 5.2.2.1) - activerecord (= 5.2.2.1) + activestorage (5.2.4.1) + actionpack (= 5.2.4.1) + activerecord (= 5.2.4.1) marcel (~> 0.3.1) - activesupport (5.2.2.1) + activesupport (5.2.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - ansi (1.5.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) - archive-zip (0.11.0) + archive-zip (0.12.0) io-like (~> 0.3.0) arel (9.0.0) ast (2.4.0) - bcrypt (3.1.12) - bootsnap (1.3.1) + bcrypt (3.1.13) + bootsnap (1.4.5) msgpack (~> 1.0) - builder (3.2.3) - byebug (10.0.2) + builder (3.2.4) + byebug (11.0.1) capybara (3.1.1) addressable mini_mime (>= 0.1.3) @@ -65,32 +64,30 @@ GEM rack (>= 1.6.0) rack-test (>= 0.6.3) xpath (~> 3.0) - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) - chromedriver-helper (1.2.0) + childprocess (3.0.0) + chromedriver-helper (2.1.1) archive-zip (~> 0.10) nokogiri (~> 1.8) coderay (1.1.2) concurrent-ruby (1.1.5) - crass (1.0.4) + crass (1.0.5) diff-lcs (1.3) - erubi (1.8.0) - ffi (1.9.25) + erubi (1.9.0) + ffi (1.11.3) fssm (0.2.10) globalid (0.4.2) activesupport (>= 4.2.0) - i18n (1.6.0) + i18n (1.7.0) concurrent-ruby (~> 1.0) io-like (0.3.0) - jaro_winkler (1.5.2) - jbuilder (2.7.0) + jaro_winkler (1.5.4) + jbuilder (2.9.1) activesupport (>= 4.2.0) - multi_json (>= 1.2) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.2.3) + loofah (2.4.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -99,116 +96,115 @@ GEM mimemagic (~> 0.3.2) method_source (0.9.2) mimemagic (0.3.3) - mini_mime (1.0.1) + mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.11.3) - msgpack (1.2.4) - multi_json (1.13.1) - nio4r (2.3.1) - nokogiri (1.10.3) + minitest (5.13.0) + msgpack (1.3.1) + multi_json (1.14.1) + nio4r (2.5.2) + nokogiri (1.10.7) mini_portile2 (~> 2.4.0) - parallel (1.17.0) - parser (2.6.3.0) + parallel (1.19.1) + parser (2.7.0.0) ast (~> 2.4.0) - pg (1.1.2) - pry (0.11.3) + pg (0.21.0) + pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) - pry-byebug (3.6.0) - byebug (~> 10.0) + pry-byebug (3.7.0) + byebug (~> 11.0) pry (~> 0.10) - public_suffix (3.0.3) - puma (3.12.0) + public_suffix (4.0.1) + puma (3.12.2) pygments.rb (1.2.1) multi_json (>= 1.0.0) - rack (2.0.7) + rack (2.0.8) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.2.1) - actioncable (= 5.2.2.1) - actionmailer (= 5.2.2.1) - actionpack (= 5.2.2.1) - actionview (= 5.2.2.1) - activejob (= 5.2.2.1) - activemodel (= 5.2.2.1) - activerecord (= 5.2.2.1) - activestorage (= 5.2.2.1) - activesupport (= 5.2.2.1) + rails (5.2.4.1) + actioncable (= 5.2.4.1) + actionmailer (= 5.2.4.1) + actionpack (= 5.2.4.1) + actionview (= 5.2.4.1) + activejob (= 5.2.4.1) + activemodel (= 5.2.4.1) + activerecord (= 5.2.4.1) + activestorage (= 5.2.4.1) + activesupport (= 5.2.4.1) bundler (>= 1.3.0) - railties (= 5.2.2.1) + railties (= 5.2.4.1) sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.2) - actionpack (~> 5.x, >= 5.0.1) - actionview (~> 5.x, >= 5.0.1) - activesupport (~> 5.x) + rails-controller-testing (1.0.4) + actionpack (>= 5.0.1.x) + actionview (>= 5.0.1.x) + activesupport (>= 5.0.1.x) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - railties (5.2.2.1) - actionpack (= 5.2.2.1) - activesupport (= 5.2.2.1) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (5.2.4.1) + actionpack (= 5.2.4.1) + activesupport (= 5.2.4.1) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - rake (12.3.2) + rake (13.0.1) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - redcarpet (3.4.0) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.2) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + redcarpet (3.5.0) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.0) + rspec-support (~> 3.9.0) + rspec-expectations (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.1) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.9.0) + rspec-rails (3.9.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.2) - rubocop (0.71.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.0) + rubocop (0.78.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rails (2.0.1) + rubocop-rails (2.4.1) rack (>= 1.1) - rubocop (>= 0.70.0) + rubocop (>= 0.72.0) ruby-progressbar (1.10.1) ruby_dep (1.5.0) - rubyzip (1.2.2) - sass (3.5.7) + rubyzip (2.0.0) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.7) - railties (>= 4.0.0, < 6) + sass-rails (5.1.0) + railties (>= 5.2.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - selenium-webdriver (3.14.0) - childprocess (~> 0.5) - rubyzip (~> 1.2) + selenium-webdriver (3.142.6) + childprocess (>= 0.5, < 4.0) + rubyzip (>= 1.2.2) shoulda-context (1.2.2) - spring (2.0.2) - activesupport (>= 4.2) + spring (2.1.0) spring-commands-rspec (1.0.4) spring (>= 0.9.1) spring-watcher-listen (2.0.1) @@ -222,21 +218,21 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - thor (0.20.3) + thor (1.0.1) thread_safe (0.3.6) - tilt (2.0.8) - turbolinks (5.2.0) + tilt (2.0.10) + turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (1.2.5) + tzinfo (1.2.6) thread_safe (~> 0.1) unicode-display_width (1.6.0) - websocket-driver (0.7.0) + websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) - xpath (3.1.0) + websocket-extensions (0.1.4) + xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.16) + yard (0.9.20) zeus (0.15.14) method_source (>= 0.6.7) @@ -244,8 +240,6 @@ PLATFORMS ruby DEPENDENCIES - activerecord-jdbc-adapter - activerecord-jdbcsqlite3-adapter appraisal (= 2.2.0) bcrypt (~> 3.1.7) bootsnap (>= 1.1.0) @@ -254,20 +248,18 @@ DEPENDENCIES chromedriver-helper fssm jbuilder (~> 2.5) - jdbc-sqlite3 - jruby-openssl listen (>= 3.0.5, < 3.2) - pg (~> 1.1) + pg (~> 0.18) pry pry-byebug puma (~> 3.11) pygments.rb - rails (~> 5.2.2.1) + rails (= 5.2.4.1) rails-controller-testing (>= 1.0.1) - rake (= 12.3.2) + rake (= 13.0.1) redcarpet - rspec (~> 3.6) - rspec-rails (~> 3.6) + rspec (~> 3.9) + rspec-rails (~> 3.9) rubocop rubocop-rails sass-rails (~> 5.0) @@ -277,7 +269,6 @@ DEPENDENCIES spring-commands-rspec spring-watcher-listen (~> 2.0.0) sqlite3 (~> 1.3.6) - therubyrhino turbolinks (~> 5) yard zeus diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile index 5415e171..642ff447 100644 --- a/gemfiles/rails_6_0.gemfile +++ b/gemfiles/rails_6_0.gemfile @@ -6,8 +6,8 @@ gem "appraisal", "2.2.0" gem "bundler", "~> 1.1" gem "pry" gem "pry-byebug" -gem "rake", "12.3.2" -gem "rspec", "~> 3.6" +gem "rake", "13.0.1" +gem "rspec", "~> 3.9" gem "rubocop", require: false gem "rubocop-rails", require: false gem "zeus", require: false @@ -15,28 +15,23 @@ gem "fssm" gem "pygments.rb" gem "redcarpet" gem "yard" -gem "activerecord-jdbc-adapter", platform: :jruby -gem "activerecord-jdbcsqlite3-adapter", platform: :jruby -gem "jdbc-sqlite3", platform: :jruby -gem "jruby-openssl", platform: :jruby -gem "therubyrhino", platform: :jruby -gem "sqlite3", "~> 1.3.6", platform: :ruby gem "spring" gem "spring-commands-rspec" -gem "rspec-rails", "~> 3.6" +gem "rspec-rails", "~> 3.9" gem "shoulda-context", "~> 1.2.0" -gem "rails", "~> 6.0.0.beta3" -gem "puma", "~> 3.11" -gem "bootsnap", ">= 1.4.1", require: false -gem "sass-rails", "~> 5.0" -gem "webpacker", ">= 4.0.0.rc3" +gem "rails-controller-testing", ">= 1.0.1" +gem "rails", "6.0.2.1" +gem "puma", "~> 4.1" +gem "bootsnap", ">= 1.4.2", require: false +gem "sass-rails", ">= 6" +gem "webpacker", "~> 4.0" gem "turbolinks", "~> 5" -gem "jbuilder", "~> 2.5" +gem "jbuilder", "~> 2.7" gem "bcrypt", "~> 3.1.7" gem "capybara", ">= 2.15" gem "listen", ">= 3.0.5", "< 3.2" gem "spring-watcher-listen", "~> 2.0.0" gem "selenium-webdriver" -gem "chromedriver-helper" -gem "rails-controller-testing", ">= 1.0.1" -gem "pg", "~> 1.1", platform: :ruby +gem "webdrivers" +gem "pg", ">= 0.18", "< 2.0" +gem "sqlite3", "~> 1.4" diff --git a/gemfiles/rails_6_0.gemfile.lock b/gemfiles/rails_6_0.gemfile.lock index 81cf94ba..58533230 100644 --- a/gemfiles/rails_6_0.gemfile.lock +++ b/gemfiles/rails_6_0.gemfile.lock @@ -1,109 +1,101 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.0.0.beta3) - actionpack (= 6.0.0.beta3) + actioncable (6.0.2.1) + actionpack (= 6.0.2.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.0.beta3) - actionpack (= 6.0.0.beta3) - activejob (= 6.0.0.beta3) - activerecord (= 6.0.0.beta3) - activestorage (= 6.0.0.beta3) - activesupport (= 6.0.0.beta3) + actionmailbox (6.0.2.1) + actionpack (= 6.0.2.1) + activejob (= 6.0.2.1) + activerecord (= 6.0.2.1) + activestorage (= 6.0.2.1) + activesupport (= 6.0.2.1) mail (>= 2.7.1) - actionmailer (6.0.0.beta3) - actionpack (= 6.0.0.beta3) - actionview (= 6.0.0.beta3) - activejob (= 6.0.0.beta3) + actionmailer (6.0.2.1) + actionpack (= 6.0.2.1) + actionview (= 6.0.2.1) + activejob (= 6.0.2.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.0.beta3) - actionview (= 6.0.0.beta3) - activesupport (= 6.0.0.beta3) - rack (~> 2.0) + actionpack (6.0.2.1) + actionview (= 6.0.2.1) + activesupport (= 6.0.2.1) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actiontext (6.0.0.beta3) - actionpack (= 6.0.0.beta3) - activerecord (= 6.0.0.beta3) - activestorage (= 6.0.0.beta3) - activesupport (= 6.0.0.beta3) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.2.1) + actionpack (= 6.0.2.1) + activerecord (= 6.0.2.1) + activestorage (= 6.0.2.1) + activesupport (= 6.0.2.1) nokogiri (>= 1.8.5) - actionview (6.0.0.beta3) - activesupport (= 6.0.0.beta3) + actionview (6.0.2.1) + activesupport (= 6.0.2.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (6.0.0.beta3) - activesupport (= 6.0.0.beta3) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.2.1) + activesupport (= 6.0.2.1) globalid (>= 0.3.6) - activemodel (6.0.0.beta3) - activesupport (= 6.0.0.beta3) - activerecord (6.0.0.beta3) - activemodel (= 6.0.0.beta3) - activesupport (= 6.0.0.beta3) - activestorage (6.0.0.beta3) - actionpack (= 6.0.0.beta3) - activerecord (= 6.0.0.beta3) + activemodel (6.0.2.1) + activesupport (= 6.0.2.1) + activerecord (6.0.2.1) + activemodel (= 6.0.2.1) + activesupport (= 6.0.2.1) + activestorage (6.0.2.1) + actionpack (= 6.0.2.1) + activejob (= 6.0.2.1) + activerecord (= 6.0.2.1) marcel (~> 0.3.1) - activesupport (6.0.0.beta3) + activesupport (6.0.2.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - zeitwerk (~> 1.3, >= 1.3.1) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) - ansi (1.5.0) + zeitwerk (~> 2.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) - archive-zip (0.12.0) - io-like (~> 0.3.0) ast (2.4.0) - bcrypt (3.1.12) - bootsnap (1.4.1) + bcrypt (3.1.13) + bootsnap (1.4.5) msgpack (~> 1.0) - builder (3.2.3) - byebug (11.0.0) - capybara (3.14.0) + builder (3.2.4) + byebug (11.0.1) + capybara (3.30.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) rack (>= 1.6.0) rack-test (>= 0.6.3) - regexp_parser (~> 1.2) + regexp_parser (~> 1.5) xpath (~> 3.2) - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) - chromedriver-helper (2.1.0) - archive-zip (~> 0.10) - nokogiri (~> 1.8) + childprocess (3.0.0) coderay (1.1.2) concurrent-ruby (1.1.5) - crass (1.0.4) + crass (1.0.5) diff-lcs (1.3) - erubi (1.8.0) - ffi (1.10.0) + erubi (1.9.0) + ffi (1.11.3) fssm (0.2.10) globalid (0.4.2) activesupport (>= 4.2.0) - i18n (1.6.0) + i18n (1.7.0) concurrent-ruby (~> 1.0) - io-like (0.3.0) - jaro_winkler (1.5.2) - jbuilder (2.8.0) + jaro_winkler (1.5.4) + jbuilder (2.9.1) activesupport (>= 4.2.0) - multi_json (>= 1.2) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.2.3) + loofah (2.4.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -112,47 +104,48 @@ GEM mimemagic (~> 0.3.2) method_source (0.9.2) mimemagic (0.3.3) - mini_mime (1.0.1) + mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.11.3) - msgpack (1.2.9) - multi_json (1.13.1) - nio4r (2.3.1) - nokogiri (1.10.3) + minitest (5.13.0) + msgpack (1.3.1) + multi_json (1.14.1) + nio4r (2.5.2) + nokogiri (1.10.7) mini_portile2 (~> 2.4.0) - parallel (1.17.0) - parser (2.6.3.0) + parallel (1.19.1) + parser (2.7.0.0) ast (~> 2.4.0) - pg (1.1.4) + pg (1.2.0) pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) pry-byebug (3.7.0) byebug (~> 11.0) pry (~> 0.10) - public_suffix (3.0.3) - puma (3.12.0) + public_suffix (4.0.1) + puma (4.3.1) + nio4r (~> 2.0) pygments.rb (1.2.1) multi_json (>= 1.0.0) - rack (2.0.7) + rack (2.0.8) rack-proxy (0.6.5) rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.0.beta3) - actioncable (= 6.0.0.beta3) - actionmailbox (= 6.0.0.beta3) - actionmailer (= 6.0.0.beta3) - actionpack (= 6.0.0.beta3) - actiontext (= 6.0.0.beta3) - actionview (= 6.0.0.beta3) - activejob (= 6.0.0.beta3) - activemodel (= 6.0.0.beta3) - activerecord (= 6.0.0.beta3) - activestorage (= 6.0.0.beta3) - activesupport (= 6.0.0.beta3) + rails (6.0.2.1) + actioncable (= 6.0.2.1) + actionmailbox (= 6.0.2.1) + actionmailer (= 6.0.2.1) + actionpack (= 6.0.2.1) + actiontext (= 6.0.2.1) + actionview (= 6.0.2.1) + activejob (= 6.0.2.1) + activemodel (= 6.0.2.1) + activerecord (= 6.0.2.1) + activestorage (= 6.0.2.1) + activesupport (= 6.0.2.1) bundler (>= 1.3.0) - railties (= 6.0.0.beta3) + railties (= 6.0.2.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.4) actionpack (>= 5.0.1.x) @@ -161,105 +154,107 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - railties (6.0.0.beta3) - actionpack (= 6.0.0.beta3) - activesupport (= 6.0.0.beta3) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (6.0.2.1) + actionpack (= 6.0.2.1) + activesupport (= 6.0.2.1) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.0.0) - rake (12.3.2) + rake (13.0.1) rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rb-inotify (0.10.1) ffi (~> 1.0) - redcarpet (3.4.0) - regexp_parser (1.3.0) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.2) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.4) + redcarpet (3.5.0) + regexp_parser (1.6.0) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.0) + rspec-support (~> 3.9.0) + rspec-expectations (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.1) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.9.0) + rspec-rails (3.9.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.2) - rubocop (0.71.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.0) + rubocop (0.78.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.6) rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rails (2.0.1) + rubocop-rails (2.4.1) rack (>= 1.1) - rubocop (>= 0.70.0) + rubocop (>= 0.72.0) ruby-progressbar (1.10.1) ruby_dep (1.5.0) - rubyzip (1.2.2) - sass (3.7.3) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.7) - railties (>= 4.0.0, < 6) - sass (~> 3.1) - sprockets (>= 2.8, < 4.0) - sprockets-rails (>= 2.0, < 4.0) - tilt (>= 1.1, < 3) - selenium-webdriver (3.141.0) - childprocess (~> 0.5) - rubyzip (~> 1.2, >= 1.2.2) + rubyzip (2.0.0) + sass-rails (6.0.0) + sassc-rails (~> 2.1, >= 2.1.1) + sassc (2.2.1) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt + selenium-webdriver (3.142.6) + childprocess (>= 0.5, < 4.0) + rubyzip (>= 1.2.2) shoulda-context (1.2.2) - spring (2.0.2) - activesupport (>= 4.2) + spring (2.1.0) spring-commands-rspec (1.0.4) spring (>= 0.9.1) spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) - sprockets (3.7.2) + sprockets (4.0.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.13) - thor (0.20.3) + sqlite3 (1.4.2) + thor (1.0.1) thread_safe (0.3.6) - tilt (2.0.9) - turbolinks (5.2.0) + tilt (2.0.10) + turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (1.2.5) + tzinfo (1.2.6) thread_safe (~> 0.1) unicode-display_width (1.6.0) - webpacker (4.0.2) + webdrivers (4.1.3) + nokogiri (~> 1.6) + rubyzip (>= 1.3.0) + selenium-webdriver (>= 3.0, < 4.0) + webpacker (4.2.2) activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) - websocket-driver (0.7.0) + websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) + websocket-extensions (0.1.4) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.18) - zeitwerk (1.4.3) + yard (0.9.20) + zeitwerk (2.2.2) zeus (0.15.14) method_source (>= 0.6.7) @@ -267,42 +262,37 @@ PLATFORMS ruby DEPENDENCIES - activerecord-jdbc-adapter - activerecord-jdbcsqlite3-adapter appraisal (= 2.2.0) bcrypt (~> 3.1.7) - bootsnap (>= 1.4.1) + bootsnap (>= 1.4.2) bundler (~> 1.1) capybara (>= 2.15) - chromedriver-helper fssm - jbuilder (~> 2.5) - jdbc-sqlite3 - jruby-openssl + jbuilder (~> 2.7) listen (>= 3.0.5, < 3.2) - pg (~> 1.1) + pg (>= 0.18, < 2.0) pry pry-byebug - puma (~> 3.11) + puma (~> 4.1) pygments.rb - rails (~> 6.0.0.beta3) + rails (= 6.0.2.1) rails-controller-testing (>= 1.0.1) - rake (= 12.3.2) + rake (= 13.0.1) redcarpet - rspec (~> 3.6) - rspec-rails (~> 3.6) + rspec (~> 3.9) + rspec-rails (~> 3.9) rubocop rubocop-rails - sass-rails (~> 5.0) + sass-rails (>= 6) selenium-webdriver shoulda-context (~> 1.2.0) spring spring-commands-rspec spring-watcher-listen (~> 2.0.0) - sqlite3 (~> 1.3.6) - therubyrhino + sqlite3 (~> 1.4) turbolinks (~> 5) - webpacker (>= 4.0.0.rc3) + webdrivers + webpacker (~> 4.0) yard zeus diff --git a/spec/acceptance/active_model_integration_spec.rb b/spec/acceptance/active_model_integration_spec.rb index 1c9042e9..e55fab5c 100644 --- a/spec/acceptance/active_model_integration_spec.rb +++ b/spec/acceptance/active_model_integration_spec.rb @@ -6,7 +6,7 @@ describe 'shoulda-matchers integrates with an ActiveModel project' do add_shoulda_matchers_to_project( test_frameworks: [:rspec], - libraries: [:active_model] + libraries: [:active_model], ) write_file 'load_dependencies.rb', <<-FILE diff --git a/spec/acceptance/independent_matchers_spec.rb b/spec/acceptance/independent_matchers_spec.rb index 59e3c889..6b94aa28 100644 --- a/spec/acceptance/independent_matchers_spec.rb +++ b/spec/acceptance/independent_matchers_spec.rb @@ -9,7 +9,7 @@ describe 'shoulda-matchers has independent matchers, specifically delegate_metho add_shoulda_context_to_project(manually: true) add_shoulda_matchers_to_project( test_frameworks: [default_test_framework], - manually: true + manually: true, ) end @@ -56,7 +56,7 @@ describe 'shoulda-matchers has independent matchers, specifically delegate_metho expect(result).to indicate_number_of_tests_was_run(1) expect(result).to have_output( - 'Courier should delegate #deliver to the #post_office object' + 'Courier should delegate #deliver to the #post_office object', ) end @@ -67,7 +67,7 @@ describe 'shoulda-matchers has independent matchers, specifically delegate_metho add_rspec_to_project add_shoulda_matchers_to_project( manually: true, - with_configuration: false + with_configuration: false, ) write_file 'spec/spec_helper.rb', <<-FILE require 'shoulda/matchers/independent' @@ -119,7 +119,7 @@ describe 'shoulda-matchers has independent matchers, specifically delegate_metho expect(result).to indicate_number_of_tests_was_run(1) expect(result).to have_output( - /Courier\s+should delegate #deliver to the #post_office object/ + /Courier\s+is expected to delegate #deliver to the #post_office object/, ) end end diff --git a/spec/acceptance/multiple_libraries_integration_spec.rb b/spec/acceptance/multiple_libraries_integration_spec.rb index 376e1291..b4daa020 100644 --- a/spec/acceptance/multiple_libraries_integration_spec.rb +++ b/spec/acceptance/multiple_libraries_integration_spec.rb @@ -14,7 +14,7 @@ describe 'shoulda-matchers integrates with multiple libraries' do end FILE - run_rake_tasks!(*%w(db:drop db:create db:migrate)) + run_rake_tasks!('db:drop', 'db:create', 'db:migrate') write_file 'app/models/user.rb', <<-FILE class User < ActiveRecord::Base @@ -35,7 +35,7 @@ describe 'shoulda-matchers integrates with multiple libraries' do add_rspec_rails_to_project! add_shoulda_matchers_to_project( test_frameworks: [:rspec], - libraries: [:active_record, :active_model] + libraries: [:active_record, :active_model], ) end end @@ -45,10 +45,10 @@ describe 'shoulda-matchers integrates with multiple libraries' do result = run_rspec_suite expect(result).to have_output('2 examples, 0 failures') expect(result).to have_output( - 'should validate that :name cannot be empty/falsy' + 'is expected to validate that :name cannot be empty/falsy', ) expect(result).to have_output( - 'should validate that :name is case-sensitively unique' + 'is expected to validate that :name is case-sensitively unique', ) end end diff --git a/spec/acceptance/rails_integration_spec.rb b/spec/acceptance/rails_integration_spec.rb index 79d6e197..eca9f9c2 100644 --- a/spec/acceptance/rails_integration_spec.rb +++ b/spec/acceptance/rails_integration_spec.rb @@ -14,7 +14,7 @@ describe 'shoulda-matchers integrates with Rails' do end FILE - run_rake_tasks!(*%w(db:drop db:create db:migrate)) + run_rake_tasks!('db:drop', 'db:create', 'db:migrate') write_file 'app/models/user.rb', <<-FILE class User < ActiveRecord::Base @@ -39,7 +39,7 @@ describe 'shoulda-matchers integrates with Rails' do add_gems_for_n_unit add_shoulda_matchers_to_project( test_frameworks: [default_test_framework], - libraries: [:rails] + libraries: [:rails], ) end @@ -51,7 +51,7 @@ describe 'shoulda-matchers integrates with Rails' do add_gems_for_rspec add_shoulda_matchers_to_project( test_frameworks: [:rspec], - libraries: [:rails] + libraries: [:rails], ) end @@ -69,7 +69,7 @@ describe 'shoulda-matchers integrates with Rails' do add_shoulda_matchers_to_project( test_frameworks: [:rspec], libraries: [:rails], - manually: true + manually: true, ) end @@ -84,7 +84,7 @@ describe 'shoulda-matchers integrates with Rails' do add_gems_for_rspec add_shoulda_matchers_to_project( test_frameworks: [:rspec, nil], - libraries: [:rails] + libraries: [:rails], ) end @@ -125,7 +125,7 @@ describe 'shoulda-matchers integrates with Rails' do expect(result).to indicate_that_tests_were_run(unit: 1, functional: 1) expect(result).to have_output( - 'User should validate that :name cannot be empty/falsy' + 'User should validate that :name cannot be empty/falsy', ) expect(result).to have_output('should respond with 200') end @@ -149,8 +149,8 @@ describe 'shoulda-matchers integrates with Rails' do expect(result).to have_output('2 examples, 0 failures') expect(result).to have_output( - 'should validate that :name cannot be empty/falsy' + 'is expected to validate that :name cannot be empty/falsy', ) - expect(result).to have_output('should respond with 200') + expect(result).to have_output('is expected to respond with 200') end end diff --git a/spec/support/acceptance/helpers/step_helpers.rb b/spec/support/acceptance/helpers/step_helpers.rb index b399f60a..d0bbd3c1 100644 --- a/spec/support/acceptance/helpers/step_helpers.rb +++ b/spec/support/acceptance/helpers/step_helpers.rb @@ -73,8 +73,6 @@ module AcceptanceTests bundle.remove_gem 'byebug' bundle.remove_gem 'web-console' bundle.add_gem 'pg' - bundle.remove_gem 'sqlite3' - bundle.add_gem 'sqlite3', '~> 1.3.6' end fs.open('config/database.yml', 'w') do |file|