Merge branch 'rm-test-with-rails-6' into 5-0-stable

rails · Aug 16, 2019 · bcc0725 · bcc0725
2 parents e2e189a + 72e9e21
commit bcc0725
Show file tree

Hide file tree

Showing 35 changed files with 86 additions and 186 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,18 +1,13 @@
 language: ruby
 
 rvm:
- - 1.9.3
- - 2.0.0
- - 2.1
- - 2.2.5
- - 2.3.1
- - rbx-2
+ - 2.4.6
+ - 2.5.5
+ - 2.6.3
 
 gemfile:
-  - gemfiles/Gemfile-rails-4-0
-  - gemfiles/Gemfile-rails-4-1
-  - gemfiles/Gemfile-rails-4-2
-  - gemfiles/Gemfile-rails-5-0
+  - gemfiles/Gemfile-rails-5-2
+  - gemfiles/Gemfile-rails-6-0
   - gemfiles/Gemfile-sprockets-2-11
   - gemfiles/Gemfile-sprockets-2-12
   - gemfiles/Gemfile-sprockets-2-8
@@ -32,24 +27,12 @@ cache: bundler
 script: bundle exec rake test
 
 matrix:
-  allow_failures:
-    - rvm: rbx-2
   exclude:
-    - gemfile: gemfiles/Gemfile-sass-3-4
-      rvm: 1.9.3
-    - gemfile: gemfiles/Gemfile-sprockets-4-0
-      rvm: 1.9.3
-    - gemfile: gemfiles/Gemfile-rails-5-0
-      rvm: 1.9.3
-    - gemfile: gemfiles/Gemfile-rails-5-0
-      rvm: 2.0.0
-    - gemfile: gemfiles/Gemfile-rails-5-0
-      rvm: 2.1
   include:
     - gemfile: Gemfile
-      rvm: 2.2.5
+      rvm: 2.5.5
     - gemfile: Gemfile
-      rvm: 2.3.1
+      rvm: 2.6.3
 
 notifications:
   email: false

diff --git a/Gemfile b/Gemfile
@@ -4,4 +4,3 @@ source "https://rubygems.org"
 gemspec
 
 gem "rails", github: "rails/rails"
-gem "arel", github: "rails/arel"
diff --git a/gemfiles/Gemfile-rails-4-0 b/gemfiles/Gemfile-rails-4-0
diff --git a/gemfiles/Gemfile-rails-4-1 b/gemfiles/Gemfile-rails-4-1
diff --git a/gemfiles/Gemfile-rails-4-2 b/gemfiles/Gemfile-rails-4-2
diff --git a/gemfiles/Gemfile-rails-5-0 b/gemfiles/Gemfile-rails-5-0
diff --git a/gemfiles/Gemfile-rails-5-2 b/gemfiles/Gemfile-rails-5-2
@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+# Specify your gem"s dependencies in sass-rails.gemspec
+gemspec path: ".."
+
+gem "rails", github: 'rails/rails', branch: '5-2-stable'
diff --git a/gemfiles/Gemfile-rails-6-0 b/gemfiles/Gemfile-rails-6-0
@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+# Specify your gem"s dependencies in sass-rails.gemspec
+gemspec path: ".."
+
+gem "rails", github: 'rails/rails', branch: '6-0-stable'
diff --git a/gemfiles/Gemfile-sass-3-1 b/gemfiles/Gemfile-sass-3-1
@@ -9,6 +9,3 @@ else
   gem "rails"
 end
 gem "sass", "~> 3.1.0"
-gem "mime-types", "< 2"
-gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
-gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/gemfiles/Gemfile-sass-3-2 b/gemfiles/Gemfile-sass-3-2
@@ -3,12 +3,5 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: ".."
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
-  gem "rails", "~> 4.2.0"
-else
-  gem "rails"
-end
+gem "rails"
 gem "sass", "~> 3.2.0"
-gem "mime-types", "< 2"
-gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
-gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/gemfiles/Gemfile-sass-3-3 b/gemfiles/Gemfile-sass-3-3
@@ -3,12 +3,5 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: ".."
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
-  gem "rails", "~> 4.2.0"
-else
-  gem "rails"
-end
+gem "rails"
 gem "sass", "~> 3.3.0"
-gem "mime-types", "< 2"
-gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
-gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/gemfiles/Gemfile-sass-3-4 b/gemfiles/Gemfile-sass-3-4
@@ -3,12 +3,5 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: ".."
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
-  gem "rails", "~> 4.2.0"
-else
-  gem "rails"
-end
+gem "rails"
 gem "sass", "~> 3.4.0"
