diff --git a/.ruby-version b/.ruby-version index 0bee604d..860487ca 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.3 +2.7.1 diff --git a/.travis.yml b/.travis.yml index 1fd682ee..5a661865 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ before_install: - mkdir geckodriver - tar -xzf geckodriver-v0.20.1-linux64.tar.gz -C geckodriver - export PATH=$PATH:$PWD/geckodriver - - gem install bundler -v 1.16.1 before_script: "bundle exec rake test:ci:install" @@ -20,30 +19,17 @@ script: "bundle exec rake test:ci" ### Build Matrix -max_ruby_version: &max_ruby 2.3.3 - rvm: - - 2.2.5 - - *max_ruby - - ruby-head + - 2.5.8 + - 2.6.6 + - 2.7.1 global: gemfile: - Gemfile -# Run unit tests across all Ruby versions +# Run all tests across all Ruby versions env: - UNITS=true - -matrix: - allow_failures: - - rvm: ruby-head - - # Integration tests - include: - - env: RAILS_VERSION=4.2 - rvm: *max_ruby - - - env: RAILS_VERSION=5.0 - rvm: *max_ruby - + - RAILS_VERSION=5.2 + - RAILS_VERSION=6.0 diff --git a/Appraisals b/Appraisals index 167348a5..28e08f97 100644 --- a/Appraisals +++ b/Appraisals @@ -1,12 +1,7 @@ case(RUBY_VERSION) -when "2.2.5" then +when '2.5.8', '2.6.6', '2.7.1' then appraise "capybara-3.0-ruby#{RUBY_VERSION}" do - gem 'capybara', '~> 3.0.2' - end -when "2.3.3" then - appraise "capybara-3.0-ruby#{RUBY_VERSION}" do - gem 'capybara', '~> 3.0.2' + gem 'capybara', '~> 3.0' end end - diff --git a/Gemfile b/Gemfile index 1f962667..0107a9b5 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ gem 'gem-release', '0.7.4' gemspec -gem 'rake', '~> 11.0' +gem 'rake', '~> 13.0' gem 'test-unit', '~> 3.0' if RUBY_VERSION =~ /\A1\.9/ diff --git a/README.md b/README.md index 3a58e0cc..cc9210fa 100644 --- a/README.md +++ b/README.md @@ -170,7 +170,7 @@ gem 'ae_page_objects' ### Rails -AePageObjects is built to work with Rails (versions 3.X-5.0) out of the box. To use with Rails, +AePageObjects is built to work with Rails out of the box. To use with Rails, add this line to your test helper: ```ruby diff --git a/development.md b/development.md index 5ce05af8..5ce79cd2 100644 --- a/development.md +++ b/development.md @@ -49,11 +49,10 @@ in the gemspec. ### Supported Ruby versions -AePageObjects supports the same minimum Ruby version as Capybara, which is currently 1.9.3. The minimum Ruby version +AePageObjects supports the same minimum Ruby version as Capybara. The minimum Ruby version is specified in the gemspec. -The test suite tests against the minimum version and a designated maximum version, specified in `.travis.yml`. The test -suite also runs against `ruby-head`, though failures are ignored. +The test suite tests against the minimum version and a designated maximum version, specified in `.travis.yml`. ### Supported Rails versions @@ -117,11 +116,11 @@ that the stub/mock setup within the tests works across Capybara versions. Integration tests using page objects written via AePageObjects run against all versions of Capybara as well. These tests run using a Rails application, using the most recent version of Rails possible that supports the Ruby version that the version of Capybara under test supports. -Today, all Capybara integration tests are run in the Rails 4.2 application using Ruby 2.2.5. To run these tests: +To run these tests: ``` -RAILS_VERSION=4.2 rake test:integration:selenium:install -RAILS_VERSION=4.2 rake test:integration:selenium +RAILS_VERSION=6.0 rake test:integration:selenium:install +RAILS_VERSION=6.0 rake test:integration:selenium ``` @@ -143,8 +142,8 @@ These tests use the most recent Ruby and Capybara versions possible for the vers To run the integration tests against a specific version of Rails: ``` -RAILS_VERSION=4.0 rake test:integration:selenium:install -RAILS_VERSION=4.0 rake test:integration:selenium +RAILS_VERSION=6.0 rake test:integration:selenium:install +RAILS_VERSION=6.0 rake test:integration:selenium ``` ## CI diff --git a/gemfiles/capybara_3.0_ruby2.2.5.gemfile b/gemfiles/capybara_3.0_ruby2.5.8.gemfile similarity index 82% rename from gemfiles/capybara_3.0_ruby2.2.5.gemfile rename to gemfiles/capybara_3.0_ruby2.5.8.gemfile index 2719e395..b67f5730 100644 --- a/gemfiles/capybara_3.0_ruby2.2.5.gemfile +++ b/gemfiles/capybara_3.0_ruby2.5.8.gemfile @@ -6,8 +6,8 @@ gem "appraisal", "~> 2.0" gem "mocha", "= 0.13.3" gem "selenium-webdriver", "~> 3.11.0" gem "gem-release", "0.7.4" -gem "rake", "~> 11.0" +gem "rake", "~> 13.0" gem "test-unit", "~> 3.0" -gem "capybara", "~> 3.0.2" +gem "capybara", "~> 3.0" gemspec path: "../" diff --git a/gemfiles/capybara_3.0_ruby2.3.3.gemfile b/gemfiles/capybara_3.0_ruby2.6.6.gemfile similarity index 82% rename from gemfiles/capybara_3.0_ruby2.3.3.gemfile rename to gemfiles/capybara_3.0_ruby2.6.6.gemfile index 2719e395..b67f5730 100644 --- a/gemfiles/capybara_3.0_ruby2.3.3.gemfile +++ b/gemfiles/capybara_3.0_ruby2.6.6.gemfile @@ -6,8 +6,8 @@ gem "appraisal", "~> 2.0" gem "mocha", "= 0.13.3" gem "selenium-webdriver", "~> 3.11.0" gem "gem-release", "0.7.4" -gem "rake", "~> 11.0" +gem "rake", "~> 13.0" gem "test-unit", "~> 3.0" -gem "capybara", "~> 3.0.2" +gem "capybara", "~> 3.0" gemspec path: "../" diff --git a/gemfiles/capybara_3.0_ruby2.7.1.gemfile b/gemfiles/capybara_3.0_ruby2.7.1.gemfile new file mode 100644 index 00000000..b67f5730 --- /dev/null +++ b/gemfiles/capybara_3.0_ruby2.7.1.gemfile @@ -0,0 +1,13 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "appraisal", "~> 2.0" +gem "mocha", "= 0.13.3" +gem "selenium-webdriver", "~> 3.11.0" +gem "gem-release", "0.7.4" +gem "rake", "~> 13.0" +gem "test-unit", "~> 3.0" +gem "capybara", "~> 3.0" + +gemspec path: "../" diff --git a/lib/ae_page_objects/rails/application_router.rb b/lib/ae_page_objects/rails/application_router.rb index 7738edea..4a74c208 100644 --- a/lib/ae_page_objects/rails/application_router.rb +++ b/lib/ae_page_objects/rails/application_router.rb @@ -133,12 +133,12 @@ def generate_path(named_route, *args) private def recognizer - @recognizer ||= case ::Rails.version - when /\A3\.[01]/ + @recognizer ||= case ::Rails.gem_version + when Gem::Requirement.new('>= 3.0', '< 3.2') Recognizer::Rails3.new - when /\A3\.2/ + when Gem::Requirement.new('~> 3.2') Recognizer::Rails32.new - when /\A(4\.[012]|5\.0)/ + when Gem::Requirement.new('>= 4.0', '< 7.0') Recognizer::Rails4Plus.new else warn "[WARNING]: AePageObjects is not tested against Rails #{::Rails.version} and may behave in an undefined manner." diff --git a/test/test_apps/4.2/Appraisals b/test/test_apps/4.2/Appraisals deleted file mode 100644 index e0a01789..00000000 --- a/test/test_apps/4.2/Appraisals +++ /dev/null @@ -1,11 +0,0 @@ -case(RUBY_VERSION) - -when "2.2.5" then - appraise "capybara-3.0-ruby#{RUBY_VERSION}" do - gem 'capybara', '~> 3.0.2' - end -when "2.3.3" then - appraise "capybara-3.0-ruby#{RUBY_VERSION}" do - gem 'capybara', '~> 3.0.2' - end -end diff --git a/test/test_apps/4.2/Gemfile b/test/test_apps/4.2/Gemfile deleted file mode 100644 index f2b944fb..00000000 --- a/test/test_apps/4.2/Gemfile +++ /dev/null @@ -1,32 +0,0 @@ -source 'https://rubygems.org' - -# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 4.2.0' - -# Use sqlite3 as the database for Active Record -gem 'sqlite3', '1.3.11' - -# Use SCSS for stylesheets -gem 'sass-rails', '~> 4.0.2' -gem 'jquery-rails', '3.1.4' - -gem "selenium-webdriver", "~> 3.11.0" -gem 'puma', "~> 3.11.4" -gem "mocha", "0.13.3", :require => false -gem "appraisal", "~> 2.0" - -gem 'ae_page_objects', :path => "../../.." - -# Use Uglifier as compressor for JavaScript assets -gem 'uglifier', '>= 1.3.0' - -# Use CoffeeScript for .js.coffee assets and views -gem 'coffee-rails', '~> 4.0.0' - -# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks -gem 'turbolinks', '2.5.3' - -# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 1.2' - -gem 'forum', :path => "engines" diff --git a/test/test_apps/4.2/app/assets/javascripts/books.js b/test/test_apps/4.2/app/assets/javascripts/books.js deleted file mode 100644 index dee720fa..00000000 --- a/test/test_apps/4.2/app/assets/javascripts/books.js +++ /dev/null @@ -1,2 +0,0 @@ -// Place all the behaviors and hooks related to the matching controller here. -// All this logic will automatically be available in application.js. diff --git a/test/test_apps/4.2/app/assets/stylesheets/application.css b/test/test_apps/4.2/app/assets/stylesheets/application.css deleted file mode 100644 index 3192ec89..00000000 --- a/test/test_apps/4.2/app/assets/stylesheets/application.css +++ /dev/null @@ -1,13 +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, vendor/assets/stylesheets, - * or vendor/assets/stylesheets of plugins, if any, 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 top of the - * compiled file, but it's generally better to create a new file per style scope. - * - *= require_self - *= require_tree . - */ diff --git a/test/test_apps/4.2/app/assets/stylesheets/authors.css.scss b/test/test_apps/4.2/app/assets/stylesheets/authors.css.scss deleted file mode 100644 index 7adde770..00000000 --- a/test/test_apps/4.2/app/assets/stylesheets/authors.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the Authors controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/test/test_apps/4.2/app/assets/stylesheets/books.css.scss b/test/test_apps/4.2/app/assets/stylesheets/books.css.scss deleted file mode 100644 index 9fab565c..00000000 --- a/test/test_apps/4.2/app/assets/stylesheets/books.css.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the Books controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/test/test_apps/4.2/app/assets/stylesheets/scaffolds.css.scss b/test/test_apps/4.2/app/assets/stylesheets/scaffolds.css.scss deleted file mode 100644 index 6ec6a8ff..00000000 --- a/test/test_apps/4.2/app/assets/stylesheets/scaffolds.css.scss +++ /dev/null @@ -1,69 +0,0 @@ -body { - background-color: #fff; - color: #333; - font-family: verdana, arial, helvetica, sans-serif; - font-size: 13px; - line-height: 18px; -} - -p, ol, ul, td { - font-family: verdana, arial, helvetica, sans-serif; - font-size: 13px; - line-height: 18px; -} - -pre { - background-color: #eee; - padding: 10px; - font-size: 11px; -} - -a { - color: #000; - &:visited { - color: #666; - } - &:hover { - color: #fff; - background-color: #000; - } -} - -div { - &.field, &.actions { - margin-bottom: 10px; - } -} - -#notice { - color: green; -} - -.field_with_errors { - padding: 2px; - background-color: red; - display: table; -} - -#error_explanation { - width: 450px; - border: 2px solid red; - padding: 7px; - padding-bottom: 0; - margin-bottom: 20px; - background-color: #f0f0f0; - h2 { - text-align: left; - font-weight: bold; - padding: 5px 5px 5px 15px; - font-size: 12px; - margin: -7px; - margin-bottom: 0px; - background-color: #c00; - color: #fff; - } - ul li { - font-size: 12px; - list-style: square; - } -} diff --git a/test/test_apps/4.2/app/controllers b/test/test_apps/4.2/app/controllers deleted file mode 120000 index 2b705996..00000000 --- a/test/test_apps/4.2/app/controllers +++ /dev/null @@ -1 +0,0 @@ -../../shared/rails4_controllers/ \ No newline at end of file diff --git a/test/test_apps/4.2/app/helpers/authors_helper.rb b/test/test_apps/4.2/app/helpers/authors_helper.rb deleted file mode 100644 index f22e1f9a..00000000 --- a/test/test_apps/4.2/app/helpers/authors_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module AuthorsHelper -end diff --git a/test/test_apps/4.2/app/helpers/books_helper.rb b/test/test_apps/4.2/app/helpers/books_helper.rb deleted file mode 100644 index 4b9311e0..00000000 --- a/test/test_apps/4.2/app/helpers/books_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module BooksHelper -end diff --git a/test/test_apps/4.2/app/views b/test/test_apps/4.2/app/views deleted file mode 120000 index de89e770..00000000 --- a/test/test_apps/4.2/app/views +++ /dev/null @@ -1 +0,0 @@ -../../shared/rails4_views/ \ No newline at end of file diff --git a/test/test_apps/4.2/bin/rails b/test/test_apps/4.2/bin/rails deleted file mode 100755 index 728cd85a..00000000 --- a/test/test_apps/4.2/bin/rails +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env ruby -APP_PATH = File.expand_path('../../config/application', __FILE__) -require_relative '../config/boot' -require 'rails/commands' diff --git a/test/test_apps/4.2/config/application.rb b/test/test_apps/4.2/config/application.rb deleted file mode 100644 index 6e479159..00000000 --- a/test/test_apps/4.2/config/application.rb +++ /dev/null @@ -1,23 +0,0 @@ -require File.expand_path('../boot', __FILE__) - -require 'rails/all' - -# Require the gems listed in Gemfile, including any gems -# you've limited to :test, :development, or :production. -Bundler.require(*Rails.groups) - -module TestApp - class Application < Rails::Application - # Settings in config/environments/* take precedence over those specified here. - # Application configuration should go into files in config/initializers - # -- all .rb files in that directory are automatically loaded. - - # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. - # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. - # config.time_zone = 'Central Time (US & Canada)' - - # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. - # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] - # config.i18n.default_locale = :de - end -end diff --git a/test/test_apps/4.2/config/boot.rb b/test/test_apps/4.2/config/boot.rb deleted file mode 100644 index 5e5f0c1f..00000000 --- a/test/test_apps/4.2/config/boot.rb +++ /dev/null @@ -1,4 +0,0 @@ -# Set up gems listed in the Gemfile. -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) - -require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) diff --git a/test/test_apps/4.2/config/database.yml b/test/test_apps/4.2/config/database.yml deleted file mode 100644 index 89234014..00000000 --- a/test/test_apps/4.2/config/database.yml +++ /dev/null @@ -1,7 +0,0 @@ -development: - adapter: sqlite3 - database: db/development.sqlite3 - -test: - adapter: sqlite3 - database: db/test.sqlite3 diff --git a/test/test_apps/4.2/config/environment.rb b/test/test_apps/4.2/config/environment.rb deleted file mode 100644 index 5d1d053d..00000000 --- a/test/test_apps/4.2/config/environment.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Load the Rails application. -require File.expand_path('../application', __FILE__) - -# Initialize the Rails application. -TestApp::Application.initialize! diff --git a/test/test_apps/4.2/config/environments/development.rb b/test/test_apps/4.2/config/environments/development.rb deleted file mode 100644 index 86f2c590..00000000 --- a/test/test_apps/4.2/config/environments/development.rb +++ /dev/null @@ -1,29 +0,0 @@ -TestApp::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 and disable caching. - config.consider_all_requests_local = true - config.action_controller.perform_caching = false - - # Don't care if the mailer can't send. - config.action_mailer.raise_delivery_errors = 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 - - # Debug mode disables concatenation and preprocessing of assets. - # This option may cause significant delays in view rendering with a large - # number of complex assets. - config.assets.debug = true -end diff --git a/test/test_apps/4.2/config/environments/production.rb b/test/test_apps/4.2/config/environments/production.rb deleted file mode 100644 index a166b5ef..00000000 --- a/test/test_apps/4.2/config/environments/production.rb +++ /dev/null @@ -1,80 +0,0 @@ -TestApp::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 thread 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 - - # Enable Rack::Cache to put a simple HTTP cache in front of your application - # Add `rack-cache` to your Gemfile before enabling this. - # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid. - # config.action_dispatch.rack_cache = true - - # Disable Rails's static asset server (Apache or nginx will already do this). - config.serve_static_assets = false - - # Compress JavaScripts and CSS. - config.assets.js_compressor = :uglifier - # config.assets.css_compressor = :sass - - # Do not fallback to assets pipeline if a precompiled asset is missed. - config.assets.compile = false - - # Generate digests for assets URLs. - config.assets.digest = true - - # Version of your assets, change this if you want to expire all your assets. - config.assets.version = '1.0' - - # 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 - - # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. - # config.force_ssl = true - - # Set to :debug to see everything in the log. - config.log_level = :info - - # Prepend all log lines with the following tags. - # config.log_tags = [ :subdomain, :uuid ] - - # Use a different logger for distributed setups. - # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) - - # Use a different cache store in production. - # config.cache_store = :mem_cache_store - - # Enable serving of images, stylesheets, and JavaScripts from an asset server. - # config.action_controller.asset_host = "http://assets.example.com" - - # Precompile additional assets. - # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. - # config.assets.precompile += %w( search.js ) - - # 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 can not be found). - config.i18n.fallbacks = true - - # Send deprecation notices to registered listeners. - config.active_support.deprecation = :notify - - # Disable automatic flushing of the log to improve performance. - # config.autoflush_log = false - - # Use default logging formatter so that PID and timestamp are not suppressed. - config.log_formatter = ::Logger::Formatter.new -end diff --git a/test/test_apps/4.2/config/initializers/secret_token.rb b/test/test_apps/4.2/config/initializers/secret_token.rb deleted file mode 100644 index 777b8a5e..00000000 --- a/test/test_apps/4.2/config/initializers/secret_token.rb +++ /dev/null @@ -1,13 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Your secret key is used for verifying the integrity of signed cookies. -# If you change this key, all old signed cookies will become invalid! - -# Make sure the secret is at least 30 characters and all random, -# no regular words or you'll be exposed to dictionary attacks. -# You can use `rake secret` to generate a secure secret key. - -# Make sure your secret_key_base is kept private -# if you're sharing your code publicly. -TestApp::Application.config.secret_key_base = '3b3bfb0dd3b5a41982691b6dca1a114ee2026fc70cfa1e773613aff2ed4271b36e066067a4d97a49330620c40d7069458eee559b43f8b2de8e1604a36fa4f7a2' -TestApp::Application.config.secret_token = '11e07bbab31134df2f2e561e41a6ebfdcd0c060cefe35b34d376b196572150adda846eb3de1242878dd2d34aa1d2d12ae3c93185516d6722b7ce4342ed16334d' diff --git a/test/test_apps/4.2/config/initializers/session_store.rb b/test/test_apps/4.2/config/initializers/session_store.rb deleted file mode 100644 index 91ae93f8..00000000 --- a/test/test_apps/4.2/config/initializers/session_store.rb +++ /dev/null @@ -1,3 +0,0 @@ -# Be sure to restart your server when you modify this file. - -TestApp::Application.config.session_store :cookie_store, key: '_bleh_session' diff --git a/test/test_apps/4.2/gemfiles/capybara_3.0_ruby2.2.5.gemfile b/test/test_apps/4.2/gemfiles/capybara_3.0_ruby2.2.5.gemfile deleted file mode 100644 index 9e5b7255..00000000 --- a/test/test_apps/4.2/gemfiles/capybara_3.0_ruby2.2.5.gemfile +++ /dev/null @@ -1,19 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "rails", "~> 4.2.0" -gem "sqlite3", "1.3.11" -gem "sass-rails", "~> 4.0.2" -gem "jquery-rails", "3.1.4" -gem "selenium-webdriver", "~> 3.11.0" -gem "puma", "~> 3.11.4" -gem "mocha", "0.13.3", require: false -gem "appraisal", "~> 2.0" -gem "ae_page_objects", path: "../../../.." -gem "uglifier", ">= 1.3.0" -gem "coffee-rails", "~> 4.0.0" -gem "turbolinks", "2.5.3" -gem "jbuilder", "~> 1.2" -gem "forum", path: "../engines" -gem "capybara", "~> 3.0.2" diff --git a/test/test_apps/4.2/gemfiles/capybara_3.0_ruby2.3.3.gemfile b/test/test_apps/4.2/gemfiles/capybara_3.0_ruby2.3.3.gemfile deleted file mode 100644 index 9e5b7255..00000000 --- a/test/test_apps/4.2/gemfiles/capybara_3.0_ruby2.3.3.gemfile +++ /dev/null @@ -1,19 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "rails", "~> 4.2.0" -gem "sqlite3", "1.3.11" -gem "sass-rails", "~> 4.0.2" -gem "jquery-rails", "3.1.4" -gem "selenium-webdriver", "~> 3.11.0" -gem "puma", "~> 3.11.4" -gem "mocha", "0.13.3", require: false -gem "appraisal", "~> 2.0" -gem "ae_page_objects", path: "../../../.." -gem "uglifier", ">= 1.3.0" -gem "coffee-rails", "~> 4.0.0" -gem "turbolinks", "2.5.3" -gem "jbuilder", "~> 1.2" -gem "forum", path: "../engines" -gem "capybara", "~> 3.0.2" diff --git a/test/test_apps/4.2/test b/test/test_apps/4.2/test deleted file mode 120000 index 99b2d18d..00000000 --- a/test/test_apps/4.2/test +++ /dev/null @@ -1 +0,0 @@ -../shared/test \ No newline at end of file diff --git a/test/test_apps/5.0/Appraisals b/test/test_apps/5.0/Appraisals deleted file mode 100644 index e0a01789..00000000 --- a/test/test_apps/5.0/Appraisals +++ /dev/null @@ -1,11 +0,0 @@ -case(RUBY_VERSION) - -when "2.2.5" then - appraise "capybara-3.0-ruby#{RUBY_VERSION}" do - gem 'capybara', '~> 3.0.2' - end -when "2.3.3" then - appraise "capybara-3.0-ruby#{RUBY_VERSION}" do - gem 'capybara', '~> 3.0.2' - end -end diff --git a/test/test_apps/5.0/bin/bundle b/test/test_apps/5.0/bin/bundle deleted file mode 100755 index 66e9889e..00000000 --- a/test/test_apps/5.0/bin/bundle +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env ruby -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) -load Gem.bin_path('bundler', 'bundle') diff --git a/test/test_apps/5.0/bin/rake b/test/test_apps/5.0/bin/rake deleted file mode 100755 index 17240489..00000000 --- a/test/test_apps/5.0/bin/rake +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env ruby -require_relative '../config/boot' -require 'rake' -Rake.application.run diff --git a/test/test_apps/5.0/public/robots.txt b/test/test_apps/5.0/public/robots.txt deleted file mode 100644 index 3c9c7c01..00000000 --- a/test/test_apps/5.0/public/robots.txt +++ /dev/null @@ -1,5 +0,0 @@ -# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file -# -# To ban all spiders from the entire site uncomment the next two lines: -# User-agent: * -# Disallow: / diff --git a/test/test_apps/5.0/test b/test/test_apps/5.0/test deleted file mode 120000 index 99b2d18d..00000000 --- a/test/test_apps/5.0/test +++ /dev/null @@ -1 +0,0 @@ -../shared/test \ No newline at end of file diff --git a/test/test_apps/5.0/.gitignore b/test/test_apps/5.2/.gitignore similarity index 100% rename from test/test_apps/5.0/.gitignore rename to test/test_apps/5.2/.gitignore diff --git a/test/test_apps/5.2/Appraisals b/test/test_apps/5.2/Appraisals new file mode 100644 index 00000000..28e08f97 --- /dev/null +++ b/test/test_apps/5.2/Appraisals @@ -0,0 +1,7 @@ +case(RUBY_VERSION) + +when '2.5.8', '2.6.6', '2.7.1' then + appraise "capybara-3.0-ruby#{RUBY_VERSION}" do + gem 'capybara', '~> 3.0' + end +end diff --git a/test/test_apps/5.0/Gemfile b/test/test_apps/5.2/Gemfile similarity index 97% rename from test/test_apps/5.0/Gemfile rename to test/test_apps/5.2/Gemfile index aac8cc57..d3d9618f 100644 --- a/test/test_apps/5.0/Gemfile +++ b/test/test_apps/5.2/Gemfile @@ -7,9 +7,9 @@ end # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 5.0.4' +gem 'rails', '~> 5.2' # Use sqlite3 as the database for Active Record -gem 'sqlite3' +gem 'sqlite3', '~> 1.3.6' # Use Puma as the app server gem 'puma', '~> 3.0' # Use SCSS for stylesheets diff --git a/test/test_apps/5.0/README.md b/test/test_apps/5.2/README.md similarity index 100% rename from test/test_apps/5.0/README.md rename to test/test_apps/5.2/README.md diff --git a/test/test_apps/5.0/Rakefile b/test/test_apps/5.2/Rakefile similarity index 100% rename from test/test_apps/5.0/Rakefile rename to test/test_apps/5.2/Rakefile diff --git a/test/test_apps/5.0/app/assets/config/manifest.js b/test/test_apps/5.2/app/assets/config/manifest.js similarity index 100% rename from test/test_apps/5.0/app/assets/config/manifest.js rename to test/test_apps/5.2/app/assets/config/manifest.js diff --git a/test/test_apps/4.2/app/assets/images/.keep b/test/test_apps/5.2/app/assets/images/.keep similarity index 100% rename from test/test_apps/4.2/app/assets/images/.keep rename to test/test_apps/5.2/app/assets/images/.keep diff --git a/test/test_apps/5.0/app/assets/javascripts/application.js b/test/test_apps/5.2/app/assets/javascripts/application.js similarity index 100% rename from test/test_apps/5.0/app/assets/javascripts/application.js rename to test/test_apps/5.2/app/assets/javascripts/application.js diff --git a/test/test_apps/4.2/app/assets/javascripts/authors.js b/test/test_apps/5.2/app/assets/javascripts/authors.js similarity index 100% rename from test/test_apps/4.2/app/assets/javascripts/authors.js rename to test/test_apps/5.2/app/assets/javascripts/authors.js diff --git a/test/test_apps/5.0/app/assets/javascripts/cable.js b/test/test_apps/5.2/app/assets/javascripts/cable.js similarity index 100% rename from test/test_apps/5.0/app/assets/javascripts/cable.js rename to test/test_apps/5.2/app/assets/javascripts/cable.js diff --git a/test/test_apps/4.2/app/mailers/.keep b/test/test_apps/5.2/app/assets/javascripts/channels/.keep similarity index 100% rename from test/test_apps/4.2/app/mailers/.keep rename to test/test_apps/5.2/app/assets/javascripts/channels/.keep diff --git a/test/test_apps/5.0/app/assets/stylesheets/application.css b/test/test_apps/5.2/app/assets/stylesheets/application.css similarity index 100% rename from test/test_apps/5.0/app/assets/stylesheets/application.css rename to test/test_apps/5.2/app/assets/stylesheets/application.css diff --git a/test/test_apps/5.0/app/channels/application_cable/channel.rb b/test/test_apps/5.2/app/channels/application_cable/channel.rb similarity index 100% rename from test/test_apps/5.0/app/channels/application_cable/channel.rb rename to test/test_apps/5.2/app/channels/application_cable/channel.rb diff --git a/test/test_apps/5.0/app/channels/application_cable/connection.rb b/test/test_apps/5.2/app/channels/application_cable/connection.rb similarity index 100% rename from test/test_apps/5.0/app/channels/application_cable/connection.rb rename to test/test_apps/5.2/app/channels/application_cable/connection.rb diff --git a/test/test_apps/5.0/app/controllers b/test/test_apps/5.2/app/controllers similarity index 100% rename from test/test_apps/5.0/app/controllers rename to test/test_apps/5.2/app/controllers diff --git a/test/test_apps/4.2/app/helpers/application_helper.rb b/test/test_apps/5.2/app/helpers/application_helper.rb similarity index 100% rename from test/test_apps/4.2/app/helpers/application_helper.rb rename to test/test_apps/5.2/app/helpers/application_helper.rb diff --git a/test/test_apps/5.0/app/jobs/application_job.rb b/test/test_apps/5.2/app/jobs/application_job.rb similarity index 100% rename from test/test_apps/5.0/app/jobs/application_job.rb rename to test/test_apps/5.2/app/jobs/application_job.rb diff --git a/test/test_apps/5.0/app/mailers/application_mailer.rb b/test/test_apps/5.2/app/mailers/application_mailer.rb similarity index 100% rename from test/test_apps/5.0/app/mailers/application_mailer.rb rename to test/test_apps/5.2/app/mailers/application_mailer.rb diff --git a/test/test_apps/5.0/app/models b/test/test_apps/5.2/app/models similarity index 100% rename from test/test_apps/5.0/app/models rename to test/test_apps/5.2/app/models diff --git a/test/test_apps/5.0/app/views b/test/test_apps/5.2/app/views similarity index 100% rename from test/test_apps/5.0/app/views rename to test/test_apps/5.2/app/views diff --git a/test/test_apps/4.2/bin/bundle b/test/test_apps/5.2/bin/bundle similarity index 100% rename from test/test_apps/4.2/bin/bundle rename to test/test_apps/5.2/bin/bundle diff --git a/test/test_apps/5.0/bin/rails b/test/test_apps/5.2/bin/rails similarity index 100% rename from test/test_apps/5.0/bin/rails rename to test/test_apps/5.2/bin/rails diff --git a/test/test_apps/4.2/bin/rake b/test/test_apps/5.2/bin/rake similarity index 100% rename from test/test_apps/4.2/bin/rake rename to test/test_apps/5.2/bin/rake diff --git a/test/test_apps/5.0/bin/setup b/test/test_apps/5.2/bin/setup similarity index 100% rename from test/test_apps/5.0/bin/setup rename to test/test_apps/5.2/bin/setup diff --git a/test/test_apps/5.0/bin/update b/test/test_apps/5.2/bin/update similarity index 100% rename from test/test_apps/5.0/bin/update rename to test/test_apps/5.2/bin/update diff --git a/test/test_apps/5.0/config.ru b/test/test_apps/5.2/config.ru similarity index 100% rename from test/test_apps/5.0/config.ru rename to test/test_apps/5.2/config.ru diff --git a/test/test_apps/5.0/config/application.rb b/test/test_apps/5.2/config/application.rb similarity index 100% rename from test/test_apps/5.0/config/application.rb rename to test/test_apps/5.2/config/application.rb diff --git a/test/test_apps/5.0/config/boot.rb b/test/test_apps/5.2/config/boot.rb similarity index 100% rename from test/test_apps/5.0/config/boot.rb rename to test/test_apps/5.2/config/boot.rb diff --git a/test/test_apps/5.0/config/cable.yml b/test/test_apps/5.2/config/cable.yml similarity index 100% rename from test/test_apps/5.0/config/cable.yml rename to test/test_apps/5.2/config/cable.yml diff --git a/test/test_apps/5.0/config/database.yml b/test/test_apps/5.2/config/database.yml similarity index 100% rename from test/test_apps/5.0/config/database.yml rename to test/test_apps/5.2/config/database.yml diff --git a/test/test_apps/5.0/config/environment.rb b/test/test_apps/5.2/config/environment.rb similarity index 100% rename from test/test_apps/5.0/config/environment.rb rename to test/test_apps/5.2/config/environment.rb diff --git a/test/test_apps/5.0/config/environments/development.rb b/test/test_apps/5.2/config/environments/development.rb similarity index 100% rename from test/test_apps/5.0/config/environments/development.rb rename to test/test_apps/5.2/config/environments/development.rb diff --git a/test/test_apps/5.0/config/environments/production.rb b/test/test_apps/5.2/config/environments/production.rb similarity index 100% rename from test/test_apps/5.0/config/environments/production.rb rename to test/test_apps/5.2/config/environments/production.rb diff --git a/test/test_apps/5.0/config/environments/test.rb b/test/test_apps/5.2/config/environments/test.rb similarity index 100% rename from test/test_apps/5.0/config/environments/test.rb rename to test/test_apps/5.2/config/environments/test.rb diff --git a/test/test_apps/5.0/config/initializers/application_controller_renderer.rb b/test/test_apps/5.2/config/initializers/application_controller_renderer.rb similarity index 100% rename from test/test_apps/5.0/config/initializers/application_controller_renderer.rb rename to test/test_apps/5.2/config/initializers/application_controller_renderer.rb diff --git a/test/test_apps/5.0/config/initializers/assets.rb b/test/test_apps/5.2/config/initializers/assets.rb similarity index 100% rename from test/test_apps/5.0/config/initializers/assets.rb rename to test/test_apps/5.2/config/initializers/assets.rb diff --git a/test/test_apps/5.0/config/initializers/backtrace_silencers.rb b/test/test_apps/5.2/config/initializers/backtrace_silencers.rb similarity index 100% rename from test/test_apps/5.0/config/initializers/backtrace_silencers.rb rename to test/test_apps/5.2/config/initializers/backtrace_silencers.rb diff --git a/test/test_apps/5.0/config/initializers/cookies_serializer.rb b/test/test_apps/5.2/config/initializers/cookies_serializer.rb similarity index 100% rename from test/test_apps/5.0/config/initializers/cookies_serializer.rb rename to test/test_apps/5.2/config/initializers/cookies_serializer.rb diff --git a/test/test_apps/4.2/config/initializers/filter_parameter_logging.rb b/test/test_apps/5.2/config/initializers/filter_parameter_logging.rb similarity index 100% rename from test/test_apps/4.2/config/initializers/filter_parameter_logging.rb rename to test/test_apps/5.2/config/initializers/filter_parameter_logging.rb diff --git a/test/test_apps/4.2/config/initializers/inflections.rb b/test/test_apps/5.2/config/initializers/inflections.rb similarity index 100% rename from test/test_apps/4.2/config/initializers/inflections.rb rename to test/test_apps/5.2/config/initializers/inflections.rb diff --git a/test/test_apps/5.0/config/initializers/mime_types.rb b/test/test_apps/5.2/config/initializers/mime_types.rb similarity index 100% rename from test/test_apps/5.0/config/initializers/mime_types.rb rename to test/test_apps/5.2/config/initializers/mime_types.rb diff --git a/test/test_apps/5.0/config/initializers/new_framework_defaults.rb b/test/test_apps/5.2/config/initializers/new_framework_defaults.rb similarity index 87% rename from test/test_apps/5.0/config/initializers/new_framework_defaults.rb rename to test/test_apps/5.2/config/initializers/new_framework_defaults.rb index 676636ee..24be2b9e 100644 --- a/test/test_apps/5.0/config/initializers/new_framework_defaults.rb +++ b/test/test_apps/5.2/config/initializers/new_framework_defaults.rb @@ -19,8 +19,5 @@ # Require `belongs_to` associations by default. Previous versions had false. Rails.application.config.active_record.belongs_to_required_by_default = true -# Do not halt callback chains when a callback returns false. Previous versions had true. -ActiveSupport.halt_callback_chains_on_return_false = false - # Configure SSL options to enable HSTS with subdomains. Previous versions had false. Rails.application.config.ssl_options = { hsts: { subdomains: true } } diff --git a/test/test_apps/5.0/config/initializers/session_store.rb b/test/test_apps/5.2/config/initializers/session_store.rb similarity index 100% rename from test/test_apps/5.0/config/initializers/session_store.rb rename to test/test_apps/5.2/config/initializers/session_store.rb diff --git a/test/test_apps/5.0/config/initializers/wrap_parameters.rb b/test/test_apps/5.2/config/initializers/wrap_parameters.rb similarity index 100% rename from test/test_apps/5.0/config/initializers/wrap_parameters.rb rename to test/test_apps/5.2/config/initializers/wrap_parameters.rb diff --git a/test/test_apps/4.2/config/locales/en.yml b/test/test_apps/5.2/config/locales/en.yml similarity index 100% rename from test/test_apps/4.2/config/locales/en.yml rename to test/test_apps/5.2/config/locales/en.yml diff --git a/test/test_apps/5.0/config/puma.rb b/test/test_apps/5.2/config/puma.rb similarity index 100% rename from test/test_apps/5.0/config/puma.rb rename to test/test_apps/5.2/config/puma.rb diff --git a/test/test_apps/4.2/config/routes.rb b/test/test_apps/5.2/config/routes.rb similarity index 100% rename from test/test_apps/4.2/config/routes.rb rename to test/test_apps/5.2/config/routes.rb diff --git a/test/test_apps/5.0/config/secrets.yml b/test/test_apps/5.2/config/secrets.yml similarity index 100% rename from test/test_apps/5.0/config/secrets.yml rename to test/test_apps/5.2/config/secrets.yml diff --git a/test/test_apps/4.2/db b/test/test_apps/5.2/db similarity index 100% rename from test/test_apps/4.2/db rename to test/test_apps/5.2/db diff --git a/test/test_apps/4.2/engines b/test/test_apps/5.2/engines similarity index 100% rename from test/test_apps/4.2/engines rename to test/test_apps/5.2/engines diff --git a/test/test_apps/5.0/gemfiles/capybara_3.0_ruby2.3.3.gemfile b/test/test_apps/5.2/gemfiles/capybara_3.0_ruby2.5.8.gemfile similarity index 90% rename from test/test_apps/5.0/gemfiles/capybara_3.0_ruby2.3.3.gemfile rename to test/test_apps/5.2/gemfiles/capybara_3.0_ruby2.5.8.gemfile index baac2132..f39d717e 100644 --- a/test/test_apps/5.0/gemfiles/capybara_3.0_ruby2.3.3.gemfile +++ b/test/test_apps/5.2/gemfiles/capybara_3.0_ruby2.5.8.gemfile @@ -2,8 +2,8 @@ source "https://rubygems.org" -gem "rails", "~> 5.0.4" -gem "sqlite3" +gem "rails", "~> 5.2" +gem "sqlite3", "~> 1.3.6" gem "puma", "~> 3.0" gem "sass-rails", "~> 5.0" gem "uglifier", ">= 1.3.0" @@ -13,7 +13,7 @@ gem "turbolinks", "~> 5" gem "jbuilder", "~> 2.5" gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem "forum", path: "../engines" -gem "capybara", "~> 3.0.2" +gem "capybara", "~> 3.0" group :development, :test do gem "byebug", platform: :mri diff --git a/test/test_apps/5.0/gemfiles/capybara_3.0_ruby2.2.5.gemfile b/test/test_apps/5.2/gemfiles/capybara_3.0_ruby2.6.6.gemfile similarity index 90% rename from test/test_apps/5.0/gemfiles/capybara_3.0_ruby2.2.5.gemfile rename to test/test_apps/5.2/gemfiles/capybara_3.0_ruby2.6.6.gemfile index baac2132..f39d717e 100644 --- a/test/test_apps/5.0/gemfiles/capybara_3.0_ruby2.2.5.gemfile +++ b/test/test_apps/5.2/gemfiles/capybara_3.0_ruby2.6.6.gemfile @@ -2,8 +2,8 @@ source "https://rubygems.org" -gem "rails", "~> 5.0.4" -gem "sqlite3" +gem "rails", "~> 5.2" +gem "sqlite3", "~> 1.3.6" gem "puma", "~> 3.0" gem "sass-rails", "~> 5.0" gem "uglifier", ">= 1.3.0" @@ -13,7 +13,7 @@ gem "turbolinks", "~> 5" gem "jbuilder", "~> 2.5" gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem "forum", path: "../engines" -gem "capybara", "~> 3.0.2" +gem "capybara", "~> 3.0" group :development, :test do gem "byebug", platform: :mri diff --git a/test/test_apps/5.2/gemfiles/capybara_3.0_ruby2.7.1.gemfile b/test/test_apps/5.2/gemfiles/capybara_3.0_ruby2.7.1.gemfile new file mode 100644 index 00000000..f39d717e --- /dev/null +++ b/test/test_apps/5.2/gemfiles/capybara_3.0_ruby2.7.1.gemfile @@ -0,0 +1,32 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 5.2" +gem "sqlite3", "~> 1.3.6" +gem "puma", "~> 3.0" +gem "sass-rails", "~> 5.0" +gem "uglifier", ">= 1.3.0" +gem "coffee-rails", "~> 4.2" +gem "jquery-rails" +gem "turbolinks", "~> 5" +gem "jbuilder", "~> 2.5" +gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] +gem "forum", path: "../engines" +gem "capybara", "~> 3.0" + +group :development, :test do + gem "byebug", platform: :mri +end + +group :development do + gem "web-console", ">= 3.3.0" + gem "listen", "~> 3.0.5" +end + +group :test do + gem "selenium-webdriver", "~> 3.11.0" + gem "mocha", "0.13.3", require: false + gem "appraisal", "~> 2.0" + gem "ae_page_objects", path: "../../../.." +end diff --git a/test/test_apps/4.2/lib/assets/.keep b/test/test_apps/5.2/lib/assets/.keep similarity index 100% rename from test/test_apps/4.2/lib/assets/.keep rename to test/test_apps/5.2/lib/assets/.keep diff --git a/test/test_apps/4.2/lib/tasks/.keep b/test/test_apps/5.2/lib/tasks/.keep similarity index 100% rename from test/test_apps/4.2/lib/tasks/.keep rename to test/test_apps/5.2/lib/tasks/.keep diff --git a/test/test_apps/4.2/log/.keep b/test/test_apps/5.2/log/.keep similarity index 100% rename from test/test_apps/4.2/log/.keep rename to test/test_apps/5.2/log/.keep diff --git a/test/test_apps/5.0/public/404.html b/test/test_apps/5.2/public/404.html similarity index 100% rename from test/test_apps/5.0/public/404.html rename to test/test_apps/5.2/public/404.html diff --git a/test/test_apps/5.0/public/422.html b/test/test_apps/5.2/public/422.html similarity index 100% rename from test/test_apps/5.0/public/422.html rename to test/test_apps/5.2/public/422.html diff --git a/test/test_apps/5.0/public/500.html b/test/test_apps/5.2/public/500.html similarity index 100% rename from test/test_apps/5.0/public/500.html rename to test/test_apps/5.2/public/500.html diff --git a/test/test_apps/5.0/public/apple-touch-icon-precomposed.png b/test/test_apps/5.2/public/apple-touch-icon-precomposed.png similarity index 100% rename from test/test_apps/5.0/public/apple-touch-icon-precomposed.png rename to test/test_apps/5.2/public/apple-touch-icon-precomposed.png diff --git a/test/test_apps/5.0/public/apple-touch-icon.png b/test/test_apps/5.2/public/apple-touch-icon.png similarity index 100% rename from test/test_apps/5.0/public/apple-touch-icon.png rename to test/test_apps/5.2/public/apple-touch-icon.png diff --git a/test/test_apps/4.2/public/favicon.ico b/test/test_apps/5.2/public/favicon.ico similarity index 100% rename from test/test_apps/4.2/public/favicon.ico rename to test/test_apps/5.2/public/favicon.ico diff --git a/test/test_apps/4.2/public/robots.txt b/test/test_apps/5.2/public/robots.txt similarity index 100% rename from test/test_apps/4.2/public/robots.txt rename to test/test_apps/5.2/public/robots.txt diff --git a/test/test_apps/5.2/test/fixtures b/test/test_apps/5.2/test/fixtures new file mode 120000 index 00000000..8d43d9d5 --- /dev/null +++ b/test/test_apps/5.2/test/fixtures @@ -0,0 +1 @@ +../../shared/test/fixtures \ No newline at end of file diff --git a/test/test_apps/5.2/test/page_objects b/test/test_apps/5.2/test/page_objects new file mode 120000 index 00000000..1efa1958 --- /dev/null +++ b/test/test_apps/5.2/test/page_objects @@ -0,0 +1 @@ +../../shared/test/page_objects \ No newline at end of file diff --git a/test/test_apps/5.2/test/page_objects.rb b/test/test_apps/5.2/test/page_objects.rb new file mode 120000 index 00000000..fed1bfd2 --- /dev/null +++ b/test/test_apps/5.2/test/page_objects.rb @@ -0,0 +1 @@ +../../shared/test/page_objects.rb \ No newline at end of file diff --git a/test/test_apps/5.2/test/selenium b/test/test_apps/5.2/test/selenium new file mode 120000 index 00000000..cfc1b631 --- /dev/null +++ b/test/test_apps/5.2/test/selenium @@ -0,0 +1 @@ +../../shared/test/selenium \ No newline at end of file diff --git a/test/test_apps/shared/test/selenium_helper.rb b/test/test_apps/5.2/test/selenium_helper.rb similarity index 89% rename from test/test_apps/shared/test/selenium_helper.rb rename to test/test_apps/5.2/test/selenium_helper.rb index adbe4b4f..fa8fad43 100644 --- a/test/test_apps/shared/test/selenium_helper.rb +++ b/test/test_apps/5.2/test/selenium_helper.rb @@ -5,7 +5,9 @@ require "config/environment" # Run the migrations -ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate") +ActiveRecord::MigrationContext + .new(ActiveRecord::Migrator.migrations_paths) + .migrate require "rails/test_help" @@ -17,7 +19,7 @@ class TestCase < ActiveSupport::TestCase include Capybara::DSL self.use_instantiated_fixtures = false - self.use_transactional_fixtures = false + self.use_transactional_tests = false fixtures :all diff --git a/test/test_apps/4.2/vendor/assets/javascripts/.keep b/test/test_apps/5.2/tmp/.keep similarity index 100% rename from test/test_apps/4.2/vendor/assets/javascripts/.keep rename to test/test_apps/5.2/tmp/.keep diff --git a/test/test_apps/4.2/vendor/assets/stylesheets/.keep b/test/test_apps/5.2/vendor/assets/javascripts/.keep similarity index 100% rename from test/test_apps/4.2/vendor/assets/stylesheets/.keep rename to test/test_apps/5.2/vendor/assets/javascripts/.keep diff --git a/test/test_apps/5.0/app/assets/images/.keep b/test/test_apps/5.2/vendor/assets/stylesheets/.keep similarity index 100% rename from test/test_apps/5.0/app/assets/images/.keep rename to test/test_apps/5.2/vendor/assets/stylesheets/.keep diff --git a/test/test_apps/6.0/.browserslistrc b/test/test_apps/6.0/.browserslistrc new file mode 100644 index 00000000..e94f8140 --- /dev/null +++ b/test/test_apps/6.0/.browserslistrc @@ -0,0 +1 @@ +defaults diff --git a/test/test_apps/4.2/.gitignore b/test/test_apps/6.0/.gitignore similarity index 57% rename from test/test_apps/4.2/.gitignore rename to test/test_apps/6.0/.gitignore index 6a502e99..e1debd1f 100644 --- a/test/test_apps/4.2/.gitignore +++ b/test/test_apps/6.0/.gitignore @@ -10,7 +10,27 @@ # Ignore the default SQLite database. /db/*.sqlite3 /db/*.sqlite3-journal +/db/*.sqlite3-* # Ignore all logfiles and tempfiles. -/log/*.log -/tmp +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore uploaded files in development. +/storage/* +!/storage/.keep + +/public/assets +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key + +/public/packs +/public/packs-test +/node_modules +/yarn-error.log +yarn-debug.log* +.yarn-integrity diff --git a/test/test_apps/6.0/Appraisals b/test/test_apps/6.0/Appraisals new file mode 100644 index 00000000..30510eba --- /dev/null +++ b/test/test_apps/6.0/Appraisals @@ -0,0 +1,9 @@ +case(RUBY_VERSION) + +when '2.5.8', '2.6.6', '2.7.1' then + appraise "capybara-3.0-ruby#{RUBY_VERSION}" do + group :test do + gem 'capybara', '~> 3.0' + end + end +end diff --git a/test/test_apps/6.0/Gemfile b/test/test_apps/6.0/Gemfile new file mode 100644 index 00000000..d34259ac --- /dev/null +++ b/test/test_apps/6.0/Gemfile @@ -0,0 +1,57 @@ +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.2' +# Use sqlite3 as the database for Active Record +gem 'sqlite3', '~> 1.4' +# Use Puma as the app server +gem 'puma', '~> 4.1' +# Use SCSS for stylesheets +gem 'sass-rails', '>= 6' +# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker +gem 'webpacker', '~> 4.0' +gem 'jquery-rails' +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks +gem 'turbolinks', '~> 5' +# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder +gem 'jbuilder', '~> 2.7' +# Use Redis adapter to run Action Cable in production +# gem 'redis', '~> 4.0' +# Use Active Model has_secure_password +# gem 'bcrypt', '~> 3.1.7' + +# Use Active Storage variant +# gem 'image_processing', '~> 1.2' + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.4.2', require: false + +gem 'forum', path: 'engines' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + # Access an interactive console on exception pages or by calling 'console' anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '>= 3.0.5', '< 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +group :test do + gem 'ae_page_objects', path: '../../..' + gem 'appraisal', '~> 2.0' + # Adds support for Capybara system testing and selenium driver + gem 'capybara', '>= 2.15' + gem 'selenium-webdriver' + # Easy installation and use of web drivers to run system tests with browsers + gem 'webdrivers' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] diff --git a/test/test_apps/6.0/README.md b/test/test_apps/6.0/README.md new file mode 100644 index 00000000..7db80e4c --- /dev/null +++ b/test/test_apps/6.0/README.md @@ -0,0 +1,24 @@ +# 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/test/test_apps/4.2/Rakefile b/test/test_apps/6.0/Rakefile similarity index 62% rename from test/test_apps/4.2/Rakefile rename to test/test_apps/6.0/Rakefile index 049561dc..f482aa7a 100644 --- a/test/test_apps/4.2/Rakefile +++ b/test/test_apps/6.0/Rakefile @@ -1,18 +1,16 @@ # 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 File.expand_path('../config/application', __FILE__) +require 'rake/testtask.rb' +require_relative 'config/application' -TestApp::Application.load_tasks +Rails.application.load_tasks namespace :test do Rake::TestTask.new(:selenium) do |t| - t.libs << "test" + t.libs << 'test' t.pattern = 'test/selenium/**/*_test.rb' t.verbose = true - - if t.respond_to?(:warning=) - t.warning = false - end + t.warning = false end end diff --git a/test/test_apps/6.0/app/assets/config/manifest.js b/test/test_apps/6.0/app/assets/config/manifest.js new file mode 100644 index 00000000..b16e53d6 --- /dev/null +++ b/test/test_apps/6.0/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css diff --git a/test/test_apps/5.0/app/assets/javascripts/channels/.keep b/test/test_apps/6.0/app/assets/images/.keep similarity index 100% rename from test/test_apps/5.0/app/assets/javascripts/channels/.keep rename to test/test_apps/6.0/app/assets/images/.keep diff --git a/test/test_apps/4.2/app/assets/javascripts/application.js b/test/test_apps/6.0/app/assets/javascripts/application.js similarity index 60% rename from test/test_apps/4.2/app/assets/javascripts/application.js rename to test/test_apps/6.0/app/assets/javascripts/application.js index d6925fa4..b12018d0 100644 --- a/test/test_apps/4.2/app/assets/javascripts/application.js +++ b/test/test_apps/6.0/app/assets/javascripts/application.js @@ -2,12 +2,12 @@ // listed below. // // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, -// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path. +// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path. // // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -// compiled file. +// compiled file. JavaScript code in this file should be added after the last require_* statement. // -// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details // about supported directives. // //= require jquery diff --git a/test/test_apps/5.0/app/assets/javascripts/authors.js b/test/test_apps/6.0/app/assets/javascripts/authors.js similarity index 100% rename from test/test_apps/5.0/app/assets/javascripts/authors.js rename to test/test_apps/6.0/app/assets/javascripts/authors.js diff --git a/test/test_apps/6.0/app/assets/javascripts/cable.js b/test/test_apps/6.0/app/assets/javascripts/cable.js new file mode 100644 index 00000000..71ee1e66 --- /dev/null +++ b/test/test_apps/6.0/app/assets/javascripts/cable.js @@ -0,0 +1,13 @@ +// 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. +// +//= require action_cable +//= require_self +//= require_tree ./channels + +(function() { + this.App || (this.App = {}); + + App.cable = ActionCable.createConsumer(); + +}).call(this); diff --git a/test/test_apps/5.0/lib/assets/.keep b/test/test_apps/6.0/app/assets/javascripts/channels/.keep similarity index 100% rename from test/test_apps/5.0/lib/assets/.keep rename to test/test_apps/6.0/app/assets/javascripts/channels/.keep diff --git a/test/test_apps/6.0/app/assets/stylesheets/application.css b/test/test_apps/6.0/app/assets/stylesheets/application.css new file mode 100644 index 00000000..d05ea0f5 --- /dev/null +++ b/test/test_apps/6.0/app/assets/stylesheets/application.css @@ -0,0 +1,15 @@ +/* + * 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/test/test_apps/6.0/app/channels/application_cable/channel.rb b/test/test_apps/6.0/app/channels/application_cable/channel.rb new file mode 100644 index 00000000..d6726972 --- /dev/null +++ b/test/test_apps/6.0/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/test/test_apps/6.0/app/channels/application_cable/connection.rb b/test/test_apps/6.0/app/channels/application_cable/connection.rb new file mode 100644 index 00000000..0ff5442f --- /dev/null +++ b/test/test_apps/6.0/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/test/test_apps/6.0/app/controllers b/test/test_apps/6.0/app/controllers new file mode 120000 index 00000000..a80ee754 --- /dev/null +++ b/test/test_apps/6.0/app/controllers @@ -0,0 +1 @@ +../../shared/controllers \ No newline at end of file diff --git a/test/test_apps/5.0/app/helpers/application_helper.rb b/test/test_apps/6.0/app/helpers/application_helper.rb similarity index 100% rename from test/test_apps/5.0/app/helpers/application_helper.rb rename to test/test_apps/6.0/app/helpers/application_helper.rb diff --git a/test/test_apps/6.0/app/javascript/channels/consumer.js b/test/test_apps/6.0/app/javascript/channels/consumer.js new file mode 100644 index 00000000..0eceb59b --- /dev/null +++ b/test/test_apps/6.0/app/javascript/channels/consumer.js @@ -0,0 +1,6 @@ +// 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/test/test_apps/6.0/app/javascript/channels/index.js b/test/test_apps/6.0/app/javascript/channels/index.js new file mode 100644 index 00000000..0cfcf749 --- /dev/null +++ b/test/test_apps/6.0/app/javascript/channels/index.js @@ -0,0 +1,5 @@ +// 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/test/test_apps/6.0/app/javascript/packs/application.js b/test/test_apps/6.0/app/javascript/packs/application.js new file mode 100644 index 00000000..9cd55d4b --- /dev/null +++ b/test/test_apps/6.0/app/javascript/packs/application.js @@ -0,0 +1,17 @@ +// 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("@rails/activestorage").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/test/test_apps/6.0/app/jobs/application_job.rb b/test/test_apps/6.0/app/jobs/application_job.rb new file mode 100644 index 00000000..d394c3d1 --- /dev/null +++ b/test/test_apps/6.0/app/jobs/application_job.rb @@ -0,0 +1,7 @@ +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/test/test_apps/6.0/app/mailers/application_mailer.rb b/test/test_apps/6.0/app/mailers/application_mailer.rb new file mode 100644 index 00000000..286b2239 --- /dev/null +++ b/test/test_apps/6.0/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/test/test_apps/4.2/app/models b/test/test_apps/6.0/app/models similarity index 100% rename from test/test_apps/4.2/app/models rename to test/test_apps/6.0/app/models diff --git a/test/test_apps/6.0/app/views b/test/test_apps/6.0/app/views new file mode 120000 index 00000000..28ae106c --- /dev/null +++ b/test/test_apps/6.0/app/views @@ -0,0 +1 @@ +../../shared/views \ No newline at end of file diff --git a/test/test_apps/6.0/babel.config.js b/test/test_apps/6.0/babel.config.js new file mode 100644 index 00000000..12f98da5 --- /dev/null +++ b/test/test_apps/6.0/babel.config.js @@ -0,0 +1,72 @@ +module.exports = function(api) { + var validEnv = ['development', 'test', 'production'] + var currentEnv = api.env() + var isDevelopmentEnv = api.env('development') + var isProductionEnv = api.env('production') + var isTestEnv = api.env('test') + + if (!validEnv.includes(currentEnv)) { + throw new Error( + 'Please specify a valid `NODE_ENV` or ' + + '`BABEL_ENV` environment variables. Valid values are "development", ' + + '"test", and "production". Instead, received: ' + + JSON.stringify(currentEnv) + + '.' + ) + } + + return { + presets: [ + isTestEnv && [ + '@babel/preset-env', + { + targets: { + node: 'current' + } + } + ], + (isProductionEnv || isDevelopmentEnv) && [ + '@babel/preset-env', + { + forceAllTransforms: true, + useBuiltIns: 'entry', + corejs: 3, + modules: false, + exclude: ['transform-typeof-symbol'] + } + ] + ].filter(Boolean), + plugins: [ + 'babel-plugin-macros', + '@babel/plugin-syntax-dynamic-import', + isTestEnv && 'babel-plugin-dynamic-import-node', + '@babel/plugin-transform-destructuring', + [ + '@babel/plugin-proposal-class-properties', + { + loose: true + } + ], + [ + '@babel/plugin-proposal-object-rest-spread', + { + useBuiltIns: true + } + ], + [ + '@babel/plugin-transform-runtime', + { + helpers: false, + regenerator: true, + corejs: false + } + ], + [ + '@babel/plugin-transform-regenerator', + { + async: false + } + ] + ].filter(Boolean) + } +} diff --git a/test/test_apps/6.0/bin/bundle b/test/test_apps/6.0/bin/bundle new file mode 100755 index 00000000..a71368e3 --- /dev/null +++ b/test/test_apps/6.0/bin/bundle @@ -0,0 +1,114 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'bundle' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require "rubygems" + +m = Module.new do + module_function + + def invoked_as_script? + File.expand_path($0) == File.expand_path(__FILE__) + end + + def env_var_version + ENV["BUNDLER_VERSION"] + end + + def cli_arg_version + return unless invoked_as_script? # don't want to hijack other binstubs + return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update` + bundler_version = nil + update_index = nil + ARGV.each_with_index do |a, i| + if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN + bundler_version = a + end + next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/ + bundler_version = $1 + update_index = i + end + bundler_version + end + + def gemfile + gemfile = ENV["BUNDLE_GEMFILE"] + return gemfile if gemfile && !gemfile.empty? + + File.expand_path("../../Gemfile", __FILE__) + end + + def lockfile + lockfile = + case File.basename(gemfile) + when "gems.rb" then gemfile.sub(/\.rb$/, gemfile) + else "#{gemfile}.lock" + end + File.expand_path(lockfile) + end + + def lockfile_version + return unless File.file?(lockfile) + lockfile_contents = File.read(lockfile) + return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/ + Regexp.last_match(1) + end + + def bundler_version + @bundler_version ||= + env_var_version || cli_arg_version || + lockfile_version + end + + def bundler_requirement + return "#{Gem::Requirement.default}.a" unless bundler_version + + bundler_gem_version = Gem::Version.new(bundler_version) + + requirement = bundler_gem_version.approximate_recommendation + + return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0") + + requirement += ".a" if bundler_gem_version.prerelease? + + requirement + end + + def load_bundler! + ENV["BUNDLE_GEMFILE"] ||= gemfile + + activate_bundler + end + + def activate_bundler + gem_error = activation_error_handling do + gem "bundler", bundler_requirement + end + return if gem_error.nil? + require_error = activation_error_handling do + require "bundler/version" + end + return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION)) + warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`" + exit 42 + end + + def activation_error_handling + yield + nil + rescue StandardError, LoadError => e + e + end +end + +m.load_bundler! + +if m.invoked_as_script? + load Gem.bin_path("bundler", "bundle") +end diff --git a/test/test_apps/6.0/bin/rails b/test/test_apps/6.0/bin/rails new file mode 100755 index 00000000..5badb2fd --- /dev/null +++ b/test/test_apps/6.0/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/test/test_apps/6.0/bin/rake b/test/test_apps/6.0/bin/rake new file mode 100755 index 00000000..d87d5f57 --- /dev/null +++ b/test/test_apps/6.0/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/test/test_apps/6.0/bin/setup b/test/test_apps/6.0/bin/setup new file mode 100755 index 00000000..5853b5ea --- /dev/null +++ b/test/test_apps/6.0/bin/setup @@ -0,0 +1,36 @@ +#!/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/test/test_apps/6.0/bin/spring b/test/test_apps/6.0/bin/spring new file mode 100755 index 00000000..d89ee495 --- /dev/null +++ b/test/test_apps/6.0/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads Spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == 'spring' } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/test/test_apps/6.0/bin/webpack b/test/test_apps/6.0/bin/webpack new file mode 100755 index 00000000..1031168d --- /dev/null +++ b/test/test_apps/6.0/bin/webpack @@ -0,0 +1,18 @@ +#!/usr/bin/env ruby + +ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development" +ENV["NODE_ENV"] ||= "development" + +require "pathname" +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", + Pathname.new(__FILE__).realpath) + +require "bundler/setup" + +require "webpacker" +require "webpacker/webpack_runner" + +APP_ROOT = File.expand_path("..", __dir__) +Dir.chdir(APP_ROOT) do + Webpacker::WebpackRunner.run(ARGV) +end diff --git a/test/test_apps/6.0/bin/webpack-dev-server b/test/test_apps/6.0/bin/webpack-dev-server new file mode 100755 index 00000000..dd966273 --- /dev/null +++ b/test/test_apps/6.0/bin/webpack-dev-server @@ -0,0 +1,18 @@ +#!/usr/bin/env ruby + +ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development" +ENV["NODE_ENV"] ||= "development" + +require "pathname" +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", + Pathname.new(__FILE__).realpath) + +require "bundler/setup" + +require "webpacker" +require "webpacker/dev_server_runner" + +APP_ROOT = File.expand_path("..", __dir__) +Dir.chdir(APP_ROOT) do + Webpacker::DevServerRunner.run(ARGV) +end diff --git a/test/test_apps/6.0/bin/yarn b/test/test_apps/6.0/bin/yarn new file mode 100755 index 00000000..460dd565 --- /dev/null +++ b/test/test_apps/6.0/bin/yarn @@ -0,0 +1,11 @@ +#!/usr/bin/env ruby +APP_ROOT = File.expand_path('..', __dir__) +Dir.chdir(APP_ROOT) do + begin + exec "yarnpkg", *ARGV + rescue Errno::ENOENT + $stderr.puts "Yarn executable was not detected in the system." + $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" + exit 1 + end +end diff --git a/test/test_apps/4.2/config.ru b/test/test_apps/6.0/config.ru similarity index 59% rename from test/test_apps/4.2/config.ru rename to test/test_apps/6.0/config.ru index 5bc2a619..f7ba0b52 100644 --- a/test/test_apps/4.2/config.ru +++ b/test/test_apps/6.0/config.ru @@ -1,4 +1,5 @@ # This file is used by Rack-based servers to start the application. -require ::File.expand_path('../config/environment', __FILE__) +require_relative 'config/environment' + run Rails.application diff --git a/test/test_apps/6.0/config/application.rb b/test/test_apps/6.0/config/application.rb new file mode 100644 index 00000000..c9bec042 --- /dev/null +++ b/test/test_apps/6.0/config/application.rb @@ -0,0 +1,19 @@ +require_relative 'boot' + +require 'rails/all' + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module TestApp + 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/test/test_apps/6.0/config/boot.rb b/test/test_apps/6.0/config/boot.rb new file mode 100644 index 00000000..b9e460ce --- /dev/null +++ b/test/test_apps/6.0/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/test/test_apps/6.0/config/cable.yml b/test/test_apps/6.0/config/cable.yml new file mode 100644 index 00000000..e48f30c9 --- /dev/null +++ b/test/test_apps/6.0/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: test + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: hello_production diff --git a/test/test_apps/6.0/config/credentials.yml.enc b/test/test_apps/6.0/config/credentials.yml.enc new file mode 100644 index 00000000..a76af645 --- /dev/null +++ b/test/test_apps/6.0/config/credentials.yml.enc @@ -0,0 +1 @@ +RgDU9m2o++ZAUeyh76/lPIWHFfJe2a/Wr4Oif2RAnJQ5dkBuK0smLFQCcihi0bwEIPogqUtBn/bkBNYQMV++COaP7GVrCBEhADfQlhPWjQgIxDsxGTAfYPq/qMs/IsDT6xednrDXta7AAdBufSViOxApjyCgZMcd7e036bP7N6NrO30/II++l2Ss6+J9iqVQpV5FIFG0J6kgsTgCHPJwevPru+gkhiHsFPGIg4NQY+Q9XGEteUrDBOYdzZUItnAeyQwrFT5Xh/Rzs4GyXyUQmTWs3e7y9Fk6pdufO0JyjEKraAx2leMskwB5rcOTXPKsT5Of/f5QOPzuyKkCZE5zRlJJ5swXmapOcy4n66kl2QazQH+VEPSVh/n9AHt5EtVX/O75EsYl5Q3sOpBwzbelKRVg6oTQ3PyFyssl--wrys6c0mUHq7T0lB--L0IKIt0+Vx/jte3+4261zQ== \ No newline at end of file diff --git a/test/test_apps/6.0/config/database.yml b/test/test_apps/6.0/config/database.yml new file mode 100644 index 00000000..4a8a1b26 --- /dev/null +++ b/test/test_apps/6.0/config/database.yml @@ -0,0 +1,25 @@ +# 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.sqlite3 + +production: + <<: *default + database: db/production.sqlite3 diff --git a/test/test_apps/6.0/config/environment.rb b/test/test_apps/6.0/config/environment.rb new file mode 100644 index 00000000..426333bb --- /dev/null +++ b/test/test_apps/6.0/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/test/test_apps/6.0/config/environments/development.rb b/test/test_apps/6.0/config/environments/development.rb new file mode 100644 index 00000000..66df51f6 --- /dev/null +++ b/test/test_apps/6.0/config/environments/development.rb @@ -0,0 +1,62 @@ +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 + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # 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 + + # Debug mode disables concatenation and preprocessing of assets. + # This option may cause significant delays in view rendering with a large + # number of complex assets. + config.assets.debug = true + + # Suppress logger output for asset requests. + config.assets.quiet = 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/test/test_apps/6.0/config/environments/production.rb b/test/test_apps/6.0/config/environments/production.rb new file mode 100644 index 00000000..64c67b1d --- /dev/null +++ b/test/test_apps/6.0/config/environments/production.rb @@ -0,0 +1,112 @@ +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? + + # Compress CSS using a preprocessor. + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + config.assets.compile = false + + # 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 + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # 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 = "hello_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/test/test_apps/4.2/config/environments/test.rb b/test/test_apps/6.0/config/environments/test.rb similarity index 54% rename from test/test_apps/4.2/config/environments/test.rb rename to test/test_apps/6.0/config/environments/test.rb index c69b91b4..1d62e91b 100644 --- a/test/test_apps/4.2/config/environments/test.rb +++ b/test/test_apps/6.0/config/environments/test.rb @@ -1,24 +1,28 @@ -TestApp::Application.configure do +# 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. - # 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! - config.cache_classes = true + config.cache_classes = false # 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 static asset server for tests with Cache-Control for performance. - config.serve_static_assets = true - config.static_cache_control = "public, max-age=3600" + # 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 @@ -26,6 +30,11 @@ # Disable request forgery protection in test environment. config.action_controller.allow_forgery_protection = false + # Store uploaded files on the local file system in a temporary directory. + config.active_storage.service = :test + + 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. @@ -33,4 +42,7 @@ # 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/test/test_apps/6.0/config/initializers/application_controller_renderer.rb b/test/test_apps/6.0/config/initializers/application_controller_renderer.rb new file mode 100644 index 00000000..89d2efab --- /dev/null +++ b/test/test_apps/6.0/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# 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/test/test_apps/6.0/config/initializers/assets.rb b/test/test_apps/6.0/config/initializers/assets.rb new file mode 100644 index 00000000..4b828e80 --- /dev/null +++ b/test/test_apps/6.0/config/initializers/assets.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Add additional assets to the asset load path. +# Rails.application.config.assets.paths << Emoji.images_path +# Add Yarn node_modules folder to the asset load path. +Rails.application.config.assets.paths << Rails.root.join('node_modules') + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in the app/assets +# folder are already added. +# Rails.application.config.assets.precompile += %w( admin.js admin.css ) diff --git a/test/test_apps/4.2/config/initializers/backtrace_silencers.rb b/test/test_apps/6.0/config/initializers/backtrace_silencers.rb similarity index 89% rename from test/test_apps/4.2/config/initializers/backtrace_silencers.rb rename to test/test_apps/6.0/config/initializers/backtrace_silencers.rb index 56ddc8da..59385cdf 100644 --- a/test/test_apps/4.2/config/initializers/backtrace_silencers.rb +++ b/test/test_apps/6.0/config/initializers/backtrace_silencers.rb @@ -4,4 +4,4 @@ # 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! +# Rails.backtrace_cleaner.remove_silencers! diff --git a/test/test_apps/6.0/config/initializers/content_security_policy.rb b/test/test_apps/6.0/config/initializers/content_security_policy.rb new file mode 100644 index 00000000..35d0f26f --- /dev/null +++ b/test/test_apps/6.0/config/initializers/content_security_policy.rb @@ -0,0 +1,30 @@ +# 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/test/test_apps/6.0/config/initializers/cookies_serializer.rb b/test/test_apps/6.0/config/initializers/cookies_serializer.rb new file mode 100644 index 00000000..5a6a32d3 --- /dev/null +++ b/test/test_apps/6.0/config/initializers/cookies_serializer.rb @@ -0,0 +1,5 @@ +# 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/test/test_apps/5.0/config/initializers/filter_parameter_logging.rb b/test/test_apps/6.0/config/initializers/filter_parameter_logging.rb similarity index 100% rename from test/test_apps/5.0/config/initializers/filter_parameter_logging.rb rename to test/test_apps/6.0/config/initializers/filter_parameter_logging.rb diff --git a/test/test_apps/5.0/config/initializers/inflections.rb b/test/test_apps/6.0/config/initializers/inflections.rb similarity index 100% rename from test/test_apps/5.0/config/initializers/inflections.rb rename to test/test_apps/6.0/config/initializers/inflections.rb diff --git a/test/test_apps/4.2/config/initializers/mime_types.rb b/test/test_apps/6.0/config/initializers/mime_types.rb similarity index 76% rename from test/test_apps/4.2/config/initializers/mime_types.rb rename to test/test_apps/6.0/config/initializers/mime_types.rb index 72aca7e4..dc189968 100644 --- a/test/test_apps/4.2/config/initializers/mime_types.rb +++ b/test/test_apps/6.0/config/initializers/mime_types.rb @@ -2,4 +2,3 @@ # Add new mime types for use in respond_to blocks: # Mime::Type.register "text/richtext", :rtf -# Mime::Type.register_alias "text/html", :iphone diff --git a/test/test_apps/4.2/config/initializers/wrap_parameters.rb b/test/test_apps/6.0/config/initializers/wrap_parameters.rb similarity index 80% rename from test/test_apps/4.2/config/initializers/wrap_parameters.rb rename to test/test_apps/6.0/config/initializers/wrap_parameters.rb index 33725e95..bbfc3961 100644 --- a/test/test_apps/4.2/config/initializers/wrap_parameters.rb +++ b/test/test_apps/6.0/config/initializers/wrap_parameters.rb @@ -5,10 +5,10 @@ # 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] if respond_to?(:wrap_parameters) + 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 +# self.include_root_in_json = true # end diff --git a/test/test_apps/5.0/config/locales/en.yml b/test/test_apps/6.0/config/locales/en.yml similarity index 68% rename from test/test_apps/5.0/config/locales/en.yml rename to test/test_apps/6.0/config/locales/en.yml index 06539571..cf9b342d 100644 --- a/test/test_apps/5.0/config/locales/en.yml +++ b/test/test_apps/6.0/config/locales/en.yml @@ -16,8 +16,18 @@ # # 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 http://guides.rubyonrails.org/i18n.html. +# available at https://guides.rubyonrails.org/i18n.html. en: hello: "Hello world" diff --git a/test/test_apps/6.0/config/puma.rb b/test/test_apps/6.0/config/puma.rb new file mode 100644 index 00000000..5ed44377 --- /dev/null +++ b/test/test_apps/6.0/config/puma.rb @@ -0,0 +1,38 @@ +# 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/test/test_apps/5.0/config/routes.rb b/test/test_apps/6.0/config/routes.rb similarity index 100% rename from test/test_apps/5.0/config/routes.rb rename to test/test_apps/6.0/config/routes.rb diff --git a/test/test_apps/6.0/config/spring.rb b/test/test_apps/6.0/config/spring.rb new file mode 100644 index 00000000..db5bf130 --- /dev/null +++ b/test/test_apps/6.0/config/spring.rb @@ -0,0 +1,6 @@ +Spring.watch( + ".ruby-version", + ".rbenv-vars", + "tmp/restart.txt", + "tmp/caching-dev.txt" +) diff --git a/test/test_apps/6.0/config/storage.yml b/test/test_apps/6.0/config/storage.yml new file mode 100644 index 00000000..d32f76e8 --- /dev/null +++ b/test/test_apps/6.0/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/test/test_apps/6.0/config/webpack/development.js b/test/test_apps/6.0/config/webpack/development.js new file mode 100644 index 00000000..c5edff94 --- /dev/null +++ b/test/test_apps/6.0/config/webpack/development.js @@ -0,0 +1,5 @@ +process.env.NODE_ENV = process.env.NODE_ENV || 'development' + +const environment = require('./environment') + +module.exports = environment.toWebpackConfig() diff --git a/test/test_apps/6.0/config/webpack/environment.js b/test/test_apps/6.0/config/webpack/environment.js new file mode 100644 index 00000000..d16d9af7 --- /dev/null +++ b/test/test_apps/6.0/config/webpack/environment.js @@ -0,0 +1,3 @@ +const { environment } = require('@rails/webpacker') + +module.exports = environment diff --git a/test/test_apps/6.0/config/webpack/production.js b/test/test_apps/6.0/config/webpack/production.js new file mode 100644 index 00000000..be0f53aa --- /dev/null +++ b/test/test_apps/6.0/config/webpack/production.js @@ -0,0 +1,5 @@ +process.env.NODE_ENV = process.env.NODE_ENV || 'production' + +const environment = require('./environment') + +module.exports = environment.toWebpackConfig() diff --git a/test/test_apps/6.0/config/webpack/test.js b/test/test_apps/6.0/config/webpack/test.js new file mode 100644 index 00000000..c5edff94 --- /dev/null +++ b/test/test_apps/6.0/config/webpack/test.js @@ -0,0 +1,5 @@ +process.env.NODE_ENV = process.env.NODE_ENV || 'development' + +const environment = require('./environment') + +module.exports = environment.toWebpackConfig() diff --git a/test/test_apps/6.0/config/webpacker.yml b/test/test_apps/6.0/config/webpacker.yml new file mode 100644 index 00000000..8581ac04 --- /dev/null +++ b/test/test_apps/6.0/config/webpacker.yml @@ -0,0 +1,96 @@ +# Note: You must restart bin/webpack-dev-server for changes to take effect + +default: &default + source_path: app/javascript + source_entry_path: packs + public_root_path: public + public_output_path: packs + cache_path: tmp/cache/webpacker + check_yarn_integrity: false + webpack_compile_output: true + + # Additional paths webpack should lookup modules + # ['app/assets', 'engine/foo/app/assets'] + resolved_paths: [] + + # Reload manifest.json on all requests so we reload latest compiled packs + cache_manifest: false + + # Extract and emit a css file + extract_css: false + + static_assets_extensions: + - .jpg + - .jpeg + - .png + - .gif + - .tiff + - .ico + - .svg + - .eot + - .otf + - .ttf + - .woff + - .woff2 + + extensions: + - .mjs + - .js + - .sass + - .scss + - .css + - .module.sass + - .module.scss + - .module.css + - .png + - .svg + - .gif + - .jpeg + - .jpg + +development: + <<: *default + compile: true + + # Verifies that correct packages and versions are installed by inspecting package.json, yarn.lock, and node_modules + check_yarn_integrity: true + + # Reference: https://webpack.js.org/configuration/dev-server/ + dev_server: + https: false + host: localhost + port: 3035 + public: localhost:3035 + hmr: false + # Inline should be set to true if using HMR + inline: true + overlay: true + compress: true + disable_host_check: true + use_local_ip: false + quiet: false + pretty: false + headers: + 'Access-Control-Allow-Origin': '*' + watch_options: + ignored: '**/node_modules/**' + + +test: + <<: *default + compile: true + + # Compile test packs to a separate directory + public_output_path: packs-test + +production: + <<: *default + + # Production depends on precompilation of packs prior to booting for performance. + compile: false + + # Extract and emit a css file + extract_css: true + + # Cache manifest.json for performance + cache_manifest: true diff --git a/test/test_apps/5.0/db b/test/test_apps/6.0/db similarity index 100% rename from test/test_apps/5.0/db rename to test/test_apps/6.0/db diff --git a/test/test_apps/5.0/engines b/test/test_apps/6.0/engines similarity index 100% rename from test/test_apps/5.0/engines rename to test/test_apps/6.0/engines diff --git a/test/test_apps/6.0/gemfiles/capybara_3.0_ruby2.5.8.gemfile b/test/test_apps/6.0/gemfiles/capybara_3.0_ruby2.5.8.gemfile new file mode 100644 index 00000000..95f2e028 --- /dev/null +++ b/test/test_apps/6.0/gemfiles/capybara_3.0_ruby2.5.8.gemfile @@ -0,0 +1,34 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 6.0.2", ">= 6.0.2.2" +gem "sqlite3", "~> 1.4" +gem "puma", "~> 4.1" +gem "sass-rails", ">= 6" +gem "webpacker", "~> 4.0" +gem "jquery-rails" +gem "turbolinks", "~> 5" +gem "jbuilder", "~> 2.7" +gem "bootsnap", ">= 1.4.2", require: false +gem "forum", path: "../engines" +gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem "byebug", platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem "web-console", ">= 3.3.0" + gem "listen", ">= 3.0.5", "< 3.2" + gem "spring" + gem "spring-watcher-listen", "~> 2.0.0" +end + +group :test do + gem "ae_page_objects", path: "../../../.." + gem "appraisal", "~> 2.0" + gem "capybara", "~> 3.0" + gem "selenium-webdriver" + gem "webdrivers" +end diff --git a/test/test_apps/6.0/gemfiles/capybara_3.0_ruby2.6.6.gemfile b/test/test_apps/6.0/gemfiles/capybara_3.0_ruby2.6.6.gemfile new file mode 100644 index 00000000..95f2e028 --- /dev/null +++ b/test/test_apps/6.0/gemfiles/capybara_3.0_ruby2.6.6.gemfile @@ -0,0 +1,34 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 6.0.2", ">= 6.0.2.2" +gem "sqlite3", "~> 1.4" +gem "puma", "~> 4.1" +gem "sass-rails", ">= 6" +gem "webpacker", "~> 4.0" +gem "jquery-rails" +gem "turbolinks", "~> 5" +gem "jbuilder", "~> 2.7" +gem "bootsnap", ">= 1.4.2", require: false +gem "forum", path: "../engines" +gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem "byebug", platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem "web-console", ">= 3.3.0" + gem "listen", ">= 3.0.5", "< 3.2" + gem "spring" + gem "spring-watcher-listen", "~> 2.0.0" +end + +group :test do + gem "ae_page_objects", path: "../../../.." + gem "appraisal", "~> 2.0" + gem "capybara", "~> 3.0" + gem "selenium-webdriver" + gem "webdrivers" +end diff --git a/test/test_apps/6.0/gemfiles/capybara_3.0_ruby2.7.1.gemfile b/test/test_apps/6.0/gemfiles/capybara_3.0_ruby2.7.1.gemfile new file mode 100644 index 00000000..95f2e028 --- /dev/null +++ b/test/test_apps/6.0/gemfiles/capybara_3.0_ruby2.7.1.gemfile @@ -0,0 +1,34 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 6.0.2", ">= 6.0.2.2" +gem "sqlite3", "~> 1.4" +gem "puma", "~> 4.1" +gem "sass-rails", ">= 6" +gem "webpacker", "~> 4.0" +gem "jquery-rails" +gem "turbolinks", "~> 5" +gem "jbuilder", "~> 2.7" +gem "bootsnap", ">= 1.4.2", require: false +gem "forum", path: "../engines" +gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +group :development, :test do + gem "byebug", platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem "web-console", ">= 3.3.0" + gem "listen", ">= 3.0.5", "< 3.2" + gem "spring" + gem "spring-watcher-listen", "~> 2.0.0" +end + +group :test do + gem "ae_page_objects", path: "../../../.." + gem "appraisal", "~> 2.0" + gem "capybara", "~> 3.0" + gem "selenium-webdriver" + gem "webdrivers" +end diff --git a/test/test_apps/5.0/lib/tasks/.keep b/test/test_apps/6.0/lib/assets/.keep similarity index 100% rename from test/test_apps/5.0/lib/tasks/.keep rename to test/test_apps/6.0/lib/assets/.keep diff --git a/test/test_apps/5.0/log/.keep b/test/test_apps/6.0/lib/tasks/.keep similarity index 100% rename from test/test_apps/5.0/log/.keep rename to test/test_apps/6.0/lib/tasks/.keep diff --git a/test/test_apps/5.0/tmp/.keep b/test/test_apps/6.0/log/.keep similarity index 100% rename from test/test_apps/5.0/tmp/.keep rename to test/test_apps/6.0/log/.keep diff --git a/test/test_apps/6.0/package.json b/test/test_apps/6.0/package.json new file mode 100644 index 00000000..bebf1dd7 --- /dev/null +++ b/test/test_apps/6.0/package.json @@ -0,0 +1,15 @@ +{ + "name": "hello", + "private": true, + "dependencies": { + "@rails/actioncable": "^6.0.0", + "@rails/activestorage": "^6.0.0", + "@rails/ujs": "^6.0.0", + "@rails/webpacker": "4.2.2", + "turbolinks": "^5.2.0" + }, + "version": "0.1.0", + "devDependencies": { + "webpack-dev-server": "^3.10.3" + } +} diff --git a/test/test_apps/6.0/postcss.config.js b/test/test_apps/6.0/postcss.config.js new file mode 100644 index 00000000..aa5998a8 --- /dev/null +++ b/test/test_apps/6.0/postcss.config.js @@ -0,0 +1,12 @@ +module.exports = { + plugins: [ + require('postcss-import'), + require('postcss-flexbugs-fixes'), + require('postcss-preset-env')({ + autoprefixer: { + flexbox: 'no-2009' + }, + stage: 3 + }) + ] +} diff --git a/test/test_apps/4.2/public/404.html b/test/test_apps/6.0/public/404.html similarity index 52% rename from test/test_apps/4.2/public/404.html rename to test/test_apps/6.0/public/404.html index a0daa0c1..2be3af26 100644 --- a/test/test_apps/4.2/public/404.html +++ b/test/test_apps/6.0/public/404.html @@ -2,17 +2,23 @@ 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.

