Merge pull request #1 from jbryant92/rails-6-support

Let the rails-6-support branch run with 6.0.0
Fuseit · Aug 19, 2019 · dbedde4 · dbedde4
2 parents 7b95093 + 3845921
commit dbedde4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gemfiles/active_record_60.gemfile b/gemfiles/active_record_60.gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '6.0.0.rc2', require: 'active_record'
-gem 'activesupport', '6.0.0.rc2', require: 'active_support'
+gem 'activerecord', '6.0.0', require: 'active_record'
+gem 'activesupport', '6.0.0', require: 'active_support'
 
 # Development dependencies
 group :development do

diff --git a/test/test_associations.rb b/test/test_associations.rb
@@ -228,7 +228,7 @@ def test_double_belongs_to_with_deleted
   end
 
   def test_mass_assignment_of_paranoid_column_enabled
-    if ActiveRecord::VERSION::MAJOR > 4 && ActiveRecord::VERSION::MINOR > 1
+    if Gem.loaded_specs['activerecord'].version >= Gem::Version.new('5.2.0')
       skip 'Creation as deleted is not supported with Rails >= 5.2'
     end
     now = Time.now