ctran · nard-tech · Mar 29, 2021 · Mar 29, 2021 · Mar 29, 2021 · Mar 29, 2021
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- ruby: ['2.4', '2.5', '2.6']
+ ruby: ['2.6', '2.7', '3.0']
 
  steps:
  - name: Checkout

diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,8 @@
 language: ruby
 rvm:
- - 2.4.9
- - 2.5.7
- - 2.6.5
+ - 2.6.6
+ - 2.7.2
+ - 3.0.0
 
 env:
  - RAILS_ENV=development RACK_ENV=development INTEGRATION_TESTS=1

diff --git a/Gemfile b/Gemfile
@@ -27,7 +27,7 @@ group :development, :test do
  gem 'coveralls'
 
  gem 'overcommit'
- gem 'ruby_dep', '1.5.0'
+ gem 'ruby_dep', '1.5.0' unless RUBY_VERSION =~ /^3/
 
  platforms :mri, :mingw do
  gem 'pry', require: false

diff --git 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/Gemfile.lock b/spec/integration/rails_5.2.4.1/Gemfile.lock
diff --git a/spec/integration/rails_5.2.4.1/.gitignore → spec/integration/rails_5.2.5/.gitignore b/spec/integration/rails_5.2.4.1/.gitignore → spec/integration/rails_5.2.5/.gitignore
@@ -29,3 +29,4 @@
 
 # Ignore master key for decrypting credentials and more.
 /config/master.key
+Gemfile.lock
diff --git a/spec/integration/rails_5.2.4.1/Gemfile → spec/integration/rails_5.2.5/Gemfile b/spec/integration/rails_5.2.4.1/Gemfile → 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