-gem "mime-types", "< 2"
-gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
-gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/gemfiles/Gemfile-sprockets-2-11 b/gemfiles/Gemfile-sprockets-2-11
@@ -3,13 +3,6 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: ".."
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
-  gem "rails", "~> 4.2.0"
-else
-  gem "rails"
-end
+gem "rails"
 gem "sprockets", "~> 2.11.0"
 gem "sass", "~> 3.3.0"
-gem "mime-types", "< 2"
-gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
-gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/gemfiles/Gemfile-sprockets-2-12 b/gemfiles/Gemfile-sprockets-2-12
@@ -3,13 +3,6 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: ".."
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
-  gem "rails", "~> 4.2.0"
-else
-  gem "rails"
-end
+gem "rails"
 gem "sprockets", "~> 2.12.0"
 gem "sass", "~> 3.3.0"
-gem "mime-types", "< 2"
-gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
-gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/gemfiles/Gemfile-sprockets-2-8 b/gemfiles/Gemfile-sprockets-2-8
@@ -3,13 +3,6 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: ".."
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
-  gem "rails", "~> 4.2.0"
-else
-  gem "rails"
-end
+gem "rails"
 gem "sprockets", "~> 2.8.0"
 gem "sass", "~> 3.3.0"
-gem "mime-types", "< 2"
-gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
-gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/gemfiles/Gemfile-sprockets-3-0 b/gemfiles/Gemfile-sprockets-3-0
@@ -3,13 +3,6 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: ".."
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
-  gem "rails", "~> 4.2.0"
-else
-  gem "rails"
-end
+gem "rails"
 gem "sprockets", "~> 3.0.0"
 gem "sass", "~> 3.3.0"
-gem "mime-types", "< 2"
-gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
-gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/gemfiles/Gemfile-sprockets-4-0 b/gemfiles/Gemfile-sprockets-4-0
@@ -3,12 +3,5 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: ".."
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
-  gem "rails", "~> 4.2.0"
-else
-  gem "rails"
-end
+gem "rails"
 gem "sprockets", "~> 4.x"
-gem 'mime-types', '< 3', require: false if RUBY_VERSION.start_with?('1.9')
-gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
-gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/gemfiles/Gemfile-sprockets-rails-2-2 b/gemfiles/Gemfile-sprockets-rails-2-2
@@ -3,13 +3,6 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: ".."
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
-  gem "rails", "~> 4.2.0"
-else
-  gem "rails"
-end
+gem "rails"
 gem "sprockets-rails", "~> 2.2.0"
 gem "sass", "~> 3.3.0"
-gem "mime-types", "< 2"
-gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
-gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/gemfiles/Gemfile-sprockets-rails-master b/gemfiles/Gemfile-sprockets-rails-master
@@ -3,13 +3,6 @@ source "https://rubygems.org"
 # Specify your gem"s dependencies in sass-rails.gemspec
 gemspec path: ".."
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
-  gem "rails", "~> 4.2.0"
-else
-  gem "rails"
-end
+gem "rails"
 gem "sprockets-rails", github: "rails/sprockets-rails"
 gem "sass", "~> 3.3.0"
-gem "mime-types", "< 2"
-gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
-gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
diff --git a/sass-rails.gemspec b/sass-rails.gemspec
@@ -13,7 +13,9 @@ Gem::Specification.new do |s|
   s.description = %q{Sass adapter for the Rails asset pipeline.}
   s.license     = %q{MIT}
 
-  s.add_dependency 'railties',        '>= 4.0.0', '< 6'
+  s.required_ruby_version = ">= 2.4.0"
+
+  s.add_dependency 'railties',        '>= 5.2.0'
   s.add_dependency 'sass',            '~> 3.1'
   s.add_dependency 'sprockets-rails', '>= 2.0', '< 4.0'
   s.add_dependency 'sprockets',       '>= 2.8', '< 4.0'

diff --git 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.0.0.beta'
 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
@@ -45,5 +45,9 @@ class Application < Rails::Application
 
     # Enable the asset pipeline
     config.assets.enabled = true
+
+    if Rails.gem_version < Gem::Version.new('6.0.0')
+      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
@@ -4,4 +4,4 @@
 # 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'
