From 2c0a2760ece008616fefd7e0024af25cec6132d5 Mon Sep 17 00:00:00 2001 From: Michael Grosser Date: Mon, 20 May 2024 17:10:08 +0200 Subject: [PATCH] fix windows ci (#957) * fix windows ci * debug * retry * 1.7 * drop ruby 2.7 since rails 6 test no longer runs with that * 3.3 fails on spinach somehow --- .github/workflows/test.yml | 4 +- .rubocop.yml | 2 +- Gemfile.lock | 1 + lib/parallel_tests.rb | 2 +- lib/parallel_tests/cucumber/runner.rb | 4 +- parallel_tests.gemspec | 2 +- spec/fixtures/rails60/.gitignore | 31 ---- spec/fixtures/rails60/.ruby-version | 1 - spec/fixtures/rails60/Gemfile | 19 --- spec/fixtures/rails60/Gemfile.lock | 133 ------------------ spec/fixtures/rails60/README.md | 24 ---- spec/fixtures/rails60/Rakefile | 6 - .../rails60/app/assets/config/manifest.js | 2 - spec/fixtures/rails60/app/assets/images/.keep | 0 .../app/assets/stylesheets/application.css | 15 -- .../app/channels/application_cable/channel.rb | 4 - .../channels/application_cable/connection.rb | 4 - .../app/controllers/application_controller.rb | 2 - .../rails60/app/controllers/concerns/.keep | 0 .../rails60/app/helpers/application_helper.rb | 2 - .../app/javascript/channels/consumer.js | 6 - .../rails60/app/javascript/channels/index.js | 5 - .../app/javascript/packs/application.js | 16 --- .../rails60/app/jobs/application_job.rb | 7 - .../rails60/app/mailers/application_mailer.rb | 4 - .../rails60/app/models/application_record.rb | 3 - .../rails60/app/models/concerns/.keep | 0 spec/fixtures/rails60/app/models/user.rb | 2 - .../app/views/layouts/application.html.erb | 15 -- .../rails60/app/views/layouts/mailer.html.erb | 13 -- .../rails60/app/views/layouts/mailer.text.erb | 1 - spec/fixtures/rails60/bin/rails | 4 - spec/fixtures/rails60/bin/rake | 4 - spec/fixtures/rails60/bin/setup | 36 ----- spec/fixtures/rails60/bin/yarn | 9 -- spec/fixtures/rails60/config.ru | 5 - spec/fixtures/rails60/config/application.rb | 32 ----- spec/fixtures/rails60/config/boot.rb | 3 - spec/fixtures/rails60/config/cable.yml | 10 -- .../rails60/config/credentials.yml.enc | 1 - spec/fixtures/rails60/config/database.yml | 25 ---- spec/fixtures/rails60/config/environment.rb | 5 - .../config/environments/development.rb | 51 ------- .../rails60/config/environments/production.rb | 103 -------------- .../rails60/config/environments/test.rb | 45 ------ .../application_controller_renderer.rb | 8 -- .../initializers/backtrace_silencers.rb | 7 - .../initializers/content_security_policy.rb | 30 ---- .../config/initializers/cookies_serializer.rb | 5 - .../initializers/filter_parameter_logging.rb | 4 - .../config/initializers/inflections.rb | 16 --- .../rails60/config/initializers/mime_types.rb | 4 - .../config/initializers/wrap_parameters.rb | 14 -- spec/fixtures/rails60/config/locales/en.yml | 33 ----- spec/fixtures/rails60/config/puma.rb | 38 ----- spec/fixtures/rails60/config/routes.rb | 3 - .../db/migrate/20210325101904_create_users.rb | 9 -- spec/fixtures/rails60/db/schema.rb | 21 --- spec/fixtures/rails60/db/seeds.rb | 7 - spec/fixtures/rails60/lib/assets/.keep | 0 spec/fixtures/rails60/lib/tasks/.keep | 0 spec/fixtures/rails60/log/.keep | 0 spec/fixtures/rails60/package.json | 10 -- spec/fixtures/rails60/public/404.html | 67 --------- spec/fixtures/rails60/public/422.html | 67 --------- spec/fixtures/rails60/public/500.html | 66 --------- .../public/apple-touch-icon-precomposed.png | 0 .../rails60/public/apple-touch-icon.png | 0 spec/fixtures/rails60/public/favicon.ico | 0 spec/fixtures/rails60/public/robots.txt | 1 - .../test/application_system_test_case.rb | 5 - .../application_cable/connection_test.rb | 11 -- spec/fixtures/rails60/test/controllers/.keep | 0 spec/fixtures/rails60/test/fixtures/.keep | 0 .../rails60/test/fixtures/files/.keep | 0 spec/fixtures/rails60/test/fixtures/users.yml | 7 - spec/fixtures/rails60/test/helpers/.keep | 0 spec/fixtures/rails60/test/integration/.keep | 0 spec/fixtures/rails60/test/mailers/.keep | 0 spec/fixtures/rails60/test/models/.keep | 0 .../fixtures/rails60/test/models/user_test.rb | 7 - spec/fixtures/rails60/test/system/.keep | 0 spec/fixtures/rails60/test/test_helper.rb | 10 -- spec/fixtures/rails60/vendor/.keep | 0 spec/fixtures/rails61/.ruby-version | 2 +- spec/fixtures/rails61/Gemfile | 2 +- spec/fixtures/rails61/Gemfile.lock | 28 ++-- spec/fixtures/rails70/.ruby-version | 2 +- spec/fixtures/rails70/Gemfile | 2 +- spec/fixtures/rails70/Gemfile.lock | 19 +-- spec/rails_spec.rb | 6 +- 91 files changed, 28 insertions(+), 1146 deletions(-) delete mode 100644 spec/fixtures/rails60/.gitignore delete mode 100644 spec/fixtures/rails60/.ruby-version delete mode 100644 spec/fixtures/rails60/Gemfile delete mode 100644 spec/fixtures/rails60/Gemfile.lock delete mode 100644 spec/fixtures/rails60/README.md delete mode 100644 spec/fixtures/rails60/Rakefile delete mode 100644 spec/fixtures/rails60/app/assets/config/manifest.js delete mode 100644 spec/fixtures/rails60/app/assets/images/.keep delete mode 100644 spec/fixtures/rails60/app/assets/stylesheets/application.css delete mode 100644 spec/fixtures/rails60/app/channels/application_cable/channel.rb delete mode 100644 spec/fixtures/rails60/app/channels/application_cable/connection.rb delete mode 100644 spec/fixtures/rails60/app/controllers/application_controller.rb delete mode 100644 spec/fixtures/rails60/app/controllers/concerns/.keep delete mode 100644 spec/fixtures/rails60/app/helpers/application_helper.rb delete mode 100644 spec/fixtures/rails60/app/javascript/channels/consumer.js delete mode 100644 spec/fixtures/rails60/app/javascript/channels/index.js delete mode 100644 spec/fixtures/rails60/app/javascript/packs/application.js delete mode 100644 spec/fixtures/rails60/app/jobs/application_job.rb delete mode 100644 spec/fixtures/rails60/app/mailers/application_mailer.rb delete mode 100644 spec/fixtures/rails60/app/models/application_record.rb delete mode 100644 spec/fixtures/rails60/app/models/concerns/.keep delete mode 100644 spec/fixtures/rails60/app/models/user.rb delete mode 100644 spec/fixtures/rails60/app/views/layouts/application.html.erb delete mode 100644 spec/fixtures/rails60/app/views/layouts/mailer.html.erb delete mode 100644 spec/fixtures/rails60/app/views/layouts/mailer.text.erb delete mode 100755 spec/fixtures/rails60/bin/rails delete mode 100755 spec/fixtures/rails60/bin/rake delete mode 100755 spec/fixtures/rails60/bin/setup delete mode 100755 spec/fixtures/rails60/bin/yarn delete mode 100644 spec/fixtures/rails60/config.ru delete mode 100644 spec/fixtures/rails60/config/application.rb delete mode 100644 spec/fixtures/rails60/config/boot.rb delete mode 100644 spec/fixtures/rails60/config/cable.yml delete mode 100644 spec/fixtures/rails60/config/credentials.yml.enc delete mode 100644 spec/fixtures/rails60/config/database.yml delete mode 100644 spec/fixtures/rails60/config/environment.rb delete mode 100644 spec/fixtures/rails60/config/environments/development.rb delete mode 100644 spec/fixtures/rails60/config/environments/production.rb delete mode 100644 spec/fixtures/rails60/config/environments/test.rb delete mode 100644 spec/fixtures/rails60/config/initializers/application_controller_renderer.rb delete mode 100644 spec/fixtures/rails60/config/initializers/backtrace_silencers.rb delete mode 100644 spec/fixtures/rails60/config/initializers/content_security_policy.rb delete mode 100644 spec/fixtures/rails60/config/initializers/cookies_serializer.rb delete mode 100644 spec/fixtures/rails60/config/initializers/filter_parameter_logging.rb delete mode 100644 spec/fixtures/rails60/config/initializers/inflections.rb delete mode 100644 spec/fixtures/rails60/config/initializers/mime_types.rb delete mode 100644 spec/fixtures/rails60/config/initializers/wrap_parameters.rb delete mode 100644 spec/fixtures/rails60/config/locales/en.yml delete mode 100644 spec/fixtures/rails60/config/puma.rb delete mode 100644 spec/fixtures/rails60/config/routes.rb delete mode 100644 spec/fixtures/rails60/db/migrate/20210325101904_create_users.rb delete mode 100644 spec/fixtures/rails60/db/schema.rb delete mode 100644 spec/fixtures/rails60/db/seeds.rb delete mode 100644 spec/fixtures/rails60/lib/assets/.keep delete mode 100644 spec/fixtures/rails60/lib/tasks/.keep delete mode 100644 spec/fixtures/rails60/log/.keep delete mode 100644 spec/fixtures/rails60/package.json delete mode 100644 spec/fixtures/rails60/public/404.html delete mode 100644 spec/fixtures/rails60/public/422.html delete mode 100644 spec/fixtures/rails60/public/500.html delete mode 100644 spec/fixtures/rails60/public/apple-touch-icon-precomposed.png delete mode 100644 spec/fixtures/rails60/public/apple-touch-icon.png delete mode 100644 spec/fixtures/rails60/public/favicon.ico delete mode 100644 spec/fixtures/rails60/public/robots.txt delete mode 100644 spec/fixtures/rails60/test/application_system_test_case.rb delete mode 100644 spec/fixtures/rails60/test/channels/application_cable/connection_test.rb delete mode 100644 spec/fixtures/rails60/test/controllers/.keep delete mode 100644 spec/fixtures/rails60/test/fixtures/.keep delete mode 100644 spec/fixtures/rails60/test/fixtures/files/.keep delete mode 100644 spec/fixtures/rails60/test/fixtures/users.yml delete mode 100644 spec/fixtures/rails60/test/helpers/.keep delete mode 100644 spec/fixtures/rails60/test/integration/.keep delete mode 100644 spec/fixtures/rails60/test/mailers/.keep delete mode 100644 spec/fixtures/rails60/test/models/.keep delete mode 100644 spec/fixtures/rails60/test/models/user_test.rb delete mode 100644 spec/fixtures/rails60/test/system/.keep delete mode 100644 spec/fixtures/rails60/test/test_helper.rb delete mode 100644 spec/fixtures/rails60/vendor/.keep diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fdf3e6482..09939eef8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,11 +10,11 @@ jobs: strategy: fail-fast: false # run all tests so we see which gem/ruby combinations break matrix: - ruby: ['2.7', '3.0', '3.1', '3.2', head, jruby-head] + ruby: ['3.0', '3.1', '3.2', head, jruby-head] os: [ubuntu-latest, windows-latest] task: [spec] include: - - ruby: '2.7' # lowest supported version, same as gemspec and .rubocop.yml + - ruby: '3.0' # lowest supported version, same as gemspec and .rubocop.yml os: ubuntu-latest task: rubocop steps: diff --git a/.rubocop.yml b/.rubocop.yml index d843d1687..cc5c2ec23 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,6 +1,6 @@ AllCops: NewCops: enable - TargetRubyVersion: 2.7 + TargetRubyVersion: 3.0 SuggestExtensions: false Exclude: - '**/vendor/bundle/**/*' diff --git a/Gemfile.lock b/Gemfile.lock index aad5ddcda..4629be166 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -121,6 +121,7 @@ PLATFORMS java ruby x64-mingw32 + x86_64-linux DEPENDENCIES bump diff --git a/lib/parallel_tests.rb b/lib/parallel_tests.rb index 48e9c94e3..71d42dfb8 100644 --- a/lib/parallel_tests.rb +++ b/lib/parallel_tests.rb @@ -44,7 +44,7 @@ def pid_file_path def stop_all_processes pids.all.each { |pid| Process.kill(:INT, pid) } - rescue Errno::ESRCH + rescue Errno::ESRCH, Errno::EPERM # Process already terminated, do nothing end diff --git a/lib/parallel_tests/cucumber/runner.rb b/lib/parallel_tests/cucumber/runner.rb index 52805136e..f217131fb 100644 --- a/lib/parallel_tests/cucumber/runner.rb +++ b/lib/parallel_tests/cucumber/runner.rb @@ -4,8 +4,8 @@ module ParallelTests module Cucumber class Runner < ParallelTests::Gherkin::Runner - SCENARIOS_RESULTS_BOUNDARY_REGEX = /^(Failing|Flaky) Scenarios:$/.freeze - SCENARIO_REGEX = %r{^cucumber features/.+:\d+}.freeze + SCENARIOS_RESULTS_BOUNDARY_REGEX = /^(Failing|Flaky) Scenarios:$/ + SCENARIO_REGEX = %r{^cucumber features/.+:\d+} class << self def name diff --git a/parallel_tests.gemspec b/parallel_tests.gemspec index 3eb00e26c..147575870 100644 --- a/parallel_tests.gemspec +++ b/parallel_tests.gemspec @@ -17,5 +17,5 @@ Gem::Specification.new name, ParallelTests::VERSION do |s| s.license = "MIT" s.executables = ["parallel_spinach", "parallel_cucumber", "parallel_rspec", "parallel_test"] s.add_runtime_dependency "parallel" - s.required_ruby_version = '>= 2.7.0' + s.required_ruby_version = '>= 3.0.0' end diff --git a/spec/fixtures/rails60/.gitignore b/spec/fixtures/rails60/.gitignore deleted file mode 100644 index 3fd725c86..000000000 --- a/spec/fixtures/rails60/.gitignore +++ /dev/null @@ -1,31 +0,0 @@ -# See https://help.github.com/articles/ignoring-files for more about ignoring files. -# -# If you find yourself ignoring temporary files generated by your text editor -# or operating system, you probably want to add a global ignore instead: -# git config --global core.excludesfile '~/.gitignore_global' - -# Ignore bundler config. -/.bundle - -# Ignore the default SQLite database. -/db/*.sqlite3 -/db/*.sqlite3-journal -/db/*.sqlite3-* - -# Ignore all logfiles and tempfiles. -/log/* -/tmp/* -!/log/.keep -!/tmp/.keep - -# Ignore pidfiles, but keep the directory. -/tmp/pids/* -!/tmp/pids/ -!/tmp/pids/.keep - - -/public/assets -.byebug_history - -# Ignore master key for decrypting credentials and more. -/config/master.key diff --git a/spec/fixtures/rails60/.ruby-version b/spec/fixtures/rails60/.ruby-version deleted file mode 100644 index 4a36342fc..000000000 --- a/spec/fixtures/rails60/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -3.0.0 diff --git a/spec/fixtures/rails60/Gemfile b/spec/fixtures/rails60/Gemfile deleted file mode 100644 index 75e568a27..000000000 --- a/spec/fixtures/rails60/Gemfile +++ /dev/null @@ -1,19 +0,0 @@ -# frozen_string_literal: true -source 'https://rubygems.org' - -rails_version = '6.0.3' - -gem 'actioncable', rails_version -gem 'actionmailer', rails_version -gem 'actionpack', rails_version -gem 'actionview', rails_version -gem 'activejob', rails_version -gem 'activemodel', rails_version -gem 'activerecord', rails_version -gem 'activesupport', rails_version -gem 'railties', rails_version -gem 'sprockets-rails' - -gem 'sqlite3' -gem 'tzinfo-data' -gem 'parallel_tests', path: "../../../", group: :development diff --git a/spec/fixtures/rails60/Gemfile.lock b/spec/fixtures/rails60/Gemfile.lock deleted file mode 100644 index 4a0dd5f0a..000000000 --- a/spec/fixtures/rails60/Gemfile.lock +++ /dev/null @@ -1,133 +0,0 @@ -PATH - remote: ../../.. - specs: - parallel_tests (4.7.1) - parallel - -GEM - remote: https://rubygems.org/ - specs: - actioncable (6.0.3) - actionpack (= 6.0.3) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailer (6.0.3) - actionpack (= 6.0.3) - actionview (= 6.0.3) - activejob (= 6.0.3) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (6.0.3) - actionview (= 6.0.3) - activesupport (= 6.0.3) - rack (~> 2.0, >= 2.0.8) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.0.3) - activesupport (= 6.0.3) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.3) - activesupport (= 6.0.3) - globalid (>= 0.3.6) - activemodel (6.0.3) - activesupport (= 6.0.3) - activerecord (6.0.3) - activemodel (= 6.0.3) - activesupport (= 6.0.3) - activesupport (6.0.3) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) - builder (3.2.4) - concurrent-ruby (1.1.10) - crass (1.0.6) - erubi (1.10.0) - globalid (1.0.0) - activesupport (>= 5.0) - i18n (1.10.0) - concurrent-ruby (~> 1.0) - loofah (2.15.0) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - method_source (1.0.0) - mini_mime (1.1.2) - mini_portile2 (2.6.1) - minitest (5.15.0) - nio4r (2.5.8) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) - racc (~> 1.4) - nokogiri (1.12.5-x64-mingw32) - racc (~> 1.4) - nokogiri (1.12.5-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.12.5-x86_64-linux) - racc (~> 1.4) - parallel (1.22.1) - racc (1.6.0) - rack (2.2.3) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) - loofah (~> 2.3) - railties (6.0.3) - actionpack (= 6.0.3) - activesupport (= 6.0.3) - method_source - rake (>= 0.8.7) - thor (>= 0.20.3, < 2.0) - rake (13.0.6) - sprockets (4.0.3) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - sprockets (>= 3.0.0) - sqlite3 (1.4.2) - thor (1.2.1) - thread_safe (0.3.6) - tzinfo (1.2.9) - thread_safe (~> 0.1) - tzinfo-data (1.2022.1) - tzinfo (>= 1.0.0) - websocket-driver (0.7.5) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) - zeitwerk (2.5.4) - -PLATFORMS - ruby - x64-mingw32 - x86_64-darwin-20 - x86_64-darwin-21 - x86_64-linux - -DEPENDENCIES - actioncable (= 6.0.3) - actionmailer (= 6.0.3) - actionpack (= 6.0.3) - actionview (= 6.0.3) - activejob (= 6.0.3) - activemodel (= 6.0.3) - activerecord (= 6.0.3) - activesupport (= 6.0.3) - parallel_tests! - railties (= 6.0.3) - sprockets-rails - sqlite3 - tzinfo-data - -BUNDLED WITH - 2.3.7 diff --git a/spec/fixtures/rails60/README.md b/spec/fixtures/rails60/README.md deleted file mode 100644 index 7db80e4ca..000000000 --- a/spec/fixtures/rails60/README.md +++ /dev/null @@ -1,24 +0,0 @@ -# README - -This README would normally document whatever steps are necessary to get the -application up and running. - -Things you may want to cover: - -* Ruby version - -* System dependencies - -* Configuration - -* Database creation - -* Database initialization - -* How to run the test suite - -* Services (job queues, cache servers, search engines, etc.) - -* Deployment instructions - -* ... diff --git a/spec/fixtures/rails60/Rakefile b/spec/fixtures/rails60/Rakefile deleted file mode 100644 index e85f91391..000000000 --- a/spec/fixtures/rails60/Rakefile +++ /dev/null @@ -1,6 +0,0 @@ -# Add your own tasks in files placed in lib/tasks ending in .rake, -# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. - -require_relative 'config/application' - -Rails.application.load_tasks diff --git a/spec/fixtures/rails60/app/assets/config/manifest.js b/spec/fixtures/rails60/app/assets/config/manifest.js deleted file mode 100644 index 591819335..000000000 --- a/spec/fixtures/rails60/app/assets/config/manifest.js +++ /dev/null @@ -1,2 +0,0 @@ -//= link_tree ../images -//= link_directory ../stylesheets .css diff --git a/spec/fixtures/rails60/app/assets/images/.keep b/spec/fixtures/rails60/app/assets/images/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/spec/fixtures/rails60/app/assets/stylesheets/application.css b/spec/fixtures/rails60/app/assets/stylesheets/application.css deleted file mode 100644 index d05ea0f51..000000000 --- a/spec/fixtures/rails60/app/assets/stylesheets/application.css +++ /dev/null @@ -1,15 +0,0 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's - * vendor/assets/stylesheets directory can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the bottom of the - * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS - * files in this directory. Styles in this file should be added after the last require_* statement. - * It is generally better to create a new file per style scope. - * - *= require_tree . - *= require_self - */ diff --git a/spec/fixtures/rails60/app/channels/application_cable/channel.rb b/spec/fixtures/rails60/app/channels/application_cable/channel.rb deleted file mode 100644 index d67269728..000000000 --- a/spec/fixtures/rails60/app/channels/application_cable/channel.rb +++ /dev/null @@ -1,4 +0,0 @@ -module ApplicationCable - class Channel < ActionCable::Channel::Base - end -end diff --git a/spec/fixtures/rails60/app/channels/application_cable/connection.rb b/spec/fixtures/rails60/app/channels/application_cable/connection.rb deleted file mode 100644 index 0ff5442f4..000000000 --- a/spec/fixtures/rails60/app/channels/application_cable/connection.rb +++ /dev/null @@ -1,4 +0,0 @@ -module ApplicationCable - class Connection < ActionCable::Connection::Base - end -end diff --git a/spec/fixtures/rails60/app/controllers/application_controller.rb b/spec/fixtures/rails60/app/controllers/application_controller.rb deleted file mode 100644 index 09705d12a..000000000 --- a/spec/fixtures/rails60/app/controllers/application_controller.rb +++ /dev/null @@ -1,2 +0,0 @@ -class ApplicationController < ActionController::Base -end diff --git a/spec/fixtures/rails60/app/controllers/concerns/.keep b/spec/fixtures/rails60/app/controllers/concerns/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/spec/fixtures/rails60/app/helpers/application_helper.rb b/spec/fixtures/rails60/app/helpers/application_helper.rb deleted file mode 100644 index de6be7945..000000000 --- a/spec/fixtures/rails60/app/helpers/application_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ApplicationHelper -end diff --git a/spec/fixtures/rails60/app/javascript/channels/consumer.js b/spec/fixtures/rails60/app/javascript/channels/consumer.js deleted file mode 100644 index 0eceb59b1..000000000 --- a/spec/fixtures/rails60/app/javascript/channels/consumer.js +++ /dev/null @@ -1,6 +0,0 @@ -// Action Cable provides the framework to deal with WebSockets in Rails. -// You can generate new channels where WebSocket features live using the `rails generate channel` command. - -import { createConsumer } from "@rails/actioncable" - -export default createConsumer() diff --git a/spec/fixtures/rails60/app/javascript/channels/index.js b/spec/fixtures/rails60/app/javascript/channels/index.js deleted file mode 100644 index 0cfcf7491..000000000 --- a/spec/fixtures/rails60/app/javascript/channels/index.js +++ /dev/null @@ -1,5 +0,0 @@ -// Load all the channels within this directory and all subdirectories. -// Channel files must be named *_channel.js. - -const channels = require.context('.', true, /_channel\.js$/) -channels.keys().forEach(channels) diff --git a/spec/fixtures/rails60/app/javascript/packs/application.js b/spec/fixtures/rails60/app/javascript/packs/application.js deleted file mode 100644 index 28d74208c..000000000 --- a/spec/fixtures/rails60/app/javascript/packs/application.js +++ /dev/null @@ -1,16 +0,0 @@ -// This file is automatically compiled by Webpack, along with any other files -// present in this directory. You're encouraged to place your actual application logic in -// a relevant structure within app/javascript and only use these pack files to reference -// that code so it'll be compiled. - -require("@rails/ujs").start() -require("turbolinks").start() -require("channels") - - -// Uncomment to copy all static images under ../images to the output folder and reference -// them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>) -// or the `imagePath` JavaScript helper below. -// -// const images = require.context('../images', true) -// const imagePath = (name) => images(name, true) diff --git a/spec/fixtures/rails60/app/jobs/application_job.rb b/spec/fixtures/rails60/app/jobs/application_job.rb deleted file mode 100644 index d394c3d10..000000000 --- a/spec/fixtures/rails60/app/jobs/application_job.rb +++ /dev/null @@ -1,7 +0,0 @@ -class ApplicationJob < ActiveJob::Base - # Automatically retry jobs that encountered a deadlock - # retry_on ActiveRecord::Deadlocked - - # Most jobs are safe to ignore if the underlying records are no longer available - # discard_on ActiveJob::DeserializationError -end diff --git a/spec/fixtures/rails60/app/mailers/application_mailer.rb b/spec/fixtures/rails60/app/mailers/application_mailer.rb deleted file mode 100644 index 286b2239d..000000000 --- a/spec/fixtures/rails60/app/mailers/application_mailer.rb +++ /dev/null @@ -1,4 +0,0 @@ -class ApplicationMailer < ActionMailer::Base - default from: 'from@example.com' - layout 'mailer' -end diff --git a/spec/fixtures/rails60/app/models/application_record.rb b/spec/fixtures/rails60/app/models/application_record.rb deleted file mode 100644 index 10a4cba84..000000000 --- a/spec/fixtures/rails60/app/models/application_record.rb +++ /dev/null @@ -1,3 +0,0 @@ -class ApplicationRecord < ActiveRecord::Base - self.abstract_class = true -end diff --git a/spec/fixtures/rails60/app/models/concerns/.keep b/spec/fixtures/rails60/app/models/concerns/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/spec/fixtures/rails60/app/models/user.rb b/spec/fixtures/rails60/app/models/user.rb deleted file mode 100644 index 379658a50..000000000 --- a/spec/fixtures/rails60/app/models/user.rb +++ /dev/null @@ -1,2 +0,0 @@ -class User < ApplicationRecord -end diff --git a/spec/fixtures/rails60/app/views/layouts/application.html.erb b/spec/fixtures/rails60/app/views/layouts/application.html.erb deleted file mode 100644 index 60ee8159f..000000000 --- a/spec/fixtures/rails60/app/views/layouts/application.html.erb +++ /dev/null @@ -1,15 +0,0 @@ - - - - Rails60 - <%= csrf_meta_tags %> - <%= csp_meta_tag %> - - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> - - - - <%= yield %> - - diff --git a/spec/fixtures/rails60/app/views/layouts/mailer.html.erb b/spec/fixtures/rails60/app/views/layouts/mailer.html.erb deleted file mode 100644 index cbd34d2e9..000000000 --- a/spec/fixtures/rails60/app/views/layouts/mailer.html.erb +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - <%= yield %> - - diff --git a/spec/fixtures/rails60/app/views/layouts/mailer.text.erb b/spec/fixtures/rails60/app/views/layouts/mailer.text.erb deleted file mode 100644 index 37f0bddbd..000000000 --- a/spec/fixtures/rails60/app/views/layouts/mailer.text.erb +++ /dev/null @@ -1 +0,0 @@ -<%= yield %> diff --git a/spec/fixtures/rails60/bin/rails b/spec/fixtures/rails60/bin/rails deleted file mode 100755 index 073966023..000000000 --- a/spec/fixtures/rails60/bin/rails +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env ruby -APP_PATH = File.expand_path('../config/application', __dir__) -require_relative '../config/boot' -require 'rails/commands' diff --git a/spec/fixtures/rails60/bin/rake b/spec/fixtures/rails60/bin/rake deleted file mode 100755 index 17240489f..000000000 --- a/spec/fixtures/rails60/bin/rake +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env ruby -require_relative '../config/boot' -require 'rake' -Rake.application.run diff --git a/spec/fixtures/rails60/bin/setup b/spec/fixtures/rails60/bin/setup deleted file mode 100755 index 5853b5ea8..000000000 --- a/spec/fixtures/rails60/bin/setup +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env ruby -require 'fileutils' - -# path to your application root. -APP_ROOT = File.expand_path('..', __dir__) - -def system!(*args) - system(*args) || abort("\n== Command #{args} failed ==") -end - -FileUtils.chdir APP_ROOT do - # This script is a way to setup or update your development environment automatically. - # This script is idempotent, so that you can run it at anytime and get an expectable outcome. - # Add necessary setup steps to this file. - - puts '== Installing dependencies ==' - system! 'gem install bundler --conservative' - system('bundle check') || system!('bundle install') - - # Install JavaScript dependencies - # system('bin/yarn') - - # puts "\n== Copying sample files ==" - # unless File.exist?('config/database.yml') - # FileUtils.cp 'config/database.yml.sample', 'config/database.yml' - # end - - puts "\n== Preparing database ==" - system! 'bin/rails db:prepare' - - puts "\n== Removing old logs and tempfiles ==" - system! 'bin/rails log:clear tmp:clear' - - puts "\n== Restarting application server ==" - system! 'bin/rails restart' -end diff --git a/spec/fixtures/rails60/bin/yarn b/spec/fixtures/rails60/bin/yarn deleted file mode 100755 index b24854dce..000000000 --- a/spec/fixtures/rails60/bin/yarn +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env ruby -APP_ROOT = File.expand_path('..', __dir__) -Dir.chdir(APP_ROOT) do - exec "yarnpkg", *ARGV -rescue Errno::ENOENT - warn "Yarn executable was not detected in the system." - warn "Download Yarn at https://yarnpkg.com/en/docs/install" - exit 1 -end diff --git a/spec/fixtures/rails60/config.ru b/spec/fixtures/rails60/config.ru deleted file mode 100644 index f7ba0b527..000000000 --- a/spec/fixtures/rails60/config.ru +++ /dev/null @@ -1,5 +0,0 @@ -# This file is used by Rack-based servers to start the application. - -require_relative 'config/environment' - -run Rails.application diff --git a/spec/fixtures/rails60/config/application.rb b/spec/fixtures/rails60/config/application.rb deleted file mode 100644 index c596e99c8..000000000 --- a/spec/fixtures/rails60/config/application.rb +++ /dev/null @@ -1,32 +0,0 @@ -require_relative 'boot' - -require "rails" -# Pick the frameworks you want: -require "active_model/railtie" -require "active_job/railtie" -require "active_record/railtie" -# require "active_storage/engine" -require "action_controller/railtie" -require "action_mailer/railtie" -# require "action_mailbox/engine" -# require "action_text/engine" -require "action_view/railtie" -require "action_cable/engine" -# require "sprockets/railtie" -require "rails/test_unit/railtie" - -# Require the gems listed in Gemfile, including any gems -# you've limited to :test, :development, or :production. -Bundler.require(*Rails.groups) - -module Rails60 - class Application < Rails::Application - # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 6.0 - - # Settings in config/environments/* take precedence over those specified here. - # Application configuration can go into files in config/initializers - # -- all .rb files in that directory are automatically loaded after loading - # the framework and any gems in your application. - end -end diff --git a/spec/fixtures/rails60/config/boot.rb b/spec/fixtures/rails60/config/boot.rb deleted file mode 100644 index 30f5120df..000000000 --- a/spec/fixtures/rails60/config/boot.rb +++ /dev/null @@ -1,3 +0,0 @@ -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) - -require 'bundler/setup' # Set up gems listed in the Gemfile. diff --git a/spec/fixtures/rails60/config/cable.yml b/spec/fixtures/rails60/config/cable.yml deleted file mode 100644 index debdc02e7..000000000 --- a/spec/fixtures/rails60/config/cable.yml +++ /dev/null @@ -1,10 +0,0 @@ -development: - adapter: async - -test: - adapter: test - -production: - adapter: redis - url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> - channel_prefix: rails60_production diff --git a/spec/fixtures/rails60/config/credentials.yml.enc b/spec/fixtures/rails60/config/credentials.yml.enc deleted file mode 100644 index d7824b920..000000000 --- a/spec/fixtures/rails60/config/credentials.yml.enc +++ /dev/null @@ -1 +0,0 @@ -8Y8/F1ai6tfrAft/z0x+qNBnelef8uXXLft0kSsqh8WxI67QWJNyIqK6JBgwUpvQylLyomhY6DlPrOYzi0nj8AnjxYJGdIAKFbQq9PqJ9/0gzHs/QoyWCPLczqTYkKzvUshv+T+XbzRdI0Wz2umoaBVNyRzP7uMwtqVDecZhRgOd35gYlAAqFmfdvjKFeIIpNdTRINqq9W4fQmLuZ45Wk6QbdtU3HMFYJGv5aiFyg+kZQ2M/mGtskGCGIm+i7e8XMBNOJo+oMTRzEC0Z5tktz+epdsKBoJCJ7sJyMs3mUnt1SJc2AG4ORpRymvqSC3lkAiL/zhfynSoxMyktLmwT+vjvaemHjqT4MllkVvFutIZQMuSfYLIUGM5zKWdQvg0pahwYTADQJeCibtIQzWRhaBi79LjniupyG+RN--uZKZ0kvSJ5E4V8zX--AGm8/1XOThzOHhRVZY5jiA== \ No newline at end of file diff --git a/spec/fixtures/rails60/config/database.yml b/spec/fixtures/rails60/config/database.yml deleted file mode 100644 index f90baf882..000000000 --- a/spec/fixtures/rails60/config/database.yml +++ /dev/null @@ -1,25 +0,0 @@ -# SQLite. Versions 3.8.0 and up are supported. -# gem install sqlite3 -# -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem 'sqlite3' -# -default: &default - adapter: sqlite3 - pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> - timeout: 5000 - -development: - <<: *default - database: db/development.sqlite3 - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: - <<: *default - database: db/test<%= ENV['TEST_ENV_NUMBER'] %>.sqlite3 - -production: - <<: *default - database: db/production.sqlite3 diff --git a/spec/fixtures/rails60/config/environment.rb b/spec/fixtures/rails60/config/environment.rb deleted file mode 100644 index 426333bb4..000000000 --- a/spec/fixtures/rails60/config/environment.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Load the Rails application. -require_relative 'application' - -# Initialize the Rails application. -Rails.application.initialize! diff --git a/spec/fixtures/rails60/config/environments/development.rb b/spec/fixtures/rails60/config/environments/development.rb deleted file mode 100644 index 04bd3eeba..000000000 --- a/spec/fixtures/rails60/config/environments/development.rb +++ /dev/null @@ -1,51 +0,0 @@ -Rails.application.configure do - # Settings specified here will take precedence over those in config/application.rb. - - # In the development environment your application's code is reloaded on - # every request. This slows down response time but is perfect for development - # since you don't have to restart the web server when you make code changes. - config.cache_classes = false - - # Do not eager load code on boot. - config.eager_load = false - - # Show full error reports. - config.consider_all_requests_local = true - - # Enable/disable caching. By default caching is disabled. - # Run rails dev:cache to toggle caching. - if Rails.root.join('tmp', 'caching-dev.txt').exist? - config.action_controller.perform_caching = true - config.action_controller.enable_fragment_cache_logging = true - - config.cache_store = :memory_store - config.public_file_server.headers = { - 'Cache-Control' => "public, max-age=#{2.days.to_i}" - } - else - config.action_controller.perform_caching = false - - config.cache_store = :null_store - end - - # Don't care if the mailer can't send. - config.action_mailer.raise_delivery_errors = false - - config.action_mailer.perform_caching = false - - # Print deprecation notices to the Rails logger. - config.active_support.deprecation = :log - - # Raise an error on page load if there are pending migrations. - config.active_record.migration_error = :page_load - - # Highlight code that triggered database queries in logs. - config.active_record.verbose_query_logs = true - - # Raises error for missing translations. - # config.action_view.raise_on_missing_translations = true - - # Use an evented file watcher to asynchronously detect changes in source code, - # routes, locales, etc. This feature depends on the listen gem. - # config.file_watcher = ActiveSupport::EventedFileUpdateChecker -end diff --git a/spec/fixtures/rails60/config/environments/production.rb b/spec/fixtures/rails60/config/environments/production.rb deleted file mode 100644 index 08e99c0fe..000000000 --- a/spec/fixtures/rails60/config/environments/production.rb +++ /dev/null @@ -1,103 +0,0 @@ -Rails.application.configure do - # Settings specified here will take precedence over those in config/application.rb. - - # Code is not reloaded between requests. - config.cache_classes = true - - # Eager load code on boot. This eager loads most of Rails and - # your application in memory, allowing both threaded web servers - # and those relying on copy on write to perform better. - # Rake tasks automatically ignore this option for performance. - config.eager_load = true - - # Full error reports are disabled and caching is turned on. - config.consider_all_requests_local = false - config.action_controller.perform_caching = true - - # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] - # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). - # config.require_master_key = true - - # Disable serving static files from the `/public` folder by default since - # Apache or NGINX already handles this. - config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? - - # Enable serving of images, stylesheets, and JavaScripts from an asset server. - # config.action_controller.asset_host = 'http://assets.example.com' - - # Specifies the header that your server uses for sending files. - # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache - # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX - - # Mount Action Cable outside main process or domain. - # config.action_cable.mount_path = nil - # config.action_cable.url = 'wss://example.com/cable' - # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] - - # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. - # config.force_ssl = true - - # Use the lowest log level to ensure availability of diagnostic information - # when problems arise. - config.log_level = :debug - - # Prepend all log lines with the following tags. - config.log_tags = [:request_id] - - # Use a different cache store in production. - # config.cache_store = :mem_cache_store - - # Use a real queuing backend for Active Job (and separate queues per environment). - # config.active_job.queue_adapter = :resque - # config.active_job.queue_name_prefix = "rails60_production" - - config.action_mailer.perform_caching = false - - # Ignore bad email addresses and do not raise email delivery errors. - # Set this to true and configure the email server for immediate delivery to raise delivery errors. - # config.action_mailer.raise_delivery_errors = false - - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation cannot be found). - config.i18n.fallbacks = true - - # Send deprecation notices to registered listeners. - config.active_support.deprecation = :notify - - # Use default logging formatter so that PID and timestamp are not suppressed. - config.log_formatter = ::Logger::Formatter.new - - # Use a different logger for distributed setups. - # require 'syslog/logger' - # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') - - if ENV["RAILS_LOG_TO_STDOUT"].present? - logger = ActiveSupport::Logger.new(STDOUT) - logger.formatter = config.log_formatter - config.logger = ActiveSupport::TaggedLogging.new(logger) - end - - # Do not dump schema after migrations. - config.active_record.dump_schema_after_migration = false - - # Inserts middleware to perform automatic connection switching. - # The `database_selector` hash is used to pass options to the DatabaseSelector - # middleware. The `delay` is used to determine how long to wait after a write - # to send a subsequent read to the primary. - # - # The `database_resolver` class is used by the middleware to determine which - # database is appropriate to use based on the time delay. - # - # The `database_resolver_context` class is used by the middleware to set - # timestamps for the last write to the primary. The resolver uses the context - # class timestamps to determine how long to wait before reading from the - # replica. - # - # By default Rails will store a last write timestamp in the session. The - # DatabaseSelector middleware is designed as such you can define your own - # strategy for connection switching and pass that into the middleware through - # these configuration options. - # config.active_record.database_selector = { delay: 2.seconds } - # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver - # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session -end diff --git a/spec/fixtures/rails60/config/environments/test.rb b/spec/fixtures/rails60/config/environments/test.rb deleted file mode 100644 index 2f62f93cb..000000000 --- a/spec/fixtures/rails60/config/environments/test.rb +++ /dev/null @@ -1,45 +0,0 @@ -# The test environment is used exclusively to run your application's -# test suite. You never need to work with it otherwise. Remember that -# your test database is "scratch space" for the test suite and is wiped -# and recreated between test runs. Don't rely on the data there! - -Rails.application.configure do - # Settings specified here will take precedence over those in config/application.rb. - - config.cache_classes = true - - # Do not eager load code on boot. This avoids loading your whole application - # just for the purpose of running a single test. If you are using a tool that - # preloads Rails for running tests, you may have to set it to true. - config.eager_load = false - - # Configure public file server for tests with Cache-Control for performance. - config.public_file_server.enabled = true - config.public_file_server.headers = { - 'Cache-Control' => "public, max-age=#{1.hour.to_i}" - } - - # Show full error reports and disable caching. - config.consider_all_requests_local = true - config.action_controller.perform_caching = false - config.cache_store = :null_store - - # Raise exceptions instead of rendering exception templates. - config.action_dispatch.show_exceptions = false - - # Disable request forgery protection in test environment. - config.action_controller.allow_forgery_protection = false - - config.action_mailer.perform_caching = false - - # Tell Action Mailer not to deliver emails to the real world. - # The :test delivery method accumulates sent emails in the - # ActionMailer::Base.deliveries array. - config.action_mailer.delivery_method = :test - - # Print deprecation notices to the stderr. - config.active_support.deprecation = :stderr - - # Raises error for missing translations. - # config.action_view.raise_on_missing_translations = true -end diff --git a/spec/fixtures/rails60/config/initializers/application_controller_renderer.rb b/spec/fixtures/rails60/config/initializers/application_controller_renderer.rb deleted file mode 100644 index 89d2efab2..000000000 --- a/spec/fixtures/rails60/config/initializers/application_controller_renderer.rb +++ /dev/null @@ -1,8 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# ActiveSupport::Reloader.to_prepare do -# ApplicationController.renderer.defaults.merge!( -# http_host: 'example.org', -# https: false -# ) -# end diff --git a/spec/fixtures/rails60/config/initializers/backtrace_silencers.rb b/spec/fixtures/rails60/config/initializers/backtrace_silencers.rb deleted file mode 100644 index 59385cdf3..000000000 --- a/spec/fixtures/rails60/config/initializers/backtrace_silencers.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. -# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } - -# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. -# Rails.backtrace_cleaner.remove_silencers! diff --git a/spec/fixtures/rails60/config/initializers/content_security_policy.rb b/spec/fixtures/rails60/config/initializers/content_security_policy.rb deleted file mode 100644 index 35d0f26fc..000000000 --- a/spec/fixtures/rails60/config/initializers/content_security_policy.rb +++ /dev/null @@ -1,30 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Define an application-wide content security policy -# For further information see the following documentation -# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy - -# Rails.application.config.content_security_policy do |policy| -# policy.default_src :self, :https -# policy.font_src :self, :https, :data -# policy.img_src :self, :https, :data -# policy.object_src :none -# policy.script_src :self, :https -# policy.style_src :self, :https -# # If you are using webpack-dev-server then specify webpack-dev-server host -# policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development? - -# # Specify URI for violation reports -# # policy.report_uri "/csp-violation-report-endpoint" -# end - -# If you are using UJS then enable automatic nonce generation -# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) } - -# Set the nonce only to specific directives -# Rails.application.config.content_security_policy_nonce_directives = %w(script-src) - -# Report CSP violations to a specified URI -# For further information see the following documentation: -# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only -# Rails.application.config.content_security_policy_report_only = true diff --git a/spec/fixtures/rails60/config/initializers/cookies_serializer.rb b/spec/fixtures/rails60/config/initializers/cookies_serializer.rb deleted file mode 100644 index 5a6a32d37..000000000 --- a/spec/fixtures/rails60/config/initializers/cookies_serializer.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Specify a serializer for the signed and encrypted cookie jars. -# Valid options are :json, :marshal, and :hybrid. -Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/spec/fixtures/rails60/config/initializers/filter_parameter_logging.rb b/spec/fixtures/rails60/config/initializers/filter_parameter_logging.rb deleted file mode 100644 index 4a994e1e7..000000000 --- a/spec/fixtures/rails60/config/initializers/filter_parameter_logging.rb +++ /dev/null @@ -1,4 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Configure sensitive parameters which will be filtered from the log file. -Rails.application.config.filter_parameters += [:password] diff --git a/spec/fixtures/rails60/config/initializers/inflections.rb b/spec/fixtures/rails60/config/initializers/inflections.rb deleted file mode 100644 index ac033bf9d..000000000 --- a/spec/fixtures/rails60/config/initializers/inflections.rb +++ /dev/null @@ -1,16 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new inflection rules using the following format. Inflections -# are locale specific, and you may define rules for as many different -# locales as you wish. All of these examples are active by default: -# ActiveSupport::Inflector.inflections(:en) do |inflect| -# inflect.plural /^(ox)$/i, '\1en' -# inflect.singular /^(ox)en/i, '\1' -# inflect.irregular 'person', 'people' -# inflect.uncountable %w( fish sheep ) -# end - -# These inflection rules are supported but not enabled by default: -# ActiveSupport::Inflector.inflections(:en) do |inflect| -# inflect.acronym 'RESTful' -# end diff --git a/spec/fixtures/rails60/config/initializers/mime_types.rb b/spec/fixtures/rails60/config/initializers/mime_types.rb deleted file mode 100644 index dc1899682..000000000 --- a/spec/fixtures/rails60/config/initializers/mime_types.rb +++ /dev/null @@ -1,4 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new mime types for use in respond_to blocks: -# Mime::Type.register "text/richtext", :rtf diff --git a/spec/fixtures/rails60/config/initializers/wrap_parameters.rb b/spec/fixtures/rails60/config/initializers/wrap_parameters.rb deleted file mode 100644 index bbfc3961b..000000000 --- a/spec/fixtures/rails60/config/initializers/wrap_parameters.rb +++ /dev/null @@ -1,14 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# This file contains settings for ActionController::ParamsWrapper which -# is enabled by default. - -# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. -ActiveSupport.on_load(:action_controller) do - wrap_parameters format: [:json] -end - -# To enable root element in JSON for ActiveRecord objects. -# ActiveSupport.on_load(:active_record) do -# self.include_root_in_json = true -# end diff --git a/spec/fixtures/rails60/config/locales/en.yml b/spec/fixtures/rails60/config/locales/en.yml deleted file mode 100644 index cf9b342d0..000000000 --- a/spec/fixtures/rails60/config/locales/en.yml +++ /dev/null @@ -1,33 +0,0 @@ -# Files in the config/locales directory are used for internationalization -# and are automatically loaded by Rails. If you want to use locales other -# than English, add the necessary files in this directory. -# -# To use the locales, use `I18n.t`: -# -# I18n.t 'hello' -# -# In views, this is aliased to just `t`: -# -# <%= t('hello') %> -# -# To use a different locale, set it with `I18n.locale`: -# -# I18n.locale = :es -# -# This would use the information in config/locales/es.yml. -# -# The following keys must be escaped otherwise they will not be retrieved by -# the default I18n backend: -# -# true, false, on, off, yes, no -# -# Instead, surround them with single quotes. -# -# en: -# 'true': 'foo' -# -# To learn more, please read the Rails Internationalization guide -# available at https://guides.rubyonrails.org/i18n.html. - -en: - hello: "Hello world" diff --git a/spec/fixtures/rails60/config/puma.rb b/spec/fixtures/rails60/config/puma.rb deleted file mode 100644 index 283e163b1..000000000 --- a/spec/fixtures/rails60/config/puma.rb +++ /dev/null @@ -1,38 +0,0 @@ -# Puma can serve each request in a thread from an internal thread pool. -# The `threads` method setting takes two numbers: a minimum and maximum. -# Any libraries that use thread pools should be configured to match -# the maximum value specified for Puma. Default is set to 5 threads for minimum -# and maximum; this matches the default thread size of Active Record. -# -max_threads_count = ENV.fetch("RAILS_MAX_THREADS", 5) -min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } -threads min_threads_count, max_threads_count - -# Specifies the `port` that Puma will listen on to receive requests; default is 3000. -# -port ENV.fetch("PORT", 3000) - -# Specifies the `environment` that Puma will run in. -# -environment ENV.fetch("RAILS_ENV") { "development" } - -# Specifies the `pidfile` that Puma will use. -pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } - -# Specifies the number of `workers` to boot in clustered mode. -# Workers are forked web server processes. If using threads and workers together -# the concurrency of the application would be max `threads` * `workers`. -# Workers do not work on JRuby or Windows (both of which do not support -# processes). -# -# workers ENV.fetch("WEB_CONCURRENCY") { 2 } - -# Use the `preload_app!` method when specifying a `workers` number. -# This directive tells Puma to first boot the application and load code -# before forking the application. This takes advantage of Copy On Write -# process behavior so workers use less memory. -# -# preload_app! - -# Allow puma to be restarted by `rails restart` command. -plugin :tmp_restart diff --git a/spec/fixtures/rails60/config/routes.rb b/spec/fixtures/rails60/config/routes.rb deleted file mode 100644 index c06383a17..000000000 --- a/spec/fixtures/rails60/config/routes.rb +++ /dev/null @@ -1,3 +0,0 @@ -Rails.application.routes.draw do - # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html -end diff --git a/spec/fixtures/rails60/db/migrate/20210325101904_create_users.rb b/spec/fixtures/rails60/db/migrate/20210325101904_create_users.rb deleted file mode 100644 index 6c10d9cad..000000000 --- a/spec/fixtures/rails60/db/migrate/20210325101904_create_users.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateUsers < ActiveRecord::Migration[6.0] - def change - create_table :users do |t| - t.string :name - - t.timestamps - end - end -end diff --git a/spec/fixtures/rails60/db/schema.rb b/spec/fixtures/rails60/db/schema.rb deleted file mode 100644 index a0bb87f84..000000000 --- a/spec/fixtures/rails60/db/schema.rb +++ /dev/null @@ -1,21 +0,0 @@ -# This file is auto-generated from the current state of the database. Instead -# of editing this file, please use the migrations feature of Active Record to -# incrementally modify your database, and then regenerate this schema definition. -# -# This file is the source Rails uses to define your schema when running `rails -# db:schema:load`. When creating a new database, `rails db:schema:load` tends to -# be faster and is potentially less error prone than running all of your -# migrations from scratch. Old migrations may fail to apply correctly if those -# migrations use external dependencies or application code. -# -# It's strongly recommended that you check this file into your version control system. - -ActiveRecord::Schema.define(version: 2021_03_25_101904) do - - create_table "users", force: :cascade do |t| - t.string "name" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false - end - -end diff --git a/spec/fixtures/rails60/db/seeds.rb b/spec/fixtures/rails60/db/seeds.rb deleted file mode 100644 index 1beea2acc..000000000 --- a/spec/fixtures/rails60/db/seeds.rb +++ /dev/null @@ -1,7 +0,0 @@ -# This file should contain all the record creation needed to seed the database with its default values. -# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). -# -# Examples: -# -# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) -# Character.create(name: 'Luke', movie: movies.first) diff --git a/spec/fixtures/rails60/lib/assets/.keep b/spec/fixtures/rails60/lib/assets/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/spec/fixtures/rails60/lib/tasks/.keep b/spec/fixtures/rails60/lib/tasks/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/spec/fixtures/rails60/log/.keep b/spec/fixtures/rails60/log/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/spec/fixtures/rails60/package.json b/spec/fixtures/rails60/package.json deleted file mode 100644 index 867b0a0f3..000000000 --- a/spec/fixtures/rails60/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "rails60", - "private": true, - "dependencies": { - "@rails/ujs": "^6.0.0", - "turbolinks": "^5.2.0", - "@rails/actioncable": "^6.0.0" - }, - "version": "0.1.0" -} diff --git a/spec/fixtures/rails60/public/404.html b/spec/fixtures/rails60/public/404.html deleted file mode 100644 index 2be3af26f..000000000 --- a/spec/fixtures/rails60/public/404.html +++ /dev/null @@ -1,67 +0,0 @@ - - - - The page you were looking for doesn't exist (404) - - - - - - -
-
-

The page you were looking for doesn't exist.

-

You may have mistyped the address or the page may have moved.

-
-

If you are the application owner check the logs for more information.

-
- - diff --git a/spec/fixtures/rails60/public/422.html b/spec/fixtures/rails60/public/422.html deleted file mode 100644 index c08eac0d1..000000000 --- a/spec/fixtures/rails60/public/422.html +++ /dev/null @@ -1,67 +0,0 @@ - - - - The change you wanted was rejected (422) - - - - - - -
-
-

The change you wanted was rejected.

-

Maybe you tried to change something you didn't have access to.

-
-

If you are the application owner check the logs for more information.

-
- - diff --git a/spec/fixtures/rails60/public/500.html b/spec/fixtures/rails60/public/500.html deleted file mode 100644 index 78a030af2..000000000 --- a/spec/fixtures/rails60/public/500.html +++ /dev/null @@ -1,66 +0,0 @@ - - - - We're sorry, but something went wrong (500) - - - - - - -
-
-

We're sorry, but something went wrong.

-
-

If you are the application owner check the logs for more information.

-
- - diff --git a/spec/fixtures/rails60/public/apple-touch-icon-precomposed.png b/spec/fixtures/rails60/public/apple-touch-icon-precomposed.png deleted file mode 100644 index e69de29bb..000000000 diff --git a/spec/fixtures/rails60/public/apple-touch-icon.png b/spec/fixtures/rails60/public/apple-touch-icon.png deleted file mode 100644 index e69de29bb..000000000 diff --git a/spec/fixtures/rails60/public/favicon.ico b/spec/fixtures/rails60/public/favicon.ico deleted file mode 100644 index e69de29bb..000000000 diff --git a/spec/fixtures/rails60/public/robots.txt b/spec/fixtures/rails60/public/robots.txt deleted file mode 100644 index c19f78ab6..000000000 --- a/spec/fixtures/rails60/public/robots.txt +++ /dev/null @@ -1 +0,0 @@ -# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/spec/fixtures/rails60/test/application_system_test_case.rb b/spec/fixtures/rails60/test/application_system_test_case.rb deleted file mode 100644 index d19212abd..000000000 --- a/spec/fixtures/rails60/test/application_system_test_case.rb +++ /dev/null @@ -1,5 +0,0 @@ -require "test_helper" - -class ApplicationSystemTestCase < ActionDispatch::SystemTestCase - driven_by :selenium, using: :chrome, screen_size: [1400, 1400] -end diff --git a/spec/fixtures/rails60/test/channels/application_cable/connection_test.rb b/spec/fixtures/rails60/test/channels/application_cable/connection_test.rb deleted file mode 100644 index 800405f15..000000000 --- a/spec/fixtures/rails60/test/channels/application_cable/connection_test.rb +++ /dev/null @@ -1,11 +0,0 @@ -require "test_helper" - -class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase - # test "connects with cookies" do - # cookies.signed[:user_id] = 42 - # - # connect - # - # assert_equal connection.user_id, "42" - # end -end diff --git a/spec/fixtures/rails60/test/controllers/.keep b/spec/fixtures/rails60/test/controllers/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/spec/fixtures/rails60/test/fixtures/.keep b/spec/fixtures/rails60/test/fixtures/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/spec/fixtures/rails60/test/fixtures/files/.keep b/spec/fixtures/rails60/test/fixtures/files/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/spec/fixtures/rails60/test/fixtures/users.yml b/spec/fixtures/rails60/test/fixtures/users.yml deleted file mode 100644 index 7d4122404..000000000 --- a/spec/fixtures/rails60/test/fixtures/users.yml +++ /dev/null @@ -1,7 +0,0 @@ -# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html - -one: - name: MyString - -two: - name: MyString diff --git a/spec/fixtures/rails60/test/helpers/.keep b/spec/fixtures/rails60/test/helpers/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/spec/fixtures/rails60/test/integration/.keep b/spec/fixtures/rails60/test/integration/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/spec/fixtures/rails60/test/mailers/.keep b/spec/fixtures/rails60/test/mailers/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/spec/fixtures/rails60/test/models/.keep b/spec/fixtures/rails60/test/models/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/spec/fixtures/rails60/test/models/user_test.rb b/spec/fixtures/rails60/test/models/user_test.rb deleted file mode 100644 index 82f61e010..000000000 --- a/spec/fixtures/rails60/test/models/user_test.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'test_helper' - -class UserTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end -end diff --git a/spec/fixtures/rails60/test/system/.keep b/spec/fixtures/rails60/test/system/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/spec/fixtures/rails60/test/test_helper.rb b/spec/fixtures/rails60/test/test_helper.rb deleted file mode 100644 index 3ab84e3d1..000000000 --- a/spec/fixtures/rails60/test/test_helper.rb +++ /dev/null @@ -1,10 +0,0 @@ -ENV['RAILS_ENV'] ||= 'test' -require_relative '../config/environment' -require 'rails/test_help' - -class ActiveSupport::TestCase - # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. - fixtures :all - - # Add more helper methods to be used by all tests here... -end diff --git a/spec/fixtures/rails60/vendor/.keep b/spec/fixtures/rails60/vendor/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/spec/fixtures/rails61/.ruby-version b/spec/fixtures/rails61/.ruby-version index 4a36342fc..2451c27ca 100644 --- a/spec/fixtures/rails61/.ruby-version +++ b/spec/fixtures/rails61/.ruby-version @@ -1 +1 @@ -3.0.0 +3.0.7 diff --git a/spec/fixtures/rails61/Gemfile b/spec/fixtures/rails61/Gemfile index 6925c0c66..da46d1246 100644 --- a/spec/fixtures/rails61/Gemfile +++ b/spec/fixtures/rails61/Gemfile @@ -14,6 +14,6 @@ gem 'activesupport', rails_version gem 'railties', rails_version gem 'sprockets-rails' -gem 'sqlite3' +gem 'sqlite3', '~> 1.7.3' # last before 2.0 which has weird install errors gem 'tzinfo-data' gem 'parallel_tests', path: "../../../", group: :development diff --git a/spec/fixtures/rails61/Gemfile.lock b/spec/fixtures/rails61/Gemfile.lock index 2b8855342..6a27e06f7 100644 --- a/spec/fixtures/rails61/Gemfile.lock +++ b/spec/fixtures/rails61/Gemfile.lock @@ -61,25 +61,20 @@ GEM mini_mime (>= 0.1.1) method_source (1.0.0) mini_mime (1.1.2) - mini_portile2 (2.6.1) + mini_portile2 (2.8.6) minitest (5.15.0) nio4r (2.5.8) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) - racc (~> 1.4) - nokogiri (1.12.5-x64-mingw32) - racc (~> 1.4) - nokogiri (1.12.5-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.12.5-x86_64-linux) + nokogiri (1.16.5) + mini_portile2 (~> 2.8.2) racc (~> 1.4) parallel (1.22.1) racc (1.6.0) rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) @@ -97,7 +92,8 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.4.2) + sqlite3 (1.7.3) + mini_portile2 (~> 2.8.0) thor (1.2.1) tzinfo (2.0.4) concurrent-ruby (~> 1.0) @@ -110,10 +106,6 @@ GEM PLATFORMS ruby - x64-mingw32 - x86_64-darwin-20 - x86_64-darwin-21 - x86_64-linux DEPENDENCIES actioncable (= 6.1.3) @@ -127,8 +119,8 @@ DEPENDENCIES parallel_tests! railties (= 6.1.3) sprockets-rails - sqlite3 + sqlite3 (~> 1.7.3) tzinfo-data BUNDLED WITH - 2.3.7 + 2.5.10 diff --git a/spec/fixtures/rails70/.ruby-version b/spec/fixtures/rails70/.ruby-version index 4a36342fc..2451c27ca 100644 --- a/spec/fixtures/rails70/.ruby-version +++ b/spec/fixtures/rails70/.ruby-version @@ -1 +1 @@ -3.0.0 +3.0.7 diff --git a/spec/fixtures/rails70/Gemfile b/spec/fixtures/rails70/Gemfile index 11c1058d0..0d62ddd84 100644 --- a/spec/fixtures/rails70/Gemfile +++ b/spec/fixtures/rails70/Gemfile @@ -13,6 +13,6 @@ gem 'activerecord', rails_version gem 'activesupport', rails_version gem 'railties', rails_version -gem 'sqlite3' +gem 'sqlite3', '~> 1.7.3' # last before 2.0 which has weird install errors gem 'tzinfo-data' gem 'parallel_tests', path: "../../../", group: :development diff --git a/spec/fixtures/rails70/Gemfile.lock b/spec/fixtures/rails70/Gemfile.lock index b3fac474a..b6120681b 100644 --- a/spec/fixtures/rails70/Gemfile.lock +++ b/spec/fixtures/rails70/Gemfile.lock @@ -65,7 +65,7 @@ GEM mini_mime (>= 0.1.1) method_source (1.0.0) mini_mime (1.1.2) - mini_portile2 (2.8.0) + mini_portile2 (2.8.6) minitest (5.15.0) net-imap (0.2.3) digest @@ -86,12 +86,6 @@ GEM nokogiri (1.14.1) mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.14.1-x64-mingw32) - racc (~> 1.4) - nokogiri (1.14.1-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.14.1-x86_64-linux) - racc (~> 1.4) parallel (1.22.1) racc (1.6.0) rack (2.2.3) @@ -110,7 +104,8 @@ GEM thor (~> 1.0) zeitwerk (~> 2.5) rake (13.0.6) - sqlite3 (1.4.2) + sqlite3 (1.7.3) + mini_portile2 (~> 2.8.0) strscan (3.0.1) thor (1.2.1) timeout (0.2.0) @@ -125,10 +120,6 @@ GEM PLATFORMS ruby - x64-mingw32 - x86_64-darwin-20 - x86_64-darwin-21 - x86_64-linux DEPENDENCIES actioncable (= 7.0.2.3) @@ -141,8 +132,8 @@ DEPENDENCIES activesupport (= 7.0.2.3) parallel_tests! railties (= 7.0.2.3) - sqlite3 + sqlite3 (~> 1.7.3) tzinfo-data BUNDLED WITH - 2.3.7 + 2.5.10 diff --git a/spec/rails_spec.rb b/spec/rails_spec.rb index d10ab13c0..f9d620a2e 100644 --- a/spec/rails_spec.rb +++ b/spec/rails_spec.rb @@ -14,17 +14,13 @@ def run(command, options = {}) Dir["spec/fixtures/rails*"].each do |folder| rails = File.basename(folder) next if RUBY_VERSION >= "3.1.0" && rails < "rails70" # https://github.com/rails/rails/issues/43998 - next if RUBY_VERSION < "2.7.0" && rails >= "rails70" it "can create and run #{rails}" do skip 'rails fixtures are not set up for java' if RUBY_PLATFORM == "java" Dir.chdir("spec/fixtures/#{rails}") do Bundler.with_unbundled_env do - # unset travis things - ENV.delete("RAILS_ENV") - ENV.delete("RACK_ENV") - + ENV.delete "RUBYLIB" run ["bundle", "config", "--local", "path", "vendor/bundle"] run ["bundle", "config", "--local", "frozen", "true"] run ["bundle", "install"]