152 lines
7.2 KiB
Diff
152 lines
7.2 KiB
Diff
|
|
From 5cf04df33646a5db0ee6753fc701b6239304cff5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Gustavo Bazan <gustavo@swiftcomply.com>
|
||
|
|
Date: Wed, 3 Oct 2018 09:36:02 +0100
|
||
|
|
Subject: [PATCH] Update travis test matrix
|
||
|
|
|
||
|
|
Drop support for EOL version of ruby and add support for 2.5
|
||
|
|
Add support for rails 5.2
|
||
|
|
|
||
|
|
Some updates needed for travis
|
||
|
|
---
|
||
|
|
.../fixtures/alternate_config_project/Gemfile | 2 +-
|
||
|
|
.../config/application.rb | 4 ++
|
||
|
|
.../config/initializers/secret_token.rb | 8 +++-
|
||
|
|
test/fixtures/sass_project/Gemfile | 2 +-
|
||
|
|
.../config/initializers/secret_token.rb | 7 ++-
|
||
|
|
test/fixtures/scss_project/Gemfile | 2 +-
|
||
|
|
.../scss_project/config/application.rb | 4 ++
|
||
|
|
.../config/initializers/secret_token.rb | 7 ++-
|
||
|
|
test/test_helper.rb | 4 +-
|
||
|
|
9 files changed, 32 insertions(+), 8 deletions(-)
|
||
|
|
create mode 100644 gemfiles/Gemfile-rails-5-2
|
||
|
|
|
||
|
|
diff --git a/test/fixtures/alternate_config_project/Gemfile b/test/fixtures/alternate_config_project/Gemfile
|
||
|
|
index c965db0..ab02893 100644
|
||
|
|
--- a/test/fixtures/alternate_config_project/Gemfile
|
||
|
|
+++ b/test/fixtures/alternate_config_project/Gemfile
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
source 'https://rubygems.org'
|
||
|
|
|
||
|
|
-gem 'rails', '>= 4.0.0.beta', '< 5.0'
|
||
|
|
+gem 'rails', '>= 4.2', '< 6'
|
||
|
|
gem 'sqlite3'
|
||
|
|
|
||
|
|
# Asset template engines
|
||
|
|
diff --git a/test/fixtures/alternate_config_project/config/application.rb b/test/fixtures/alternate_config_project/config/application.rb
|
||
|
|
index 30f90f0..5d09d70 100644
|
||
|
|
--- a/test/fixtures/alternate_config_project/config/application.rb
|
||
|
|
+++ b/test/fixtures/alternate_config_project/config/application.rb
|
||
|
|
@@ -45,5 +45,9 @@ class Application < Rails::Application
|
||
|
|
|
||
|
|
# Enable the asset pipeline
|
||
|
|
config.assets.enabled = true
|
||
|
|
+
|
||
|
|
+ if Rails.version >= '5.1.0' && config.active_record.sqlite3.present?
|
||
|
|
+ config.active_record.sqlite3.represent_boolean_as_integer = true
|
||
|
|
+ end
|
||
|
|
end
|
||
|
|
end
|
||
|
|
diff --git a/test/fixtures/alternate_config_project/config/initializers/secret_token.rb b/test/fixtures/alternate_config_project/config/initializers/secret_token.rb
|
||
|
|
index e91c7e2..f81a731 100644
|
||
|
|
--- a/test/fixtures/alternate_config_project/config/initializers/secret_token.rb
|
||
|
|
+++ b/test/fixtures/alternate_config_project/config/initializers/secret_token.rb
|
||
|
|
@@ -4,4 +4,10 @@
|
||
|
|
# 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.
|
||
|
|
-AlternateConfigProject::Application.config.secret_token = 'aad80c771c1b2b13b67b0b2d03ee3fa8a1d5a8e8dce2e8bc8b382f197927b789afdc9355f8bc7256faf650015d75d8eb541e9ab96a88f0bd63c4bd7552174849'
|
||
|
|
+
|
||
|
|
+secret = 'aad80c771c1b2b13b67b0b2d03ee3fa8a1d5a8e8dce2e8bc8b382f197927b789afdc9355f8bc7256faf650015d75d8eb541e9ab96a88f0bd63c4bd7552174849'
|
||
|
|
+if AlternateConfigProject::Application.config.respond_to? :secret_key_base
|
||
|
|
+ AlternateConfigProject::Application.config.secret_key_base = secret
|
||
|
|
+else
|
||
|
|
+ AlternateConfigProject::Application.config.secret_token = secret
|
||
|
|
+end
|
||
|
|
diff --git a/test/fixtures/sass_project/Gemfile b/test/fixtures/sass_project/Gemfile
|
||
|
|
index c965db0..ab02893 100644
|
||
|
|
--- a/test/fixtures/sass_project/Gemfile
|
||
|
|
+++ b/test/fixtures/sass_project/Gemfile
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
source 'https://rubygems.org'
|
||
|
|
|
||
|
|
-gem 'rails', '>= 4.0.0.beta', '< 5.0'
|
||
|
|
+gem 'rails', '>= 4.2', '< 6'
|
||
|
|
gem 'sqlite3'
|
||
|
|
|
||
|
|
# Asset template engines
|
||
|
|
diff --git a/test/fixtures/sass_project/config/initializers/secret_token.rb b/test/fixtures/sass_project/config/initializers/secret_token.rb
|
||
|
|
index e8888a2..0b80506 100644
|
||
|
|
--- a/test/fixtures/sass_project/config/initializers/secret_token.rb
|
||
|
|
+++ b/test/fixtures/sass_project/config/initializers/secret_token.rb
|
||
|
|
@@ -4,4 +4,9 @@
|
||
|
|
# 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.
|
||
|
|
-ScssProject::Application.config.secret_token = 'aad80c771c1b2b13b67b0b2d03ee3fa8a1d5a8e8dce2e8bc8b382f197927b789afdc9355f8bc7256faf650015d75d8eb541e9ab96a88f0bd63c4bd7552174849'
|
||
|
|
+secret = 'aad80c771c1b2b13b67b0b2d03ee3fa8a1d5a8e8dce2e8bc8b382f197927b789afdc9355f8bc7256faf650015d75d8eb541e9ab96a88f0bd63c4bd7552174849'
|
||
|
|
+if ScssProject::Application.config.respond_to? :secret_key_base
|
||
|
|
+ ScssProject::Application.config.secret_key_base = secret
|
||
|
|
+else
|
||
|
|
+ ScssProject::Application.config.secret_token = secret
|
||
|
|
+end
|
||
|
|
diff --git a/test/fixtures/scss_project/Gemfile b/test/fixtures/scss_project/Gemfile
|
||
|
|
index c965db0..ab02893 100644
|
||
|
|
--- a/test/fixtures/scss_project/Gemfile
|
||
|
|
+++ b/test/fixtures/scss_project/Gemfile
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
source 'https://rubygems.org'
|
||
|
|
|
||
|
|
-gem 'rails', '>= 4.0.0.beta', '< 5.0'
|
||
|
|
+gem 'rails', '>= 4.2', '< 6'
|
||
|
|
gem 'sqlite3'
|
||
|
|
|
||
|
|
# Asset template engines
|
||
|
|
diff --git a/test/fixtures/scss_project/config/application.rb b/test/fixtures/scss_project/config/application.rb
|
||
|
|
index 9565048..a26f068 100644
|
||
|
|
--- a/test/fixtures/scss_project/config/application.rb
|
||
|
|
+++ b/test/fixtures/scss_project/config/application.rb
|
||
|
|
@@ -45,5 +45,9 @@ class Application < Rails::Application
|
||
|
|
|
||
|
|
# Enable the asset pipeline
|
||
|
|
config.assets.enabled = true
|
||
|
|
+
|
||
|
|
+ if Rails.version >= '5.1.0' && config.active_record.sqlite3.present?
|
||
|
|
+ config.active_record.sqlite3.represent_boolean_as_integer = true
|
||
|
|
+ end
|
||
|
|
end
|
||
|
|
end
|
||
|
|
diff --git a/test/fixtures/scss_project/config/initializers/secret_token.rb b/test/fixtures/scss_project/config/initializers/secret_token.rb
|
||
|
|
index e8888a2..0b80506 100644
|
||
|
|
--- a/test/fixtures/scss_project/config/initializers/secret_token.rb
|
||
|
|
+++ b/test/fixtures/scss_project/config/initializers/secret_token.rb
|
||
|
|
@@ -4,4 +4,9 @@
|
||
|
|
# 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.
|
||
|
|
-ScssProject::Application.config.secret_token = 'aad80c771c1b2b13b67b0b2d03ee3fa8a1d5a8e8dce2e8bc8b382f197927b789afdc9355f8bc7256faf650015d75d8eb541e9ab96a88f0bd63c4bd7552174849'
|
||
|
|
+secret = 'aad80c771c1b2b13b67b0b2d03ee3fa8a1d5a8e8dce2e8bc8b382f197927b789afdc9355f8bc7256faf650015d75d8eb541e9ab96a88f0bd63c4bd7552174849'
|
||
|
|
+if ScssProject::Application.config.respond_to? :secret_key_base
|
||
|
|
+ ScssProject::Application.config.secret_key_base = secret
|
||
|
|
+else
|
||
|
|
+ ScssProject::Application.config.secret_token = secret
|
||
|
|
+end
|
||
|
|
diff --git a/test/test_helper.rb b/test/test_helper.rb
|
||
|
|
index 521de86..6fc3757 100644
|
||
|
|
--- a/test/test_helper.rb
|
||
|
|
+++ b/test/test_helper.rb
|
||
|
|
@@ -11,7 +11,7 @@
|
||
|
|
# If developing against local dependencies, this code will ensure they get picked up
|
||
|
|
# in the project fixtures that have their own bundle environment
|
||
|
|
$gem_options = {}
|
||
|
|
-possible_dev_dependencies = %w(sass-rails sass rails arel actionpack railties sprockets journey sprockets-rails activerecord-deprecated_finders)
|
||
|
|
+possible_dev_dependencies = %w(sass-rails sass rails arel actionpack rack railties sprockets sprockets-rails)
|
||
|
|
Bundler.load.specs.each do |s|
|
||
|
|
if possible_dev_dependencies.include?(s.name)
|
||
|
|
gem_path = s.full_gem_path
|
||
|
|
@@ -24,4 +24,4 @@
|
||
|
|
# Load support files
|
||
|
|
Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
|
||
|
|
|
||
|
|
-ActiveSupport::TestCase.test_order = :random if ActiveSupport::TestCase.respond_to?(:test_order=)
|
||
|
|
+ActiveSupport::TestCase.test_order = :random
|