diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 953cc7013..05f28dd76 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,11 +14,11 @@ jobs: strategy: fail-fast: false matrix: - ruby: ['2.4', '2.5', '2.6'] + ruby: [2.6] steps: - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v2 - name: Setup Ruby uses: ruby/setup-ruby@v1 diff --git a/spec/integration/integration_helper.rb b/spec/integration/integration_helper.rb index 79ce49a50..51ca8c026 100644 --- a/spec/integration/integration_helper.rb +++ b/spec/integration/integration_helper.rb @@ -1,7 +1,7 @@ class IntegrationHelper MIN_RUBY_VERSIONS = { - 'rails_5.2.4.1' => '>= 2.2.2', - 'rails_6.0.2.1' => '>= 2.5.0' + 'rails_5.2.5' => '>= 2.2.2', + 'rails_6.1.3.1' => '>= 2.5.0' }.freeze def self.able_to_run?(file_path, ruby_version) diff --git a/spec/integration/rails_5.2.4.1/.gitignore b/spec/integration/rails_5.2.5/.gitignore similarity index 100% rename from spec/integration/rails_5.2.4.1/.gitignore rename to spec/integration/rails_5.2.5/.gitignore diff --git a/spec/integration/rails_5.2.4.1/Gemfile b/spec/integration/rails_5.2.5/Gemfile similarity index 92% rename from spec/integration/rails_5.2.4.1/Gemfile rename to spec/integration/rails_5.2.5/Gemfile index bf49d057f..a2cb2d001 100644 --- a/spec/integration/rails_5.2.4.1/Gemfile +++ b/spec/integration/rails_5.2.5/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 5.2.4', '>= 5.2.4.1' +gem 'rails', '~> 5.2.5' # Use sqlite3 as the database for Active Record gem 'sqlite3' # Use Puma as the app server @@ -51,8 +51,8 @@ group :test do # Adds support for Capybara system testing and selenium driver gem 'capybara', '>= 2.15' gem 'selenium-webdriver' - # Easy installation and use of chromedriver to run system tests with Chrome - gem 'chromedriver-helper' + # Easy installation and use of webdrivers to run system tests with Chrome + gem 'webdrivers' end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem diff --git a/spec/integration/rails_5.2.4.1/Gemfile.lock b/spec/integration/rails_5.2.5/Gemfile.lock similarity index 66% rename from spec/integration/rails_5.2.4.1/Gemfile.lock rename to spec/integration/rails_5.2.5/Gemfile.lock index 46eead470..6296eb65d 100644 --- a/spec/integration/rails_5.2.4.1/Gemfile.lock +++ b/spec/integration/rails_5.2.5/Gemfile.lock @@ -8,51 +8,49 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (5.2.4.1) - actionpack (= 5.2.4.1) + actioncable (5.2.5) + actionpack (= 5.2.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.4.1) - actionpack (= 5.2.4.1) - actionview (= 5.2.4.1) - activejob (= 5.2.4.1) + actionmailer (5.2.5) + actionpack (= 5.2.5) + actionview (= 5.2.5) + activejob (= 5.2.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.4.1) - actionview (= 5.2.4.1) - activesupport (= 5.2.4.1) + actionpack (5.2.5) + actionview (= 5.2.5) + activesupport (= 5.2.5) 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.4.1) - activesupport (= 5.2.4.1) + actionview (5.2.5) + activesupport (= 5.2.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.4.1) - activesupport (= 5.2.4.1) + activejob (5.2.5) + activesupport (= 5.2.5) globalid (>= 0.3.6) - 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) + activemodel (5.2.5) + activesupport (= 5.2.5) + activerecord (5.2.5) + activemodel (= 5.2.5) + activesupport (= 5.2.5) arel (>= 9.0) - activestorage (5.2.4.1) - actionpack (= 5.2.4.1) - activerecord (= 5.2.4.1) - marcel (~> 0.3.1) - activesupport (5.2.4.1) + activestorage (5.2.5) + actionpack (= 5.2.5) + activerecord (= 5.2.5) + marcel (~> 1.0.0) + activesupport (5.2.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - archive-zip (0.12.0) - io-like (~> 0.3.0) arel (9.0.0) bindex (0.8.1) bootsnap (1.4.5) @@ -68,9 +66,6 @@ GEM regexp_parser (~> 1.5) xpath (~> 3.2) childprocess (3.0.0) - chromedriver-helper (2.1.1) - archive-zip (~> 0.10) - nokogiri (~> 1.8) coffee-rails (4.2.2) coffee-script (>= 2.2.0) railties (>= 4.0.0) @@ -78,69 +73,68 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.8) crass (1.0.6) - erubi (1.9.0) + erubi (1.10.0) execjs (2.7.0) ffi (1.12.2) globalid (0.4.2) activesupport (>= 4.2.0) - i18n (1.8.2) + i18n (1.8.9) concurrent-ruby (~> 1.0) - io-like (0.3.0) jbuilder (2.9.1) activesupport (>= 4.2.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.4.0) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) - method_source (0.9.2) - mimemagic (0.3.4) - mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.0) + marcel (1.0.0) + method_source (1.0.0) + mini_mime (1.0.3) + mini_portile2 (2.5.0) + minitest (5.14.4) msgpack (1.3.2) - nio4r (2.5.2) - nokogiri (1.10.8) - mini_portile2 (~> 2.4.0) + nio4r (2.5.7) + nokogiri (1.11.2) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) public_suffix (4.0.3) puma (4.3.3) nio4r (~> 2.0) - rack (2.1.2) + racc (1.5.2) + rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) - 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) + rails (5.2.5) + actioncable (= 5.2.5) + actionmailer (= 5.2.5) + actionpack (= 5.2.5) + actionview (= 5.2.5) + activejob (= 5.2.5) + activemodel (= 5.2.5) + activerecord (= 5.2.5) + activestorage (= 5.2.5) + activesupport (= 5.2.5) bundler (>= 1.3.0) - railties (= 5.2.4.1) + railties (= 5.2.5) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (5.2.4.1) - actionpack (= 5.2.4.1) - activesupport (= 5.2.4.1) + railties (5.2.5) + actionpack (= 5.2.5) + activesupport (= 5.2.5) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (13.0.1) + rake (13.0.3) rb-fsevent (0.10.3) rb-inotify (0.10.1) ffi (~> 1.0) @@ -164,18 +158,18 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.1) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.4.2) - thor (1.0.1) + thor (1.1.0) thread_safe (0.3.6) tilt (2.0.10) turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (1.2.6) + tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) @@ -184,9 +178,13 @@ GEM activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) - websocket-driver (0.7.1) + webdrivers (4.6.0) + nokogiri (~> 1.6) + rubyzip (>= 1.3.0) + selenium-webdriver (>= 3.0, < 4.0) + websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.4) + websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) @@ -198,12 +196,11 @@ DEPENDENCIES bootsnap (>= 1.1.0) byebug capybara (>= 2.15) - chromedriver-helper coffee-rails (~> 4.2) jbuilder (~> 2.5) listen (>= 3.0.5, < 3.2) puma (~> 4.3) - rails (~> 5.2.4, >= 5.2.4.1) + rails (~> 5.2.5) sass-rails (~> 5.0) selenium-webdriver sqlite3 @@ -211,6 +208,7 @@ DEPENDENCIES tzinfo-data uglifier (>= 1.3.0) web-console (>= 3.3.0) + webdrivers BUNDLED WITH - 2.1.2 + 2.1.4 diff --git a/spec/integration/rails_5.2.4.1/README.md b/spec/integration/rails_5.2.5/README.md similarity index 100% rename from spec/integration/rails_5.2.4.1/README.md rename to spec/integration/rails_5.2.5/README.md diff --git a/spec/integration/rails_5.2.4.1/Rakefile b/spec/integration/rails_5.2.5/Rakefile similarity index 100% rename from spec/integration/rails_5.2.4.1/Rakefile rename to spec/integration/rails_5.2.5/Rakefile diff --git a/spec/integration/rails_5.2.4.1/app/assets/config/manifest.js b/spec/integration/rails_5.2.5/app/assets/config/manifest.js similarity index 100% rename from spec/integration/rails_5.2.4.1/app/assets/config/manifest.js rename to spec/integration/rails_5.2.5/app/assets/config/manifest.js diff --git a/spec/integration/rails_5.2.4.1/app/assets/images/.keep b/spec/integration/rails_5.2.5/app/assets/images/.keep similarity index 100% rename from spec/integration/rails_5.2.4.1/app/assets/images/.keep rename to spec/integration/rails_5.2.5/app/assets/images/.keep diff --git a/spec/integration/rails_5.2.4.1/app/assets/javascripts/application.js b/spec/integration/rails_5.2.5/app/assets/javascripts/application.js similarity index 100% rename from spec/integration/rails_5.2.4.1/app/assets/javascripts/application.js rename to spec/integration/rails_5.2.5/app/assets/javascripts/application.js diff --git a/spec/integration/rails_5.2.4.1/app/assets/javascripts/cable.js b/spec/integration/rails_5.2.5/app/assets/javascripts/cable.js similarity index 100% rename from spec/integration/rails_5.2.4.1/app/assets/javascripts/cable.js rename to spec/integration/rails_5.2.5/app/assets/javascripts/cable.js diff --git a/spec/integration/rails_5.2.4.1/app/assets/javascripts/channels/.keep b/spec/integration/rails_5.2.5/app/assets/javascripts/channels/.keep similarity index 100% rename from spec/integration/rails_5.2.4.1/app/assets/javascripts/channels/.keep rename to spec/integration/rails_5.2.5/app/assets/javascripts/channels/.keep diff --git a/spec/integration/rails_5.2.4.1/app/assets/stylesheets/application.css b/spec/integration/rails_5.2.5/app/assets/stylesheets/application.css similarity index 100% rename from spec/integration/rails_5.2.4.1/app/assets/stylesheets/application.css rename to spec/integration/rails_5.2.5/app/assets/stylesheets/application.css diff --git a/spec/integration/rails_5.2.4.1/app/channels/application_cable/channel.rb b/spec/integration/rails_5.2.5/app/channels/application_cable/channel.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/app/channels/application_cable/channel.rb rename to spec/integration/rails_5.2.5/app/channels/application_cable/channel.rb diff --git a/spec/integration/rails_5.2.4.1/app/channels/application_cable/connection.rb b/spec/integration/rails_5.2.5/app/channels/application_cable/connection.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/app/channels/application_cable/connection.rb rename to spec/integration/rails_5.2.5/app/channels/application_cable/connection.rb diff --git a/spec/integration/rails_5.2.4.1/app/controllers/application_controller.rb b/spec/integration/rails_5.2.5/app/controllers/application_controller.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/app/controllers/application_controller.rb rename to spec/integration/rails_5.2.5/app/controllers/application_controller.rb diff --git a/spec/integration/rails_5.2.4.1/app/controllers/concerns/.keep b/spec/integration/rails_5.2.5/app/controllers/concerns/.keep similarity index 100% rename from spec/integration/rails_5.2.4.1/app/controllers/concerns/.keep rename to spec/integration/rails_5.2.5/app/controllers/concerns/.keep diff --git a/spec/integration/rails_5.2.4.1/app/helpers/application_helper.rb b/spec/integration/rails_5.2.5/app/helpers/application_helper.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/app/helpers/application_helper.rb rename to spec/integration/rails_5.2.5/app/helpers/application_helper.rb diff --git a/spec/integration/rails_5.2.4.1/app/jobs/application_job.rb b/spec/integration/rails_5.2.5/app/jobs/application_job.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/app/jobs/application_job.rb rename to spec/integration/rails_5.2.5/app/jobs/application_job.rb diff --git a/spec/integration/rails_5.2.4.1/app/mailers/application_mailer.rb b/spec/integration/rails_5.2.5/app/mailers/application_mailer.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/app/mailers/application_mailer.rb rename to spec/integration/rails_5.2.5/app/mailers/application_mailer.rb diff --git a/spec/integration/rails_5.2.4.1/app/models/application_record.rb b/spec/integration/rails_5.2.5/app/models/application_record.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/app/models/application_record.rb rename to spec/integration/rails_5.2.5/app/models/application_record.rb diff --git a/spec/integration/rails_5.2.4.1/app/models/concerns/.keep b/spec/integration/rails_5.2.5/app/models/concerns/.keep similarity index 100% rename from spec/integration/rails_5.2.4.1/app/models/concerns/.keep rename to spec/integration/rails_5.2.5/app/models/concerns/.keep diff --git a/spec/integration/rails_5.2.4.1/app/models/task.rb b/spec/integration/rails_5.2.5/app/models/task.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/app/models/task.rb rename to spec/integration/rails_5.2.5/app/models/task.rb diff --git a/spec/integration/rails_5.2.4.1/app/views/layouts/application.html.erb b/spec/integration/rails_5.2.5/app/views/layouts/application.html.erb similarity index 100% rename from spec/integration/rails_5.2.4.1/app/views/layouts/application.html.erb rename to spec/integration/rails_5.2.5/app/views/layouts/application.html.erb diff --git a/spec/integration/rails_5.2.4.1/app/views/layouts/mailer.html.erb b/spec/integration/rails_5.2.5/app/views/layouts/mailer.html.erb similarity index 100% rename from spec/integration/rails_5.2.4.1/app/views/layouts/mailer.html.erb rename to spec/integration/rails_5.2.5/app/views/layouts/mailer.html.erb diff --git a/spec/integration/rails_5.2.4.1/app/views/layouts/mailer.text.erb b/spec/integration/rails_5.2.5/app/views/layouts/mailer.text.erb similarity index 100% rename from spec/integration/rails_5.2.4.1/app/views/layouts/mailer.text.erb rename to spec/integration/rails_5.2.5/app/views/layouts/mailer.text.erb diff --git a/spec/integration/rails_5.2.4.1/bin/bundle b/spec/integration/rails_5.2.5/bin/bundle similarity index 100% rename from spec/integration/rails_5.2.4.1/bin/bundle rename to spec/integration/rails_5.2.5/bin/bundle diff --git a/spec/integration/rails_5.2.4.1/bin/rails b/spec/integration/rails_5.2.5/bin/rails similarity index 100% rename from spec/integration/rails_5.2.4.1/bin/rails rename to spec/integration/rails_5.2.5/bin/rails diff --git a/spec/integration/rails_5.2.4.1/bin/rake b/spec/integration/rails_5.2.5/bin/rake similarity index 100% rename from spec/integration/rails_5.2.4.1/bin/rake rename to spec/integration/rails_5.2.5/bin/rake diff --git a/spec/integration/rails_5.2.4.1/bin/setup b/spec/integration/rails_5.2.5/bin/setup similarity index 100% rename from spec/integration/rails_5.2.4.1/bin/setup rename to spec/integration/rails_5.2.5/bin/setup diff --git a/spec/integration/rails_5.2.4.1/bin/update b/spec/integration/rails_5.2.5/bin/update similarity index 100% rename from spec/integration/rails_5.2.4.1/bin/update rename to spec/integration/rails_5.2.5/bin/update diff --git a/spec/integration/rails_5.2.4.1/bin/yarn b/spec/integration/rails_5.2.5/bin/yarn similarity index 100% rename from spec/integration/rails_5.2.4.1/bin/yarn rename to spec/integration/rails_5.2.5/bin/yarn diff --git a/spec/integration/rails_5.2.4.1/config.ru b/spec/integration/rails_5.2.5/config.ru similarity index 100% rename from spec/integration/rails_5.2.4.1/config.ru rename to spec/integration/rails_5.2.5/config.ru diff --git a/spec/integration/rails_5.2.4.1/config/application.rb b/spec/integration/rails_5.2.5/config/application.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/config/application.rb rename to spec/integration/rails_5.2.5/config/application.rb diff --git a/spec/integration/rails_5.2.4.1/config/boot.rb b/spec/integration/rails_5.2.5/config/boot.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/config/boot.rb rename to spec/integration/rails_5.2.5/config/boot.rb diff --git a/spec/integration/rails_5.2.4.1/config/cable.yml b/spec/integration/rails_5.2.5/config/cable.yml similarity index 100% rename from spec/integration/rails_5.2.4.1/config/cable.yml rename to spec/integration/rails_5.2.5/config/cable.yml diff --git a/spec/integration/rails_5.2.4.1/config/credentials.yml.enc b/spec/integration/rails_5.2.5/config/credentials.yml.enc similarity index 100% rename from spec/integration/rails_5.2.4.1/config/credentials.yml.enc rename to spec/integration/rails_5.2.5/config/credentials.yml.enc diff --git a/spec/integration/rails_5.2.4.1/config/database.yml b/spec/integration/rails_5.2.5/config/database.yml similarity index 100% rename from spec/integration/rails_5.2.4.1/config/database.yml rename to spec/integration/rails_5.2.5/config/database.yml diff --git a/spec/integration/rails_5.2.4.1/config/environment.rb b/spec/integration/rails_5.2.5/config/environment.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/config/environment.rb rename to spec/integration/rails_5.2.5/config/environment.rb diff --git a/spec/integration/rails_5.2.4.1/config/environments/development.rb b/spec/integration/rails_5.2.5/config/environments/development.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/config/environments/development.rb rename to spec/integration/rails_5.2.5/config/environments/development.rb diff --git a/spec/integration/rails_5.2.4.1/config/environments/production.rb b/spec/integration/rails_5.2.5/config/environments/production.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/config/environments/production.rb rename to spec/integration/rails_5.2.5/config/environments/production.rb diff --git a/spec/integration/rails_5.2.4.1/config/environments/test.rb b/spec/integration/rails_5.2.5/config/environments/test.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/config/environments/test.rb rename to spec/integration/rails_5.2.5/config/environments/test.rb diff --git a/spec/integration/rails_5.2.4.1/config/initializers/application_controller_renderer.rb b/spec/integration/rails_5.2.5/config/initializers/application_controller_renderer.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/config/initializers/application_controller_renderer.rb rename to spec/integration/rails_5.2.5/config/initializers/application_controller_renderer.rb diff --git a/spec/integration/rails_5.2.4.1/config/initializers/assets.rb b/spec/integration/rails_5.2.5/config/initializers/assets.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/config/initializers/assets.rb rename to spec/integration/rails_5.2.5/config/initializers/assets.rb diff --git a/spec/integration/rails_5.2.4.1/config/initializers/backtrace_silencers.rb b/spec/integration/rails_5.2.5/config/initializers/backtrace_silencers.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/config/initializers/backtrace_silencers.rb rename to spec/integration/rails_5.2.5/config/initializers/backtrace_silencers.rb diff --git a/spec/integration/rails_5.2.4.1/config/initializers/content_security_policy.rb b/spec/integration/rails_5.2.5/config/initializers/content_security_policy.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/config/initializers/content_security_policy.rb rename to spec/integration/rails_5.2.5/config/initializers/content_security_policy.rb diff --git a/spec/integration/rails_5.2.4.1/config/initializers/cookies_serializer.rb b/spec/integration/rails_5.2.5/config/initializers/cookies_serializer.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/config/initializers/cookies_serializer.rb rename to spec/integration/rails_5.2.5/config/initializers/cookies_serializer.rb diff --git a/spec/integration/rails_5.2.4.1/config/initializers/filter_parameter_logging.rb b/spec/integration/rails_5.2.5/config/initializers/filter_parameter_logging.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/config/initializers/filter_parameter_logging.rb rename to spec/integration/rails_5.2.5/config/initializers/filter_parameter_logging.rb diff --git a/spec/integration/rails_5.2.4.1/config/initializers/inflections.rb b/spec/integration/rails_5.2.5/config/initializers/inflections.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/config/initializers/inflections.rb rename to spec/integration/rails_5.2.5/config/initializers/inflections.rb diff --git a/spec/integration/rails_5.2.4.1/config/initializers/mime_types.rb b/spec/integration/rails_5.2.5/config/initializers/mime_types.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/config/initializers/mime_types.rb rename to spec/integration/rails_5.2.5/config/initializers/mime_types.rb diff --git a/spec/integration/rails_5.2.4.1/config/initializers/wrap_parameters.rb b/spec/integration/rails_5.2.5/config/initializers/wrap_parameters.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/config/initializers/wrap_parameters.rb rename to spec/integration/rails_5.2.5/config/initializers/wrap_parameters.rb diff --git a/spec/integration/rails_5.2.4.1/config/locales/en.yml b/spec/integration/rails_5.2.5/config/locales/en.yml similarity index 100% rename from spec/integration/rails_5.2.4.1/config/locales/en.yml rename to spec/integration/rails_5.2.5/config/locales/en.yml diff --git a/spec/integration/rails_5.2.4.1/config/puma.rb b/spec/integration/rails_5.2.5/config/puma.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/config/puma.rb rename to spec/integration/rails_5.2.5/config/puma.rb diff --git a/spec/integration/rails_5.2.4.1/config/routes.rb b/spec/integration/rails_5.2.5/config/routes.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/config/routes.rb rename to spec/integration/rails_5.2.5/config/routes.rb diff --git a/spec/integration/rails_5.2.4.1/config/spring.rb b/spec/integration/rails_5.2.5/config/spring.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/config/spring.rb rename to spec/integration/rails_5.2.5/config/spring.rb diff --git a/spec/integration/rails_5.2.4.1/config/storage.yml b/spec/integration/rails_5.2.5/config/storage.yml similarity index 100% rename from spec/integration/rails_5.2.4.1/config/storage.yml rename to spec/integration/rails_5.2.5/config/storage.yml diff --git a/spec/integration/rails_5.2.4.1/db/migrate/20200204052946_create_tasks.rb b/spec/integration/rails_5.2.5/db/migrate/20200204052946_create_tasks.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/db/migrate/20200204052946_create_tasks.rb rename to spec/integration/rails_5.2.5/db/migrate/20200204052946_create_tasks.rb diff --git a/spec/integration/rails_5.2.4.1/db/schema.rb b/spec/integration/rails_5.2.5/db/schema.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/db/schema.rb rename to spec/integration/rails_5.2.5/db/schema.rb diff --git a/spec/integration/rails_5.2.4.1/db/seeds.rb b/spec/integration/rails_5.2.5/db/seeds.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/db/seeds.rb rename to spec/integration/rails_5.2.5/db/seeds.rb diff --git a/spec/integration/rails_5.2.4.1/lib/assets/.keep b/spec/integration/rails_5.2.5/lib/assets/.keep similarity index 100% rename from spec/integration/rails_5.2.4.1/lib/assets/.keep rename to spec/integration/rails_5.2.5/lib/assets/.keep diff --git a/spec/integration/rails_5.2.4.1/lib/tasks/.keep b/spec/integration/rails_5.2.5/lib/tasks/.keep similarity index 100% rename from spec/integration/rails_5.2.4.1/lib/tasks/.keep rename to spec/integration/rails_5.2.5/lib/tasks/.keep diff --git a/spec/integration/rails_5.2.4.1/log/.keep b/spec/integration/rails_5.2.5/log/.keep similarity index 100% rename from spec/integration/rails_5.2.4.1/log/.keep rename to spec/integration/rails_5.2.5/log/.keep diff --git a/spec/integration/rails_5.2.4.1/package.json b/spec/integration/rails_5.2.5/package.json similarity index 100% rename from spec/integration/rails_5.2.4.1/package.json rename to spec/integration/rails_5.2.5/package.json diff --git a/spec/integration/rails_5.2.4.1/public/404.html b/spec/integration/rails_5.2.5/public/404.html similarity index 100% rename from spec/integration/rails_5.2.4.1/public/404.html rename to spec/integration/rails_5.2.5/public/404.html diff --git a/spec/integration/rails_5.2.4.1/public/422.html b/spec/integration/rails_5.2.5/public/422.html similarity index 100% rename from spec/integration/rails_5.2.4.1/public/422.html rename to spec/integration/rails_5.2.5/public/422.html diff --git a/spec/integration/rails_5.2.4.1/public/500.html b/spec/integration/rails_5.2.5/public/500.html similarity index 100% rename from spec/integration/rails_5.2.4.1/public/500.html rename to spec/integration/rails_5.2.5/public/500.html diff --git a/spec/integration/rails_5.2.4.1/public/apple-touch-icon-precomposed.png b/spec/integration/rails_5.2.5/public/apple-touch-icon-precomposed.png similarity index 100% rename from spec/integration/rails_5.2.4.1/public/apple-touch-icon-precomposed.png rename to spec/integration/rails_5.2.5/public/apple-touch-icon-precomposed.png diff --git a/spec/integration/rails_5.2.4.1/public/apple-touch-icon.png b/spec/integration/rails_5.2.5/public/apple-touch-icon.png similarity index 100% rename from spec/integration/rails_5.2.4.1/public/apple-touch-icon.png rename to spec/integration/rails_5.2.5/public/apple-touch-icon.png diff --git a/spec/integration/rails_5.2.4.1/public/favicon.ico b/spec/integration/rails_5.2.5/public/favicon.ico similarity index 100% rename from spec/integration/rails_5.2.4.1/public/favicon.ico rename to spec/integration/rails_5.2.5/public/favicon.ico diff --git a/spec/integration/rails_5.2.4.1/public/robots.txt b/spec/integration/rails_5.2.5/public/robots.txt similarity index 100% rename from spec/integration/rails_5.2.4.1/public/robots.txt rename to spec/integration/rails_5.2.5/public/robots.txt diff --git a/spec/integration/rails_5.2.4.1/storage/.keep b/spec/integration/rails_5.2.5/storage/.keep similarity index 100% rename from spec/integration/rails_5.2.4.1/storage/.keep rename to spec/integration/rails_5.2.5/storage/.keep diff --git a/spec/integration/rails_5.2.4.1/test/application_system_test_case.rb b/spec/integration/rails_5.2.5/test/application_system_test_case.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/test/application_system_test_case.rb rename to spec/integration/rails_5.2.5/test/application_system_test_case.rb diff --git a/spec/integration/rails_5.2.4.1/test/controllers/.keep b/spec/integration/rails_5.2.5/test/controllers/.keep similarity index 100% rename from spec/integration/rails_5.2.4.1/test/controllers/.keep rename to spec/integration/rails_5.2.5/test/controllers/.keep diff --git a/spec/integration/rails_5.2.4.1/test/fixtures/.keep b/spec/integration/rails_5.2.5/test/fixtures/.keep similarity index 100% rename from spec/integration/rails_5.2.4.1/test/fixtures/.keep rename to spec/integration/rails_5.2.5/test/fixtures/.keep diff --git a/spec/integration/rails_5.2.4.1/test/fixtures/files/.keep b/spec/integration/rails_5.2.5/test/fixtures/files/.keep similarity index 100% rename from spec/integration/rails_5.2.4.1/test/fixtures/files/.keep rename to spec/integration/rails_5.2.5/test/fixtures/files/.keep diff --git a/spec/integration/rails_5.2.4.1/test/fixtures/tasks.yml b/spec/integration/rails_5.2.5/test/fixtures/tasks.yml similarity index 100% rename from spec/integration/rails_5.2.4.1/test/fixtures/tasks.yml rename to spec/integration/rails_5.2.5/test/fixtures/tasks.yml diff --git a/spec/integration/rails_5.2.4.1/test/helpers/.keep b/spec/integration/rails_5.2.5/test/helpers/.keep similarity index 100% rename from spec/integration/rails_5.2.4.1/test/helpers/.keep rename to spec/integration/rails_5.2.5/test/helpers/.keep diff --git a/spec/integration/rails_5.2.4.1/test/integration/.keep b/spec/integration/rails_5.2.5/test/integration/.keep similarity index 100% rename from spec/integration/rails_5.2.4.1/test/integration/.keep rename to spec/integration/rails_5.2.5/test/integration/.keep diff --git a/spec/integration/rails_5.2.4.1/test/mailers/.keep b/spec/integration/rails_5.2.5/test/mailers/.keep similarity index 100% rename from spec/integration/rails_5.2.4.1/test/mailers/.keep rename to spec/integration/rails_5.2.5/test/mailers/.keep diff --git a/spec/integration/rails_5.2.4.1/test/models/.keep b/spec/integration/rails_5.2.5/test/models/.keep similarity index 100% rename from spec/integration/rails_5.2.4.1/test/models/.keep rename to spec/integration/rails_5.2.5/test/models/.keep diff --git a/spec/integration/rails_5.2.4.1/test/models/task_test.rb b/spec/integration/rails_5.2.5/test/models/task_test.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/test/models/task_test.rb rename to spec/integration/rails_5.2.5/test/models/task_test.rb diff --git a/spec/integration/rails_5.2.4.1/test/system/.keep b/spec/integration/rails_5.2.5/test/system/.keep similarity index 100% rename from spec/integration/rails_5.2.4.1/test/system/.keep rename to spec/integration/rails_5.2.5/test/system/.keep diff --git a/spec/integration/rails_5.2.4.1/test/test_helper.rb b/spec/integration/rails_5.2.5/test/test_helper.rb similarity index 100% rename from spec/integration/rails_5.2.4.1/test/test_helper.rb rename to spec/integration/rails_5.2.5/test/test_helper.rb diff --git a/spec/integration/rails_5.2.4.1/tmp/.keep b/spec/integration/rails_5.2.5/tmp/.keep similarity index 100% rename from spec/integration/rails_5.2.4.1/tmp/.keep rename to spec/integration/rails_5.2.5/tmp/.keep diff --git a/spec/integration/rails_5.2.4.1/vendor/.keep b/spec/integration/rails_5.2.5/vendor/.keep similarity index 100% rename from spec/integration/rails_5.2.4.1/vendor/.keep rename to spec/integration/rails_5.2.5/vendor/.keep diff --git a/spec/integration/rails_5.2.4.1_spec.rb b/spec/integration/rails_5.2.5_spec.rb similarity index 76% rename from spec/integration/rails_5.2.4.1_spec.rb rename to spec/integration/rails_5.2.5_spec.rb index 06a62cea7..4c74b590c 100644 --- a/spec/integration/rails_5.2.4.1_spec.rb +++ b/spec/integration/rails_5.2.5_spec.rb @@ -3,8 +3,8 @@ require 'git' require_relative 'integration_helper' -describe 'Integration testing on Rails 5.2.4.1', if: IntegrationHelper.able_to_run?(__FILE__, RUBY_VERSION) do - ::RAILS_5_2_APP_NAME = 'rails_5.2.4.1'.freeze +describe 'Integration testing on Rails 5.2.5', if: IntegrationHelper.able_to_run?(__FILE__, RUBY_VERSION) do + ::RAILS_5_2_APP_NAME = 'rails_5.2.5'.freeze ::RAILS_5_2_PROJECT_PATH = File.expand_path('../..', __dir__).freeze ::RAILS_5_2_APP_PATH = File.expand_path(RAILS_5_2_APP_NAME, __dir__).freeze @@ -13,19 +13,23 @@ before(:all) do Bundler.with_clean_env do Dir.chdir RAILS_5_2_APP_PATH do - puts `bundle install` - puts `bin/rails db:migrate` + `bundle install` + `bin/rails db:migrate` end end end - after(:each) do + around(:each) do |example| + Bundler.with_clean_env do + Dir.chdir RAILS_5_2_APP_PATH do + example.run + end + end + git.reset_hard end describe 'annotate --models' do - let(:command) { 'bundle exec annotate --models' } - let(:task_model) do patch = <<~PATCH +# == Schema Information @@ -42,11 +46,13 @@ PATCH path = 'app/models/task.rb' + { path: include(path), patch: include(patch) } end + let(:task_test) do patch = <<~PATCH +# == Schema Information @@ -63,11 +69,13 @@ PATCH path = 'test/models/task_test.rb' + { path: include(path), patch: include(patch) } end + let(:task_fixture) do patch = <<~PATCH +# == Schema Information @@ -84,32 +92,28 @@ PATCH path = 'test/fixtures/tasks.yml' + { path: include(path), patch: include(patch) } end + subject do + `bundle exec annotate --models` + end + it 'annotate models' do - Bundler.with_clean_env do - Dir.chdir RAILS_5_2_APP_PATH do - expect(git.diff.any?).to be_falsy - - puts `#{command}` - - expect(git.diff.entries).to contain_exactly( - an_object_having_attributes(task_model), - an_object_having_attributes(task_test), - an_object_having_attributes(task_fixture) - ) - end - end + expect { subject }.to \ + change { git.diff.entries }.from(be_blank).to(contain_exactly( + an_object_having_attributes(task_model), + an_object_having_attributes(task_test), + an_object_having_attributes(task_fixture) + )) end end describe 'annotate --routes' do - let(:command) { 'bundle exec annotate --routes' } - let(:task_routes) do task_routes_diff = <<-DIFF +# == Route Map @@ -140,32 +144,32 @@ } end - it 'annotate routes.rb' do - Bundler.with_clean_env do - Dir.chdir RAILS_5_2_APP_PATH do - expect(git.diff.any?).to be_falsy - - puts `#{command}` + subject do + `bundle exec annotate --routes` + end - expect(git.diff.entries).to contain_exactly(an_object_having_attributes(task_routes)) - end - end + it 'annotate routes' do + expect { subject }.to \ + change { git.diff.entries }.from(be_blank).to(contain_exactly( + an_object_having_attributes(task_routes) + )) end end describe 'rails g annotate:install' do - let(:command) { 'bin/rails g annotate:install' } let(:rake_file_path) { 'lib/tasks/auto_annotate_models.rake' } + let(:rake_file_full_path) { File.expand_path(rake_file_path) } - it 'generates the rake file' do - Bundler.with_clean_env do - Dir.chdir RAILS_5_2_APP_PATH do - full_path = File.expand_path(rake_file_path) - expect { `#{command}` }.to change { File.exist?(rake_file_path) }.from(false).to(true) + subject do + `bin/rails g annotate:install` + end - File.delete(full_path) - end - end + after(:each) do + File.delete(rake_file_full_path) + end + + it 'generates the rake file' do + expect { subject }.to change { File.exist?(rake_file_path) }.from(false).to(true) end end end diff --git a/spec/integration/rails_6.0.2.1/.gitignore b/spec/integration/rails_6.1.3.1/.gitignore similarity index 100% rename from spec/integration/rails_6.0.2.1/.gitignore rename to spec/integration/rails_6.1.3.1/.gitignore diff --git a/spec/integration/rails_6.0.2.1/.keep b/spec/integration/rails_6.1.3.1/.keep similarity index 100% rename from spec/integration/rails_6.0.2.1/.keep rename to spec/integration/rails_6.1.3.1/.keep diff --git a/spec/integration/rails_6.0.2.1/.rubocop.yml b/spec/integration/rails_6.1.3.1/.rubocop.yml similarity index 100% rename from spec/integration/rails_6.0.2.1/.rubocop.yml rename to spec/integration/rails_6.1.3.1/.rubocop.yml diff --git a/spec/integration/rails_6.0.2.1/.rubocop_todo.yml b/spec/integration/rails_6.1.3.1/.rubocop_todo.yml similarity index 100% rename from spec/integration/rails_6.0.2.1/.rubocop_todo.yml rename to spec/integration/rails_6.1.3.1/.rubocop_todo.yml diff --git a/spec/integration/rails_6.0.2.1/Gemfile b/spec/integration/rails_6.1.3.1/Gemfile similarity index 97% rename from spec/integration/rails_6.0.2.1/Gemfile rename to spec/integration/rails_6.1.3.1/Gemfile index faf2f58ab..d027565c9 100644 --- a/spec/integration/rails_6.0.2.1/Gemfile +++ b/spec/integration/rails_6.1.3.1/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 6.0.2', '>= 6.0.2.1' +gem 'rails', '~> 6.1.3', '>= 6.1.3.1' # Use sqlite3 as the database for Active Record gem 'sqlite3', '~> 1.4' # Use Puma as the app server diff --git a/spec/integration/rails_6.0.2.1/Gemfile.lock b/spec/integration/rails_6.1.3.1/Gemfile.lock similarity index 53% rename from spec/integration/rails_6.0.2.1/Gemfile.lock rename to spec/integration/rails_6.1.3.1/Gemfile.lock index 06ea963e4..12551be9f 100644 --- a/spec/integration/rails_6.0.2.1/Gemfile.lock +++ b/spec/integration/rails_6.1.3.1/Gemfile.lock @@ -8,61 +8,65 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (6.0.2.1) - actionpack (= 6.0.2.1) + actioncable (6.1.3.1) + actionpack (= 6.1.3.1) + activesupport (= 6.1.3.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - 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) + actionmailbox (6.1.3.1) + actionpack (= 6.1.3.1) + activejob (= 6.1.3.1) + activerecord (= 6.1.3.1) + activestorage (= 6.1.3.1) + activesupport (= 6.1.3.1) mail (>= 2.7.1) - actionmailer (6.0.2.1) - actionpack (= 6.0.2.1) - actionview (= 6.0.2.1) - activejob (= 6.0.2.1) + actionmailer (6.1.3.1) + actionpack (= 6.1.3.1) + actionview (= 6.1.3.1) + activejob (= 6.1.3.1) + activesupport (= 6.1.3.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.2.1) - actionview (= 6.0.2.1) - activesupport (= 6.0.2.1) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.3.1) + actionview (= 6.1.3.1) + activesupport (= 6.1.3.1) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) 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) + actiontext (6.1.3.1) + actionpack (= 6.1.3.1) + activerecord (= 6.1.3.1) + activestorage (= 6.1.3.1) + activesupport (= 6.1.3.1) nokogiri (>= 1.8.5) - actionview (6.0.2.1) - activesupport (= 6.0.2.1) + actionview (6.1.3.1) + activesupport (= 6.1.3.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.2.1) - activesupport (= 6.0.2.1) + activejob (6.1.3.1) + activesupport (= 6.1.3.1) globalid (>= 0.3.6) - 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.2.1) + activemodel (6.1.3.1) + activesupport (= 6.1.3.1) + activerecord (6.1.3.1) + activemodel (= 6.1.3.1) + activesupport (= 6.1.3.1) + activestorage (6.1.3.1) + actionpack (= 6.1.3.1) + activejob (= 6.1.3.1) + activerecord (= 6.1.3.1) + activesupport (= 6.1.3.1) + marcel (~> 1.0.0) + mini_mime (~> 1.0.2) + activesupport (6.1.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) bindex (0.8.1) @@ -79,13 +83,13 @@ GEM regexp_parser (~> 1.5) xpath (~> 3.2) childprocess (3.0.0) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.8) crass (1.0.6) - erubi (1.9.0) + erubi (1.10.0) ffi (1.12.2) globalid (0.4.2) activesupport (>= 4.2.0) - i18n (1.8.2) + i18n (1.8.9) concurrent-ruby (~> 1.0) jbuilder (2.9.1) activesupport (>= 4.2.0) @@ -93,55 +97,55 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.4.0) + loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) - method_source (0.9.2) - mimemagic (0.3.4) - mini_mime (1.0.2) - mini_portile2 (2.4.0) - minitest (5.14.0) + marcel (1.0.0) + method_source (1.0.0) + mini_mime (1.0.3) + mini_portile2 (2.5.0) + minitest (5.14.4) msgpack (1.3.1) - nio4r (2.5.2) - nokogiri (1.10.8) - mini_portile2 (~> 2.4.0) + nio4r (2.5.7) + nokogiri (1.11.2) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) public_suffix (4.0.3) puma (4.3.3) nio4r (~> 2.0) - rack (2.1.2) + racc (1.5.2) + rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) - 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.2.1) + rails (6.1.3.1) + actioncable (= 6.1.3.1) + actionmailbox (= 6.1.3.1) + actionmailer (= 6.1.3.1) + actionpack (= 6.1.3.1) + actiontext (= 6.1.3.1) + actionview (= 6.1.3.1) + activejob (= 6.1.3.1) + activemodel (= 6.1.3.1) + activerecord (= 6.1.3.1) + activestorage (= 6.1.3.1) + activesupport (= 6.1.3.1) + bundler (>= 1.15.0) + railties (= 6.1.3.1) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (6.0.2.1) - actionpack (= 6.0.2.1) - activesupport (= 6.0.2.1) + railties (6.1.3.1) + actionpack (= 6.1.3.1) + activesupport (= 6.1.3.1) method_source rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) - rake (13.0.1) + thor (~> 1.0) + rake (13.0.3) rb-fsevent (0.10.3) rb-inotify (0.10.1) ffi (~> 1.0) @@ -151,18 +155,17 @@ GEM selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - sprockets (4.0.0) + sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.1) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.4.2) - thor (1.0.1) - thread_safe (0.3.6) - tzinfo (1.2.6) - thread_safe (~> 0.1) + thor (1.1.0) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) web-console (4.0.1) actionview (>= 6.0.0) activemodel (>= 6.0.0) @@ -172,12 +175,12 @@ GEM nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (>= 3.0, < 4.0) - websocket-driver (0.7.1) + websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.4) + websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.2.2) + zeitwerk (2.4.2) PLATFORMS ruby @@ -190,7 +193,7 @@ DEPENDENCIES jbuilder (~> 2.7) listen (>= 3.0.5, < 3.2) puma (~> 4.3) - rails (~> 6.0.2, >= 6.0.2.1) + rails (~> 6.1.3, >= 6.1.3.1) selenium-webdriver sqlite3 (~> 1.4) tzinfo-data @@ -198,4 +201,4 @@ DEPENDENCIES webdrivers BUNDLED WITH - 2.1.2 + 2.1.4 diff --git a/spec/integration/rails_6.0.2.1/README.md b/spec/integration/rails_6.1.3.1/README.md similarity index 100% rename from spec/integration/rails_6.0.2.1/README.md rename to spec/integration/rails_6.1.3.1/README.md diff --git a/spec/integration/rails_6.0.2.1/Rakefile b/spec/integration/rails_6.1.3.1/Rakefile similarity index 100% rename from spec/integration/rails_6.0.2.1/Rakefile rename to spec/integration/rails_6.1.3.1/Rakefile diff --git a/spec/integration/rails_6.0.2.1/app/assets/config/manifest.js b/spec/integration/rails_6.1.3.1/app/assets/config/manifest.js similarity index 100% rename from spec/integration/rails_6.0.2.1/app/assets/config/manifest.js rename to spec/integration/rails_6.1.3.1/app/assets/config/manifest.js diff --git a/spec/integration/rails_6.0.2.1/app/assets/images/.keep b/spec/integration/rails_6.1.3.1/app/assets/images/.keep similarity index 100% rename from spec/integration/rails_6.0.2.1/app/assets/images/.keep rename to spec/integration/rails_6.1.3.1/app/assets/images/.keep diff --git a/spec/integration/rails_6.0.2.1/app/assets/stylesheets/application.css b/spec/integration/rails_6.1.3.1/app/assets/stylesheets/application.css similarity index 100% rename from spec/integration/rails_6.0.2.1/app/assets/stylesheets/application.css rename to spec/integration/rails_6.1.3.1/app/assets/stylesheets/application.css diff --git a/spec/integration/rails_6.0.2.1/app/channels/application_cable/channel.rb b/spec/integration/rails_6.1.3.1/app/channels/application_cable/channel.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/app/channels/application_cable/channel.rb rename to spec/integration/rails_6.1.3.1/app/channels/application_cable/channel.rb diff --git a/spec/integration/rails_6.0.2.1/app/channels/application_cable/connection.rb b/spec/integration/rails_6.1.3.1/app/channels/application_cable/connection.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/app/channels/application_cable/connection.rb rename to spec/integration/rails_6.1.3.1/app/channels/application_cable/connection.rb diff --git a/spec/integration/rails_6.0.2.1/app/controllers/application_controller.rb b/spec/integration/rails_6.1.3.1/app/controllers/application_controller.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/app/controllers/application_controller.rb rename to spec/integration/rails_6.1.3.1/app/controllers/application_controller.rb diff --git a/spec/integration/rails_6.0.2.1/app/controllers/concerns/.keep b/spec/integration/rails_6.1.3.1/app/controllers/concerns/.keep similarity index 100% rename from spec/integration/rails_6.0.2.1/app/controllers/concerns/.keep rename to spec/integration/rails_6.1.3.1/app/controllers/concerns/.keep diff --git a/spec/integration/rails_6.0.2.1/app/helpers/application_helper.rb b/spec/integration/rails_6.1.3.1/app/helpers/application_helper.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/app/helpers/application_helper.rb rename to spec/integration/rails_6.1.3.1/app/helpers/application_helper.rb diff --git a/spec/integration/rails_6.0.2.1/app/jobs/application_job.rb b/spec/integration/rails_6.1.3.1/app/jobs/application_job.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/app/jobs/application_job.rb rename to spec/integration/rails_6.1.3.1/app/jobs/application_job.rb diff --git a/spec/integration/rails_6.0.2.1/app/mailers/application_mailer.rb b/spec/integration/rails_6.1.3.1/app/mailers/application_mailer.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/app/mailers/application_mailer.rb rename to spec/integration/rails_6.1.3.1/app/mailers/application_mailer.rb diff --git a/spec/integration/rails_6.0.2.1/app/models/application_record.rb b/spec/integration/rails_6.1.3.1/app/models/application_record.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/app/models/application_record.rb rename to spec/integration/rails_6.1.3.1/app/models/application_record.rb diff --git a/spec/integration/rails_6.0.2.1/app/models/concerns/.keep b/spec/integration/rails_6.1.3.1/app/models/concerns/.keep similarity index 100% rename from spec/integration/rails_6.0.2.1/app/models/concerns/.keep rename to spec/integration/rails_6.1.3.1/app/models/concerns/.keep diff --git a/spec/integration/rails_6.0.2.1/app/models/task.rb b/spec/integration/rails_6.1.3.1/app/models/task.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/app/models/task.rb rename to spec/integration/rails_6.1.3.1/app/models/task.rb diff --git a/spec/integration/rails_6.0.2.1/app/views/layouts/application.html.erb b/spec/integration/rails_6.1.3.1/app/views/layouts/application.html.erb similarity index 100% rename from spec/integration/rails_6.0.2.1/app/views/layouts/application.html.erb rename to spec/integration/rails_6.1.3.1/app/views/layouts/application.html.erb diff --git a/spec/integration/rails_6.0.2.1/app/views/layouts/mailer.html.erb b/spec/integration/rails_6.1.3.1/app/views/layouts/mailer.html.erb similarity index 100% rename from spec/integration/rails_6.0.2.1/app/views/layouts/mailer.html.erb rename to spec/integration/rails_6.1.3.1/app/views/layouts/mailer.html.erb diff --git a/spec/integration/rails_6.0.2.1/app/views/layouts/mailer.text.erb b/spec/integration/rails_6.1.3.1/app/views/layouts/mailer.text.erb similarity index 100% rename from spec/integration/rails_6.0.2.1/app/views/layouts/mailer.text.erb rename to spec/integration/rails_6.1.3.1/app/views/layouts/mailer.text.erb diff --git a/spec/integration/rails_6.0.2.1/bin/bundle b/spec/integration/rails_6.1.3.1/bin/bundle similarity index 100% rename from spec/integration/rails_6.0.2.1/bin/bundle rename to spec/integration/rails_6.1.3.1/bin/bundle diff --git a/spec/integration/rails_6.0.2.1/bin/rails b/spec/integration/rails_6.1.3.1/bin/rails similarity index 100% rename from spec/integration/rails_6.0.2.1/bin/rails rename to spec/integration/rails_6.1.3.1/bin/rails diff --git a/spec/integration/rails_6.0.2.1/bin/rake b/spec/integration/rails_6.1.3.1/bin/rake similarity index 100% rename from spec/integration/rails_6.0.2.1/bin/rake rename to spec/integration/rails_6.1.3.1/bin/rake diff --git a/spec/integration/rails_6.0.2.1/bin/setup b/spec/integration/rails_6.1.3.1/bin/setup similarity index 100% rename from spec/integration/rails_6.0.2.1/bin/setup rename to spec/integration/rails_6.1.3.1/bin/setup diff --git a/spec/integration/rails_6.0.2.1/config.ru b/spec/integration/rails_6.1.3.1/config.ru similarity index 100% rename from spec/integration/rails_6.0.2.1/config.ru rename to spec/integration/rails_6.1.3.1/config.ru diff --git a/spec/integration/rails_6.0.2.1/config/application.rb b/spec/integration/rails_6.1.3.1/config/application.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/config/application.rb rename to spec/integration/rails_6.1.3.1/config/application.rb diff --git a/spec/integration/rails_6.0.2.1/config/boot.rb b/spec/integration/rails_6.1.3.1/config/boot.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/config/boot.rb rename to spec/integration/rails_6.1.3.1/config/boot.rb diff --git a/spec/integration/rails_6.0.2.1/config/cable.yml b/spec/integration/rails_6.1.3.1/config/cable.yml similarity index 100% rename from spec/integration/rails_6.0.2.1/config/cable.yml rename to spec/integration/rails_6.1.3.1/config/cable.yml diff --git a/spec/integration/rails_6.0.2.1/config/credentials.yml.enc b/spec/integration/rails_6.1.3.1/config/credentials.yml.enc similarity index 100% rename from spec/integration/rails_6.0.2.1/config/credentials.yml.enc rename to spec/integration/rails_6.1.3.1/config/credentials.yml.enc diff --git a/spec/integration/rails_6.0.2.1/config/database.yml b/spec/integration/rails_6.1.3.1/config/database.yml similarity index 100% rename from spec/integration/rails_6.0.2.1/config/database.yml rename to spec/integration/rails_6.1.3.1/config/database.yml diff --git a/spec/integration/rails_6.0.2.1/config/environment.rb b/spec/integration/rails_6.1.3.1/config/environment.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/config/environment.rb rename to spec/integration/rails_6.1.3.1/config/environment.rb diff --git a/spec/integration/rails_6.0.2.1/config/environments/development.rb b/spec/integration/rails_6.1.3.1/config/environments/development.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/config/environments/development.rb rename to spec/integration/rails_6.1.3.1/config/environments/development.rb diff --git a/spec/integration/rails_6.0.2.1/config/environments/production.rb b/spec/integration/rails_6.1.3.1/config/environments/production.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/config/environments/production.rb rename to spec/integration/rails_6.1.3.1/config/environments/production.rb diff --git a/spec/integration/rails_6.0.2.1/config/environments/test.rb b/spec/integration/rails_6.1.3.1/config/environments/test.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/config/environments/test.rb rename to spec/integration/rails_6.1.3.1/config/environments/test.rb diff --git a/spec/integration/rails_6.0.2.1/config/initializers/application_controller_renderer.rb b/spec/integration/rails_6.1.3.1/config/initializers/application_controller_renderer.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/config/initializers/application_controller_renderer.rb rename to spec/integration/rails_6.1.3.1/config/initializers/application_controller_renderer.rb diff --git a/spec/integration/rails_6.0.2.1/config/initializers/backtrace_silencers.rb b/spec/integration/rails_6.1.3.1/config/initializers/backtrace_silencers.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/config/initializers/backtrace_silencers.rb rename to spec/integration/rails_6.1.3.1/config/initializers/backtrace_silencers.rb diff --git a/spec/integration/rails_6.0.2.1/config/initializers/content_security_policy.rb b/spec/integration/rails_6.1.3.1/config/initializers/content_security_policy.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/config/initializers/content_security_policy.rb rename to spec/integration/rails_6.1.3.1/config/initializers/content_security_policy.rb diff --git a/spec/integration/rails_6.0.2.1/config/initializers/cookies_serializer.rb b/spec/integration/rails_6.1.3.1/config/initializers/cookies_serializer.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/config/initializers/cookies_serializer.rb rename to spec/integration/rails_6.1.3.1/config/initializers/cookies_serializer.rb diff --git a/spec/integration/rails_6.0.2.1/config/initializers/filter_parameter_logging.rb b/spec/integration/rails_6.1.3.1/config/initializers/filter_parameter_logging.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/config/initializers/filter_parameter_logging.rb rename to spec/integration/rails_6.1.3.1/config/initializers/filter_parameter_logging.rb diff --git a/spec/integration/rails_6.0.2.1/config/initializers/inflections.rb b/spec/integration/rails_6.1.3.1/config/initializers/inflections.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/config/initializers/inflections.rb rename to spec/integration/rails_6.1.3.1/config/initializers/inflections.rb diff --git a/spec/integration/rails_6.0.2.1/config/initializers/mime_types.rb b/spec/integration/rails_6.1.3.1/config/initializers/mime_types.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/config/initializers/mime_types.rb rename to spec/integration/rails_6.1.3.1/config/initializers/mime_types.rb diff --git a/spec/integration/rails_6.0.2.1/config/initializers/wrap_parameters.rb b/spec/integration/rails_6.1.3.1/config/initializers/wrap_parameters.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/config/initializers/wrap_parameters.rb rename to spec/integration/rails_6.1.3.1/config/initializers/wrap_parameters.rb diff --git a/spec/integration/rails_6.0.2.1/config/locales/en.yml b/spec/integration/rails_6.1.3.1/config/locales/en.yml similarity index 100% rename from spec/integration/rails_6.0.2.1/config/locales/en.yml rename to spec/integration/rails_6.1.3.1/config/locales/en.yml diff --git a/spec/integration/rails_6.0.2.1/config/multi-database.yml b/spec/integration/rails_6.1.3.1/config/multi-database.yml similarity index 100% rename from spec/integration/rails_6.0.2.1/config/multi-database.yml rename to spec/integration/rails_6.1.3.1/config/multi-database.yml diff --git a/spec/integration/rails_6.0.2.1/config/puma.rb b/spec/integration/rails_6.1.3.1/config/puma.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/config/puma.rb rename to spec/integration/rails_6.1.3.1/config/puma.rb diff --git a/spec/integration/rails_6.0.2.1/config/routes.rb b/spec/integration/rails_6.1.3.1/config/routes.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/config/routes.rb rename to spec/integration/rails_6.1.3.1/config/routes.rb diff --git a/spec/integration/rails_6.0.2.1/config/storage.yml b/spec/integration/rails_6.1.3.1/config/storage.yml similarity index 100% rename from spec/integration/rails_6.0.2.1/config/storage.yml rename to spec/integration/rails_6.1.3.1/config/storage.yml diff --git a/spec/integration/rails_6.0.2.1/db/migrate/20200201204456_create_tasks.rb b/spec/integration/rails_6.1.3.1/db/migrate/20200201204456_create_tasks.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/db/migrate/20200201204456_create_tasks.rb rename to spec/integration/rails_6.1.3.1/db/migrate/20200201204456_create_tasks.rb diff --git a/spec/integration/rails_6.0.2.1/db/schema.rb b/spec/integration/rails_6.1.3.1/db/schema.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/db/schema.rb rename to spec/integration/rails_6.1.3.1/db/schema.rb diff --git a/spec/integration/rails_6.0.2.1/db/seeds.rb b/spec/integration/rails_6.1.3.1/db/seeds.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/db/seeds.rb rename to spec/integration/rails_6.1.3.1/db/seeds.rb diff --git a/spec/integration/rails_6.0.2.1/lib/assets/.keep b/spec/integration/rails_6.1.3.1/lib/assets/.keep similarity index 100% rename from spec/integration/rails_6.0.2.1/lib/assets/.keep rename to spec/integration/rails_6.1.3.1/lib/assets/.keep diff --git a/spec/integration/rails_6.0.2.1/lib/tasks/.keep b/spec/integration/rails_6.1.3.1/lib/tasks/.keep similarity index 100% rename from spec/integration/rails_6.0.2.1/lib/tasks/.keep rename to spec/integration/rails_6.1.3.1/lib/tasks/.keep diff --git a/spec/integration/rails_6.0.2.1/log/.keep b/spec/integration/rails_6.1.3.1/log/.keep similarity index 100% rename from spec/integration/rails_6.0.2.1/log/.keep rename to spec/integration/rails_6.1.3.1/log/.keep diff --git a/spec/integration/rails_6.0.2.1/public/404.html b/spec/integration/rails_6.1.3.1/public/404.html similarity index 100% rename from spec/integration/rails_6.0.2.1/public/404.html rename to spec/integration/rails_6.1.3.1/public/404.html diff --git a/spec/integration/rails_6.0.2.1/public/422.html b/spec/integration/rails_6.1.3.1/public/422.html similarity index 100% rename from spec/integration/rails_6.0.2.1/public/422.html rename to spec/integration/rails_6.1.3.1/public/422.html diff --git a/spec/integration/rails_6.0.2.1/public/500.html b/spec/integration/rails_6.1.3.1/public/500.html similarity index 100% rename from spec/integration/rails_6.0.2.1/public/500.html rename to spec/integration/rails_6.1.3.1/public/500.html diff --git a/spec/integration/rails_6.0.2.1/public/apple-touch-icon-precomposed.png b/spec/integration/rails_6.1.3.1/public/apple-touch-icon-precomposed.png similarity index 100% rename from spec/integration/rails_6.0.2.1/public/apple-touch-icon-precomposed.png rename to spec/integration/rails_6.1.3.1/public/apple-touch-icon-precomposed.png diff --git a/spec/integration/rails_6.0.2.1/public/apple-touch-icon.png b/spec/integration/rails_6.1.3.1/public/apple-touch-icon.png similarity index 100% rename from spec/integration/rails_6.0.2.1/public/apple-touch-icon.png rename to spec/integration/rails_6.1.3.1/public/apple-touch-icon.png diff --git a/spec/integration/rails_6.0.2.1/public/favicon.ico b/spec/integration/rails_6.1.3.1/public/favicon.ico similarity index 100% rename from spec/integration/rails_6.0.2.1/public/favicon.ico rename to spec/integration/rails_6.1.3.1/public/favicon.ico diff --git a/spec/integration/rails_6.0.2.1/public/robots.txt b/spec/integration/rails_6.1.3.1/public/robots.txt similarity index 100% rename from spec/integration/rails_6.0.2.1/public/robots.txt rename to spec/integration/rails_6.1.3.1/public/robots.txt diff --git a/spec/integration/rails_6.0.2.1/storage/.keep b/spec/integration/rails_6.1.3.1/storage/.keep similarity index 100% rename from spec/integration/rails_6.0.2.1/storage/.keep rename to spec/integration/rails_6.1.3.1/storage/.keep diff --git a/spec/integration/rails_6.0.2.1/test/application_system_test_case.rb b/spec/integration/rails_6.1.3.1/test/application_system_test_case.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/test/application_system_test_case.rb rename to spec/integration/rails_6.1.3.1/test/application_system_test_case.rb diff --git a/spec/integration/rails_6.0.2.1/test/channels/application_cable/connection_test.rb b/spec/integration/rails_6.1.3.1/test/channels/application_cable/connection_test.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/test/channels/application_cable/connection_test.rb rename to spec/integration/rails_6.1.3.1/test/channels/application_cable/connection_test.rb diff --git a/spec/integration/rails_6.0.2.1/test/controllers/.keep b/spec/integration/rails_6.1.3.1/test/controllers/.keep similarity index 100% rename from spec/integration/rails_6.0.2.1/test/controllers/.keep rename to spec/integration/rails_6.1.3.1/test/controllers/.keep diff --git a/spec/integration/rails_6.0.2.1/test/fixtures/.keep b/spec/integration/rails_6.1.3.1/test/fixtures/.keep similarity index 100% rename from spec/integration/rails_6.0.2.1/test/fixtures/.keep rename to spec/integration/rails_6.1.3.1/test/fixtures/.keep diff --git a/spec/integration/rails_6.0.2.1/test/fixtures/files/.keep b/spec/integration/rails_6.1.3.1/test/fixtures/files/.keep similarity index 100% rename from spec/integration/rails_6.0.2.1/test/fixtures/files/.keep rename to spec/integration/rails_6.1.3.1/test/fixtures/files/.keep diff --git a/spec/integration/rails_6.0.2.1/test/fixtures/tasks.yml b/spec/integration/rails_6.1.3.1/test/fixtures/tasks.yml similarity index 100% rename from spec/integration/rails_6.0.2.1/test/fixtures/tasks.yml rename to spec/integration/rails_6.1.3.1/test/fixtures/tasks.yml diff --git a/spec/integration/rails_6.0.2.1/test/helpers/.keep b/spec/integration/rails_6.1.3.1/test/helpers/.keep similarity index 100% rename from spec/integration/rails_6.0.2.1/test/helpers/.keep rename to spec/integration/rails_6.1.3.1/test/helpers/.keep diff --git a/spec/integration/rails_6.0.2.1/test/integration/.keep b/spec/integration/rails_6.1.3.1/test/integration/.keep similarity index 100% rename from spec/integration/rails_6.0.2.1/test/integration/.keep rename to spec/integration/rails_6.1.3.1/test/integration/.keep diff --git a/spec/integration/rails_6.0.2.1/test/mailers/.keep b/spec/integration/rails_6.1.3.1/test/mailers/.keep similarity index 100% rename from spec/integration/rails_6.0.2.1/test/mailers/.keep rename to spec/integration/rails_6.1.3.1/test/mailers/.keep diff --git a/spec/integration/rails_6.0.2.1/test/models/.keep b/spec/integration/rails_6.1.3.1/test/models/.keep similarity index 100% rename from spec/integration/rails_6.0.2.1/test/models/.keep rename to spec/integration/rails_6.1.3.1/test/models/.keep diff --git a/spec/integration/rails_6.0.2.1/test/models/task_test.rb b/spec/integration/rails_6.1.3.1/test/models/task_test.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/test/models/task_test.rb rename to spec/integration/rails_6.1.3.1/test/models/task_test.rb diff --git a/spec/integration/rails_6.0.2.1/test/system/.keep b/spec/integration/rails_6.1.3.1/test/system/.keep similarity index 100% rename from spec/integration/rails_6.0.2.1/test/system/.keep rename to spec/integration/rails_6.1.3.1/test/system/.keep diff --git a/spec/integration/rails_6.0.2.1/test/test_helper.rb b/spec/integration/rails_6.1.3.1/test/test_helper.rb similarity index 100% rename from spec/integration/rails_6.0.2.1/test/test_helper.rb rename to spec/integration/rails_6.1.3.1/test/test_helper.rb diff --git a/spec/integration/rails_6.0.2.1/tmp/.keep b/spec/integration/rails_6.1.3.1/tmp/.keep similarity index 100% rename from spec/integration/rails_6.0.2.1/tmp/.keep rename to spec/integration/rails_6.1.3.1/tmp/.keep diff --git a/spec/integration/rails_6.0.2.1/vendor/.keep b/spec/integration/rails_6.1.3.1/vendor/.keep similarity index 100% rename from spec/integration/rails_6.0.2.1/vendor/.keep rename to spec/integration/rails_6.1.3.1/vendor/.keep diff --git a/spec/integration/rails_6.0.2.1_spec.rb b/spec/integration/rails_6.1.3.1_spec.rb similarity index 65% rename from spec/integration/rails_6.0.2.1_spec.rb rename to spec/integration/rails_6.1.3.1_spec.rb index 413ebddae..83b04d31f 100644 --- a/spec/integration/rails_6.0.2.1_spec.rb +++ b/spec/integration/rails_6.1.3.1_spec.rb @@ -3,81 +3,18 @@ require 'git' require_relative 'integration_helper' -describe 'Integration testing on Rails 6.0.2.1', if: IntegrationHelper.able_to_run?(__FILE__, RUBY_VERSION) do - ::RAILS_6_0_APP_NAME = 'rails_6.0.2.1'.freeze +describe 'Integration testing on Rails 6.1.3.1', if: IntegrationHelper.able_to_run?(__FILE__, RUBY_VERSION) do + ::RAILS_6_0_APP_NAME = 'rails_6.1.3.1'.freeze ::RAILS_6_0_PROJECT_PATH = File.expand_path('../..', __dir__).freeze ::RAILS_6_0_APP_PATH = File.expand_path(RAILS_6_0_APP_NAME, __dir__).freeze let!(:git) { Git.open(RAILS_6_0_PROJECT_PATH) } - let(:task_model) do - patch = <<~PATCH - +# == Schema Information - +# - +# Table name: tasks - +# - +# id :integer not null, primary key - +# content :string - +# count :integer default(0) - +# status :boolean default(FALSE) - +# created_at :datetime not null - +# updated_at :datetime not null - +# - PATCH - - path = 'app/models/task.rb' - { - path: include(path), - patch: include(patch) - } - end - let(:task_test) do - patch = <<~PATCH - +# == Schema Information - +# - +# Table name: tasks - +# - +# id :integer not null, primary key - +# content :string - +# count :integer default(0) - +# status :boolean default(FALSE) - +# created_at :datetime not null - +# updated_at :datetime not null - +# - PATCH - - path = 'test/models/task_test.rb' - { - path: include(path), - patch: include(patch) - } - end - let(:task_fixture) do - patch = <<~PATCH - +# == Schema Information - +# - +# Table name: tasks - +# - +# id :integer not null, primary key - +# content :string - +# count :integer default(0) - +# status :boolean default(FALSE) - +# created_at :datetime not null - +# updated_at :datetime not null - +# - PATCH - - path = 'test/fixtures/tasks.yml' - { - path: include(path), - patch: include(patch) - } - end before(:all) do Bundler.with_clean_env do Dir.chdir RAILS_6_0_APP_PATH do - puts `bundle install` - puts `bin/rails db:migrate` + `bundle install` + `bin/rails db:migrate` end end end @@ -88,31 +25,111 @@ example.run end end - end - after(:each) do git.reset_hard end describe 'annotate --models' do - let(:command) { 'bundle exec annotate --models' } + let(:task_model) do + patch = <<~PATCH + +# == Schema Information + +# + +# Table name: tasks + +# + +# id :integer not null, primary key + +# content :string + +# count :integer default(0) + +# status :boolean default(FALSE) + +# created_at :datetime not null + +# updated_at :datetime not null + +# + PATCH + + path = 'app/models/task.rb' + + { + path: include(path), + patch: include(patch) + } + end + + let(:task_test) do + patch = <<~PATCH + +# == Schema Information + +# + +# Table name: tasks + +# + +# id :integer not null, primary key + +# content :string + +# count :integer default(0) + +# status :boolean default(FALSE) + +# created_at :datetime not null + +# updated_at :datetime not null + +# + PATCH + + path = 'test/models/task_test.rb' + + { + path: include(path), + patch: include(patch) + } + end + + let(:task_fixture) do + patch = <<~PATCH + +# == Schema Information + +# + +# Table name: tasks + +# + +# id :integer not null, primary key + +# content :string + +# count :integer default(0) + +# status :boolean default(FALSE) + +# created_at :datetime not null + +# updated_at :datetime not null + +# + PATCH + + path = 'test/fixtures/tasks.yml' + + { + path: include(path), + patch: include(patch) + } + end + + subject do + `bundle exec annotate --models` + end it 'annotate models' do - expect(git.diff.any?).to be_falsy + expect { subject }.to \ + change { git.diff.entries }.from(be_blank).to(contain_exactly( + an_object_having_attributes(task_model), + an_object_having_attributes(task_test), + an_object_having_attributes(task_fixture) + )) + end - puts `#{command}` + context 'with multi-db environment' do + subject do + `bundle exec annotate --models` + `bin/rails db:migrate:primary` + end - expect(git.diff.entries).to contain_exactly( - an_object_having_attributes(task_model), - an_object_having_attributes(task_test), - an_object_having_attributes(task_fixture) - ) + it 'hooks database-specific commands and annotates models' do + expect { subject }.to \ + change { git.diff.entries }.from(be_blank).to(contain_exactly( + an_object_having_attributes(task_model), + an_object_having_attributes(task_test), + an_object_having_attributes(task_fixture) + )) + end end end describe 'annotate --routes' do - let(:command) { 'bundle exec annotate --routes' } - let(:task_routes) do task_routes_diff = <<-DIFF +# == Route Map @@ -158,43 +175,32 @@ } end - it 'annotate routes.rb' do - expect(git.diff.any?).to be_falsy - - puts `#{command}` + subject do + `bundle exec annotate --routes` + end - expect(git.diff.entries).to contain_exactly(an_object_having_attributes(task_routes)) + it 'annotate routes' do + expect { subject }.to \ + change { git.diff.entries }.from(be_blank).to(contain_exactly( + an_object_having_attributes(task_routes) + )) end end describe 'rails g annotate:install' do - let(:command) { 'bin/rails g annotate:install' } let(:rake_file_path) { 'lib/tasks/auto_annotate_models.rake' } - let(:full_path) { File.expand_path(rake_file_path) } + let(:rake_file_full_path) { File.expand_path(rake_file_path) } - after(:each) do - File.delete(full_path) + subject do + `bin/rails g annotate:install` end - it 'generates the rake file' do - expect { `#{command}` }.to change { File.exist?(rake_file_path) }.from(false).to(true) + after(:each) do + File.delete(rake_file_full_path) end - context 'with multi-db environment' do - let(:migrate_command) { 'bin/rails db:migrate:primary' } - - it 'hooks database-specific commands and annotates models' do - expect(git.diff.any?).to be_falsy - - system({ 'MULTI_DB' => 'true' }, command) - system({ 'MULTI_DB' => 'true' }, migrate_command) - - expect(git.diff.entries).to contain_exactly( - an_object_having_attributes(task_model), - an_object_having_attributes(task_test), - an_object_having_attributes(task_fixture) - ) - end + it 'generates the rake file' do + expect { subject }.to change { File.exist?(rake_file_path) }.from(false).to(true) end end end