+AlternateConfigProject::Application.config.secret_key_base = 'aad80c771c1b2b13b67b0b2d03ee3fa8a1d5a8e8dce2e8bc8b382f197927b789afdc9355f8bc7256faf650015d75d8eb541e9ab96a88f0bd63c4bd7552174849'
diff --git a/test/fixtures/engine_project/engine_project.gemspec b/test/fixtures/engine_project/engine_project.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
   s.test_files = Dir["test/**/*"]
 
-  s.add_dependency "rails", ">= 4.0.0.beta", "< 6"
+  s.add_dependency "rails", ">= 4.0.0.beta"
   # s.add_dependency "jquery-rails"
 
   s.add_development_dependency "sqlite3"

diff --git 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.0.0.beta'
 gem 'sqlite3'
 
 # Asset template engines

diff --git a/test/fixtures/sass_project/config/application.rb b/test/fixtures/sass_project/config/application.rb
@@ -48,5 +48,9 @@ class Application < Rails::Application
 
     # Prefer sass for generated assets.
     config.sass.preferred_syntax = :sass
+
+    if Rails.gem_version < Gem::Version.new('6.0.0')
+      config.active_record.sqlite3.represent_boolean_as_integer = true
+    end
   end
 end
diff --git a/test/fixtures/sass_project/config/initializers/secret_token.rb b/test/fixtures/sass_project/config/initializers/secret_token.rb
@@ -4,4 +4,4 @@
 # 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'
+ScssProject::Application.config.secret_key_base = 'aad80c771c1b2b13b67b0b2d03ee3fa8a1d5a8e8dce2e8bc8b382f197927b789afdc9355f8bc7256faf650015d75d8eb541e9ab96a88f0bd63c4bd7552174849'
diff --git 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.0.0.beta'
 gem 'sqlite3'
 
 # Asset template engines

diff --git 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.gem_version < Gem::Version.new('6.0.0')
+      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
@@ -4,4 +4,4 @@
 # 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'
+ScssProject::Application.config.secret_key_base = 'aad80c771c1b2b13b67b0b2d03ee3fa8a1d5a8e8dce2e8bc8b382f197927b789afdc9355f8bc7256faf650015d75d8eb541e9ab96a88f0bd63c4bd7552174849'
diff --git a/test/sass_rails_generators_test.rb b/test/sass_rails_generators_test.rb
@@ -6,7 +6,7 @@ class ScaffoldGeneratorTest < Sass::Rails::TestCase
       generate_scaffold
       assert_file_exists "app/assets/stylesheets/foos.scss"
       assert_file_exists "app/assets/stylesheets/scaffolds.scss"
-      assert_not_output /conflict/
+      assert_not_output(/conflict/)
     end
   end
 
@@ -15,7 +15,7 @@ class ScaffoldGeneratorTest < Sass::Rails::TestCase
       generate_scaffold
       assert_file_exists "app/assets/stylesheets/foos.sass"
       assert_file_exists "app/assets/stylesheets/scaffolds.sass"
-      assert_not_output /conflict/
+      assert_not_output(/conflict/)
     end
   end
 
@@ -24,7 +24,7 @@ class ScaffoldGeneratorTest < Sass::Rails::TestCase
       generate_scaffold "--stylesheet-engine=scss"
       assert_file_exists "app/assets/stylesheets/engine_project/foos.scss"
       assert_file_exists "app/assets/stylesheets/scaffolds.scss"
-      assert_not_output /conflict/
+      assert_not_output(/conflict/)
     end
   end
 
@@ -33,7 +33,7 @@ class ScaffoldGeneratorTest < Sass::Rails::TestCase
       generate_scaffold "--stylesheet-engine=sass"
       assert_file_exists "app/assets/stylesheets/engine_project/foos.sass"
       assert_file_exists "app/assets/stylesheets/scaffolds.sass"
-      assert_not_output /conflict/
+      assert_not_output(/conflict/)
     end
   end
 

diff --git a/test/sass_rails_logger_test.rb b/test/sass_rails_logger_test.rb
@@ -17,7 +17,7 @@ class SassRailsLoggerTest < Sass::Rails::TestCase
           "Sass::logger.log_level = :#{level}; Sass::logger.log(:#{level}, %Q|#{message}|)"
         end
 
-        assert File.exists?("#{app_root}/log/development.log"), "log file was not created"
+        assert File.exist?("#{app_root}/log/development.log"), "log file was not created"
 
         log_output = File.open("#{app_root}/log/development.log").read
         assert log_output.include?(message), "the #{level} log message was not found in the log file"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,3 @@ source "https://rubygems.org"
		gemspec

		gem "rails", github: "rails/rails"
		gem "arel", github: "rails/arel"