+
+

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.

-

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

diff --git a/test/test_apps/4.2/public/422.html b/test/test_apps/6.0/public/422.html similarity index 52% rename from test/test_apps/4.2/public/422.html rename to test/test_apps/6.0/public/422.html index fbb4b84d..c08eac0d 100644 --- a/test/test_apps/4.2/public/422.html +++ b/test/test_apps/6.0/public/422.html @@ -2,17 +2,23 @@ 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.

+
+

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.

-

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

diff --git a/test/test_apps/4.2/public/500.html b/test/test_apps/6.0/public/500.html similarity index 55% rename from test/test_apps/4.2/public/500.html rename to test/test_apps/6.0/public/500.html index e9052d35..78a030af 100644 --- a/test/test_apps/4.2/public/500.html +++ b/test/test_apps/6.0/public/500.html @@ -2,17 +2,23 @@ We're sorry, but something went wrong (500) + - +
-

We're sorry, but something went wrong.

+
+

We're sorry, but something went wrong.

+
+

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

-

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

diff --git a/test/test_apps/5.0/public/favicon.ico b/test/test_apps/6.0/public/apple-touch-icon-precomposed.png similarity index 100% rename from test/test_apps/5.0/public/favicon.ico rename to test/test_apps/6.0/public/apple-touch-icon-precomposed.png diff --git a/test/test_apps/5.0/vendor/assets/javascripts/.keep b/test/test_apps/6.0/public/apple-touch-icon.png similarity index 100% rename from test/test_apps/5.0/vendor/assets/javascripts/.keep rename to test/test_apps/6.0/public/apple-touch-icon.png diff --git a/test/test_apps/5.0/vendor/assets/stylesheets/.keep b/test/test_apps/6.0/public/favicon.ico similarity index 100% rename from test/test_apps/5.0/vendor/assets/stylesheets/.keep rename to test/test_apps/6.0/public/favicon.ico diff --git a/test/test_apps/6.0/public/robots.txt b/test/test_apps/6.0/public/robots.txt new file mode 100644 index 00000000..c19f78ab --- /dev/null +++ b/test/test_apps/6.0/public/robots.txt @@ -0,0 +1 @@ +# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/test/test_apps/6.0/storage/.keep b/test/test_apps/6.0/storage/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/test_apps/6.0/test/fixtures b/test/test_apps/6.0/test/fixtures new file mode 120000 index 00000000..8d43d9d5 --- /dev/null +++ b/test/test_apps/6.0/test/fixtures @@ -0,0 +1 @@ +../../shared/test/fixtures \ No newline at end of file diff --git a/test/test_apps/6.0/test/page_objects b/test/test_apps/6.0/test/page_objects new file mode 120000 index 00000000..1efa1958 --- /dev/null +++ b/test/test_apps/6.0/test/page_objects @@ -0,0 +1 @@ +../../shared/test/page_objects \ No newline at end of file diff --git a/test/test_apps/6.0/test/page_objects.rb b/test/test_apps/6.0/test/page_objects.rb new file mode 120000 index 00000000..fed1bfd2 --- /dev/null +++ b/test/test_apps/6.0/test/page_objects.rb @@ -0,0 +1 @@ +../../shared/test/page_objects.rb \ No newline at end of file diff --git a/test/test_apps/6.0/test/selenium b/test/test_apps/6.0/test/selenium new file mode 120000 index 00000000..cfc1b631 --- /dev/null +++ b/test/test_apps/6.0/test/selenium @@ -0,0 +1 @@ +../../shared/test/selenium \ No newline at end of file diff --git a/test/test_apps/6.0/test/selenium_helper.rb b/test/test_apps/6.0/test/selenium_helper.rb new file mode 100644 index 00000000..9386763b --- /dev/null +++ b/test/test_apps/6.0/test/selenium_helper.rb @@ -0,0 +1,57 @@ +ENV['RAILS_ENV'] = 'test' + +$LOAD_PATH << File.join(File.dirname(__FILE__), '..') + +require "config/environment" + +# Run the migrations +ActiveRecord::MigrationContext + .new(ActiveRecord::Migrator.migrations_paths, ActiveRecord::SchemaMigration) + .migrate + +require "rails/test_help" + +require 'capybara/dsl' +require 'capybara/rails' + +module Selenium + class TestCase < ActiveSupport::TestCase + include Capybara::DSL + + self.use_instantiated_fixtures = false + self.use_transactional_tests = false + + fixtures :all + + include Rails.application.routes.url_helpers + + teardown do + AePageObjects.browser.windows.close_all + end + end +end + +class TestSeleniumDriver < Capybara::Selenium::Driver + + def initialize(app, options = {}) + options[:profile] ||= Selenium::WebDriver::Firefox::Profile.from_name("selenium") || Selenium::WebDriver::Firefox::Profile.new + super + end +end + +Capybara.register_driver :ae_page_objects_test_driver do |app| + Capybara::Selenium::Driver.new(app, options: Selenium::WebDriver::Firefox::Options.new({ + browser: :firefox, + args: ['--headless'] + })) +end + +Capybara.configure do |config| + config.default_driver = :ae_page_objects_test_driver + config.server = :puma + config.default_max_wait_time = 5 +end + +require "ae_page_objects/rails" +require "test/page_objects" + diff --git a/test/test_apps/6.0/tmp/.keep b/test/test_apps/6.0/tmp/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/test_apps/6.0/vendor/.keep b/test/test_apps/6.0/vendor/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/test_apps/shared/config/environment.rb b/test/test_apps/shared/config/environment.rb new file mode 100644 index 00000000..426333bb --- /dev/null +++ b/test/test_apps/shared/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/test/test_apps/shared/controllers/authors_controller.rb b/test/test_apps/shared/controllers/authors_controller.rb index a9e76b17..915a244d 100644 --- a/test/test_apps/shared/controllers/authors_controller.rb +++ b/test/test_apps/shared/controllers/authors_controller.rb @@ -2,7 +2,7 @@ class AuthorsController < ApplicationController # GET /authors # GET /authors.json def index - @authors = Author.all(:order => :last_name) + @authors = Author.order(:last_name) respond_to do |format| format.html # index.html.erb @@ -67,7 +67,7 @@ def update @author = Author.find(params[:id]) respond_to do |format| - if @author.update_attributes(params[:author]) + if @author.update(params[:author]) format.html { redirect_to @author, :notice => 'Author was successfully updated.' } format.json { head :ok } else diff --git a/test/test_apps/shared/controllers/books_controller.rb b/test/test_apps/shared/controllers/books_controller.rb index ec8554fa..7dffcf89 100644 --- a/test/test_apps/shared/controllers/books_controller.rb +++ b/test/test_apps/shared/controllers/books_controller.rb @@ -42,7 +42,7 @@ def edit # POST /books # POST /books.json def create - @book = Book.new(params[:book]) + @book = Book.new(params.require(:book).permit!) @book.index.book = @book respond_to do |format| @@ -62,7 +62,7 @@ def update @book = Book.find(params[:id]) respond_to do |format| - if @book.update_attributes(params[:book]) + if @book.update(params.require(:book).permit!) format.html { redirect_to @book, :notice => 'Book was successfully updated.' } format.json { head :ok } else diff --git a/test/test_apps/shared/db/migrate/001_create_schema.rb b/test/test_apps/shared/db/migrate/001_create_schema.rb index 27348cb1..e3e0522f 100644 --- a/test/test_apps/shared/db/migrate/001_create_schema.rb +++ b/test/test_apps/shared/db/migrate/001_create_schema.rb @@ -1,4 +1,4 @@ -class CreateSchema < ActiveRecord::Migration +class CreateSchema < ActiveRecord::Migration[4.2] def self.up create_table :indices do |t| t.integer :lock_version @@ -12,7 +12,7 @@ def self.up t.string :title t.timestamps end - + create_table :authors do |t| t.integer :lock_version t.string :first_name diff --git a/test/test_apps/shared/db/migrate/002_create_forum_posts.rb b/test/test_apps/shared/db/migrate/002_create_forum_posts.rb index c555d213..681d3f31 100644 --- a/test/test_apps/shared/db/migrate/002_create_forum_posts.rb +++ b/test/test_apps/shared/db/migrate/002_create_forum_posts.rb @@ -1,5 +1,5 @@ # This migration comes from forum (originally 20141012015557) -class CreateForumPosts < ActiveRecord::Migration +class CreateForumPosts < ActiveRecord::Migration[4.2] def change create_table :forum_posts do |t| t.string :title diff --git a/test/test_apps/shared/engines/forum/db/migrate/20141012015557_create_forum_posts.rb b/test/test_apps/shared/engines/forum/db/migrate/20141012015557_create_forum_posts.rb index 451a4e81..5f836e6a 100644 --- a/test/test_apps/shared/engines/forum/db/migrate/20141012015557_create_forum_posts.rb +++ b/test/test_apps/shared/engines/forum/db/migrate/20141012015557_create_forum_posts.rb @@ -1,4 +1,4 @@ -class CreateForumPosts < ActiveRecord::Migration +class CreateForumPosts < ActiveRecord::Migration[4.2] def change create_table :forum_posts do |t| t.string :title diff --git a/test/test_apps/shared/test/page_objects.rb b/test/test_apps/shared/test/page_objects.rb index f81abf03..398763d6 100644 --- a/test/test_apps/shared/test/page_objects.rb +++ b/test/test_apps/shared/test/page_objects.rb @@ -1,7 +1,20 @@ require 'ae_page_objects' -ActiveSupport::Dependencies.autoload_paths << "test" - module PageObjects - + module Authors + extend ActiveSupport::Autoload + + autoload :IndexPage + autoload :NewPage + autoload :ShowPage + end + + module Books + extend ActiveSupport::Autoload + + autoload :EditPage + autoload :HasBookForm + autoload :NewPage + autoload :ShowPage + end end