diff --git a/spec/integration/rails_5.2.4.1/README.md → spec/integration/rails_5.2.5/README.md b/spec/integration/rails_5.2.4.1/README.md → spec/integration/rails_5.2.5/README.md
diff --git a/spec/integration/rails_5.2.4.1/Rakefile → spec/integration/rails_5.2.5/Rakefile b/spec/integration/rails_5.2.4.1/Rakefile → spec/integration/rails_5.2.5/Rakefile
diff --git a/...ils_5.2.4.1/app/assets/config/manifest.js → ...rails_5.2.5/app/assets/config/manifest.js b/...ils_5.2.4.1/app/assets/config/manifest.js → ...rails_5.2.5/app/assets/config/manifest.js
diff --git a/...ion/rails_5.2.4.1/app/assets/images/.keep → ...ation/rails_5.2.5/app/assets/images/.keep b/...ion/rails_5.2.4.1/app/assets/images/.keep → ...ation/rails_5.2.5/app/assets/images/.keep
diff --git a/...4.1/app/assets/javascripts/application.js → ...2.5/app/assets/javascripts/application.js b/...4.1/app/assets/javascripts/application.js → ...2.5/app/assets/javascripts/application.js
diff --git a/...s_5.2.4.1/app/assets/javascripts/cable.js → ...ils_5.2.5/app/assets/javascripts/cable.js b/...s_5.2.4.1/app/assets/javascripts/cable.js → ...ils_5.2.5/app/assets/javascripts/cable.js
diff --git a/...4.1/app/assets/javascripts/channels/.keep → ...2.5/app/assets/javascripts/channels/.keep b/...4.1/app/assets/javascripts/channels/.keep → ...2.5/app/assets/javascripts/channels/.keep
diff --git a/....1/app/assets/stylesheets/application.css → ....5/app/assets/stylesheets/application.css b/....1/app/assets/stylesheets/application.css → ....5/app/assets/stylesheets/application.css
diff --git a/...app/channels/application_cable/channel.rb → ...app/channels/application_cable/channel.rb b/...app/channels/application_cable/channel.rb → ...app/channels/application_cable/channel.rb
diff --git a/.../channels/application_cable/connection.rb → .../channels/application_cable/connection.rb b/.../channels/application_cable/connection.rb → .../channels/application_cable/connection.rb
diff --git a/...app/controllers/application_controller.rb → ...app/controllers/application_controller.rb b/...app/controllers/application_controller.rb → ...app/controllers/application_controller.rb
diff --git a/...ls_5.2.4.1/app/controllers/concerns/.keep → ...ails_5.2.5/app/controllers/concerns/.keep b/...ls_5.2.4.1/app/controllers/concerns/.keep → ...ails_5.2.5/app/controllers/concerns/.keep
diff --git a/...5.2.4.1/app/helpers/application_helper.rb → ...s_5.2.5/app/helpers/application_helper.rb b/...5.2.4.1/app/helpers/application_helper.rb → ...s_5.2.5/app/helpers/application_helper.rb
diff --git a/...rails_5.2.4.1/app/jobs/application_job.rb → ...n/rails_5.2.5/app/jobs/application_job.rb b/...rails_5.2.4.1/app/jobs/application_job.rb → ...n/rails_5.2.5/app/jobs/application_job.rb
diff --git a/...5.2.4.1/app/mailers/application_mailer.rb → ...s_5.2.5/app/mailers/application_mailer.rb b/...5.2.4.1/app/mailers/application_mailer.rb → ...s_5.2.5/app/mailers/application_mailer.rb
diff --git a/..._5.2.4.1/app/models/application_record.rb → ...ls_5.2.5/app/models/application_record.rb b/..._5.2.4.1/app/models/application_record.rb → ...ls_5.2.5/app/models/application_record.rb
diff --git a/...n/rails_5.2.4.1/app/models/concerns/.keep → ...ion/rails_5.2.5/app/models/concerns/.keep b/...n/rails_5.2.4.1/app/models/concerns/.keep → ...ion/rails_5.2.5/app/models/concerns/.keep
diff --git a/...egration/rails_5.2.4.1/app/models/task.rb → ...ntegration/rails_5.2.5/app/models/task.rb b/...egration/rails_5.2.4.1/app/models/task.rb → ...ntegration/rails_5.2.5/app/models/task.rb
diff --git a/....1/app/views/layouts/application.html.erb → ....5/app/views/layouts/application.html.erb b/....1/app/views/layouts/application.html.erb → ....5/app/views/layouts/application.html.erb
diff --git a/...5.2.4.1/app/views/layouts/mailer.html.erb → ...s_5.2.5/app/views/layouts/mailer.html.erb b/...5.2.4.1/app/views/layouts/mailer.html.erb → ...s_5.2.5/app/views/layouts/mailer.html.erb
diff --git a/...5.2.4.1/app/views/layouts/mailer.text.erb → ...s_5.2.5/app/views/layouts/mailer.text.erb b/...5.2.4.1/app/views/layouts/mailer.text.erb → ...s_5.2.5/app/views/layouts/mailer.text.erb
diff --git a/spec/integration/rails_5.2.4.1/bin/bundle → spec/integration/rails_5.2.5/bin/bundle b/spec/integration/rails_5.2.4.1/bin/bundle → spec/integration/rails_5.2.5/bin/bundle
diff --git a/spec/integration/rails_5.2.4.1/bin/rails → spec/integration/rails_5.2.5/bin/rails b/spec/integration/rails_5.2.4.1/bin/rails → spec/integration/rails_5.2.5/bin/rails
diff --git a/spec/integration/rails_5.2.4.1/bin/rake → spec/integration/rails_5.2.5/bin/rake b/spec/integration/rails_5.2.4.1/bin/rake → spec/integration/rails_5.2.5/bin/rake
diff --git a/spec/integration/rails_5.2.4.1/bin/setup → spec/integration/rails_5.2.5/bin/setup b/spec/integration/rails_5.2.4.1/bin/setup → spec/integration/rails_5.2.5/bin/setup
diff --git a/spec/integration/rails_5.2.4.1/bin/update → spec/integration/rails_5.2.5/bin/update b/spec/integration/rails_5.2.4.1/bin/update → spec/integration/rails_5.2.5/bin/update
diff --git a/spec/integration/rails_5.2.4.1/bin/yarn → spec/integration/rails_5.2.5/bin/yarn b/spec/integration/rails_5.2.4.1/bin/yarn → spec/integration/rails_5.2.5/bin/yarn
diff --git a/spec/integration/rails_5.2.4.1/config.ru → spec/integration/rails_5.2.5/config.ru b/spec/integration/rails_5.2.4.1/config.ru → spec/integration/rails_5.2.5/config.ru
diff --git a/...ation/rails_5.2.4.1/config/application.rb → ...gration/rails_5.2.5/config/application.rb b/...ation/rails_5.2.4.1/config/application.rb → ...gration/rails_5.2.5/config/application.rb
diff --git a/.../integration/rails_5.2.4.1/config/boot.rb → spec/integration/rails_5.2.5/config/boot.rb b/.../integration/rails_5.2.4.1/config/boot.rb → spec/integration/rails_5.2.5/config/boot.rb
diff --git a/...ntegration/rails_5.2.4.1/config/cable.yml → .../integration/rails_5.2.5/config/cable.yml b/...ntegration/rails_5.2.4.1/config/cable.yml → .../integration/rails_5.2.5/config/cable.yml
diff --git a/.../rails_5.2.4.1/config/credentials.yml.enc → ...on/rails_5.2.5/config/credentials.yml.enc b/.../rails_5.2.4.1/config/credentials.yml.enc → ...on/rails_5.2.5/config/credentials.yml.enc
diff --git a/...gration/rails_5.2.4.1/config/database.yml → ...tegration/rails_5.2.5/config/database.yml b/...gration/rails_5.2.4.1/config/database.yml → ...tegration/rails_5.2.5/config/database.yml
diff --git a/...ation/rails_5.2.4.1/config/environment.rb → ...gration/rails_5.2.5/config/environment.rb b/...ation/rails_5.2.4.1/config/environment.rb → ...gration/rails_5.2.5/config/environment.rb
diff --git a/....2.4.1/config/environments/development.rb → ..._5.2.5/config/environments/development.rb b/....2.4.1/config/environments/development.rb → ..._5.2.5/config/environments/development.rb
diff --git a/...5.2.4.1/config/environments/production.rb → ...s_5.2.5/config/environments/production.rb b/...5.2.4.1/config/environments/production.rb → ...s_5.2.5/config/environments/production.rb
diff --git a/...rails_5.2.4.1/config/environments/test.rb → ...n/rails_5.2.5/config/environments/test.rb b/...rails_5.2.4.1/config/environments/test.rb → ...n/rails_5.2.5/config/environments/test.rb
diff --git a/...lizers/application_controller_renderer.rb → ...lizers/application_controller_renderer.rb b/...lizers/application_controller_renderer.rb → ...lizers/application_controller_renderer.rb
diff --git a/...ils_5.2.4.1/config/initializers/assets.rb → ...rails_5.2.5/config/initializers/assets.rb b/...ils_5.2.4.1/config/initializers/assets.rb → ...rails_5.2.5/config/initializers/assets.rb
diff --git a/...onfig/initializers/backtrace_silencers.rb → ...onfig/initializers/backtrace_silencers.rb b/...onfig/initializers/backtrace_silencers.rb → ...onfig/initializers/backtrace_silencers.rb
diff --git a/...g/initializers/content_security_policy.rb → ...g/initializers/content_security_policy.rb b/...g/initializers/content_security_policy.rb → ...g/initializers/content_security_policy.rb
diff --git a/...config/initializers/cookies_serializer.rb → ...config/initializers/cookies_serializer.rb b/...config/initializers/cookies_serializer.rb → ...config/initializers/cookies_serializer.rb
diff --git a/.../initializers/filter_parameter_logging.rb → .../initializers/filter_parameter_logging.rb b/.../initializers/filter_parameter_logging.rb → .../initializers/filter_parameter_logging.rb
diff --git a/....2.4.1/config/initializers/inflections.rb → ..._5.2.5/config/initializers/inflections.rb b/....2.4.1/config/initializers/inflections.rb → ..._5.2.5/config/initializers/inflections.rb
diff --git a/...5.2.4.1/config/initializers/mime_types.rb → ...s_5.2.5/config/initializers/mime_types.rb b/...5.2.4.1/config/initializers/mime_types.rb → ...s_5.2.5/config/initializers/mime_types.rb
diff --git a/....1/config/initializers/wrap_parameters.rb → ....5/config/initializers/wrap_parameters.rb b/....1/config/initializers/wrap_parameters.rb → ....5/config/initializers/wrap_parameters.rb
diff --git a/...ation/rails_5.2.4.1/config/locales/en.yml → ...gration/rails_5.2.5/config/locales/en.yml b/...ation/rails_5.2.4.1/config/locales/en.yml → ...gration/rails_5.2.5/config/locales/en.yml
diff --git a/.../integration/rails_5.2.4.1/config/puma.rb → spec/integration/rails_5.2.5/config/puma.rb b/.../integration/rails_5.2.4.1/config/puma.rb → spec/integration/rails_5.2.5/config/puma.rb
diff --git a/...ntegration/rails_5.2.4.1/config/routes.rb → .../integration/rails_5.2.5/config/routes.rb b/...ntegration/rails_5.2.4.1/config/routes.rb → .../integration/rails_5.2.5/config/routes.rb
diff --git a/...ntegration/rails_5.2.4.1/config/spring.rb → .../integration/rails_5.2.5/config/spring.rb b/...ntegration/rails_5.2.4.1/config/spring.rb → .../integration/rails_5.2.5/config/spring.rb
diff --git a/...egration/rails_5.2.4.1/config/storage.yml → ...ntegration/rails_5.2.5/config/storage.yml b/...egration/rails_5.2.4.1/config/storage.yml → ...ntegration/rails_5.2.5/config/storage.yml
diff --git a/...db/migrate/20200204052946_create_tasks.rb → ...db/migrate/20200204052946_create_tasks.rb b/...db/migrate/20200204052946_create_tasks.rb → ...db/migrate/20200204052946_create_tasks.rb
diff --git a/spec/integration/rails_5.2.4.1/db/schema.rb → spec/integration/rails_5.2.5/db/schema.rb b/spec/integration/rails_5.2.4.1/db/schema.rb → spec/integration/rails_5.2.5/db/schema.rb
diff --git a/spec/integration/rails_5.2.4.1/db/seeds.rb → spec/integration/rails_5.2.5/db/seeds.rb b/spec/integration/rails_5.2.4.1/db/seeds.rb → spec/integration/rails_5.2.5/db/seeds.rb
diff --git a/...ntegration/rails_5.2.4.1/lib/assets/.keep → .../integration/rails_5.2.5/lib/assets/.keep b/...ntegration/rails_5.2.4.1/lib/assets/.keep → .../integration/rails_5.2.5/lib/assets/.keep
diff --git a/...integration/rails_5.2.4.1/lib/tasks/.keep → spec/integration/rails_5.2.5/lib/tasks/.keep b/...integration/rails_5.2.4.1/lib/tasks/.keep → spec/integration/rails_5.2.5/lib/tasks/.keep
diff --git a/spec/integration/rails_5.2.4.1/log/.keep → spec/integration/rails_5.2.5/log/.keep b/spec/integration/rails_5.2.4.1/log/.keep → spec/integration/rails_5.2.5/log/.keep
diff --git a/spec/integration/rails_5.2.4.1/package.json → spec/integration/rails_5.2.5/package.json b/spec/integration/rails_5.2.4.1/package.json → spec/integration/rails_5.2.5/package.json
diff --git a/...integration/rails_5.2.4.1/public/404.html → spec/integration/rails_5.2.5/public/404.html b/...integration/rails_5.2.4.1/public/404.html → spec/integration/rails_5.2.5/public/404.html
diff --git a/...integration/rails_5.2.4.1/public/422.html → spec/integration/rails_5.2.5/public/422.html b/...integration/rails_5.2.4.1/public/422.html → spec/integration/rails_5.2.5/public/422.html
diff --git a/...integration/rails_5.2.4.1/public/500.html → spec/integration/rails_5.2.5/public/500.html b/...integration/rails_5.2.4.1/public/500.html → spec/integration/rails_5.2.5/public/500.html
diff --git a/...1/public/apple-touch-icon-precomposed.png → ...5/public/apple-touch-icon-precomposed.png b/...1/public/apple-touch-icon-precomposed.png → ...5/public/apple-touch-icon-precomposed.png
diff --git a/...rails_5.2.4.1/public/apple-touch-icon.png → ...n/rails_5.2.5/public/apple-touch-icon.png b/...rails_5.2.4.1/public/apple-touch-icon.png → ...n/rails_5.2.5/public/apple-touch-icon.png
diff --git a/...egration/rails_5.2.4.1/public/favicon.ico → ...ntegration/rails_5.2.5/public/favicon.ico b/...egration/rails_5.2.4.1/public/favicon.ico → ...ntegration/rails_5.2.5/public/favicon.ico
diff --git a/...tegration/rails_5.2.4.1/public/robots.txt → ...integration/rails_5.2.5/public/robots.txt b/...tegration/rails_5.2.4.1/public/robots.txt → ...integration/rails_5.2.5/public/robots.txt
diff --git a/spec/integration/rails_5.2.4.1/storage/.keep → spec/integration/rails_5.2.5/storage/.keep b/spec/integration/rails_5.2.4.1/storage/.keep → spec/integration/rails_5.2.5/storage/.keep
diff --git a/....4.1/test/application_system_test_case.rb → ....2.5/test/application_system_test_case.rb b/....4.1/test/application_system_test_case.rb → ....2.5/test/application_system_test_case.rb
diff --git a/...tion/rails_5.2.4.1/test/controllers/.keep → ...ration/rails_5.2.5/test/controllers/.keep b/...tion/rails_5.2.4.1/test/controllers/.keep → ...ration/rails_5.2.5/test/controllers/.keep
diff --git a/...gration/rails_5.2.4.1/test/fixtures/.keep → ...tegration/rails_5.2.5/test/fixtures/.keep b/...gration/rails_5.2.4.1/test/fixtures/.keep → ...tegration/rails_5.2.5/test/fixtures/.keep
diff --git a/...n/rails_5.2.4.1/test/fixtures/files/.keep → ...ion/rails_5.2.5/test/fixtures/files/.keep b/...n/rails_5.2.4.1/test/fixtures/files/.keep → ...ion/rails_5.2.5/test/fixtures/files/.keep
diff --git a/...ion/rails_5.2.4.1/test/fixtures/tasks.yml → ...ation/rails_5.2.5/test/fixtures/tasks.yml b/...ion/rails_5.2.4.1/test/fixtures/tasks.yml → ...ation/rails_5.2.5/test/fixtures/tasks.yml
diff --git a/...egration/rails_5.2.4.1/test/helpers/.keep → ...ntegration/rails_5.2.5/test/helpers/.keep b/...egration/rails_5.2.4.1/test/helpers/.keep → ...ntegration/rails_5.2.5/test/helpers/.keep
diff --git a/...tion/rails_5.2.4.1/test/integration/.keep → ...ration/rails_5.2.5/test/integration/.keep b/...tion/rails_5.2.4.1/test/integration/.keep → ...ration/rails_5.2.5/test/integration/.keep
diff --git a/...egration/rails_5.2.4.1/test/mailers/.keep → ...ntegration/rails_5.2.5/test/mailers/.keep b/...egration/rails_5.2.4.1/test/mailers/.keep → ...ntegration/rails_5.2.5/test/mailers/.keep
diff --git a/...tegration/rails_5.2.4.1/test/models/.keep → ...integration/rails_5.2.5/test/models/.keep b/...tegration/rails_5.2.4.1/test/models/.keep → ...integration/rails_5.2.5/test/models/.keep
diff --git a/...on/rails_5.2.4.1/test/models/task_test.rb → ...tion/rails_5.2.5/test/models/task_test.rb b/...on/rails_5.2.4.1/test/models/task_test.rb → ...tion/rails_5.2.5/test/models/task_test.rb
diff --git a/...tegration/rails_5.2.4.1/test/system/.keep → ...integration/rails_5.2.5/test/system/.keep b/...tegration/rails_5.2.4.1/test/system/.keep → ...integration/rails_5.2.5/test/system/.keep
diff --git a/...gration/rails_5.2.4.1/test/test_helper.rb → ...tegration/rails_5.2.5/test/test_helper.rb b/...gration/rails_5.2.4.1/test/test_helper.rb → ...tegration/rails_5.2.5/test/test_helper.rb
diff --git a/spec/integration/rails_5.2.4.1/tmp/.keep → spec/integration/rails_5.2.5/tmp/.keep b/spec/integration/rails_5.2.4.1/tmp/.keep → spec/integration/rails_5.2.5/tmp/.keep
diff --git a/spec/integration/rails_5.2.4.1/vendor/.keep → spec/integration/rails_5.2.5/vendor/.keep b/spec/integration/rails_5.2.4.1/vendor/.keep → spec/integration/rails_5.2.5/vendor/.keep
diff --git a/spec/integration/rails_5.2.4.1_spec.rb → spec/integration/rails_5.2.5_spec.rb b/spec/integration/rails_5.2.4.1_spec.rb → 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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,3 +29,4 @@

		# Ignore master key for decrypting credentials and more.
		/config/master.key
		Gemfile.lock