Merge pull request #367 from aclemons/travis_updates

Fix travis build for rails-main.

Author: rafaelfranca

.travis.yml

@@ -3,9 +3,8 @@ sudo: false
 cache: bundler
 
 rvm:
-  - 2.7.2
-  - 2.6.5
-  - 2.5.7
+  - 3.0.3
+  - 2.7.5
   - ruby-head
   - jruby-head
 
@@ -27,32 +26,38 @@ matrix:
       env: BRANCH=5-1-stable
     - rvm: 2.3.8
       env: BRANCH=5-2-stable
-    - rvm: 2.4.7
+    - rvm: 2.4.10
       env: BRANCH=5-0-stable
-    - rvm: 2.4.7
+    - rvm: 2.4.10
       env: BRANCH=5-1-stable
-    - rvm: 2.4.7
+    - rvm: 2.4.10
       env: BRANCH=5-2-stable
-    - rvm: 2.5.7
+    - rvm: 2.5.9
       env: BRANCH=5-0-stable
-    - rvm: 2.5.7
+    - rvm: 2.5.9
       env: BRANCH=5-1-stable
-    - rvm: 2.5.7
+    - rvm: 2.5.9
       env: BRANCH=5-2-stable
-    - rvm: 2.5.7
+    - rvm: 2.5.9
       env: BRANCH=6-0-stable
-    - rvm: 2.6.5
+    - rvm: 2.6.9
       env: BRANCH=5-0-stable
-    - rvm: 2.6.5
+    - rvm: 2.6.9
       env: BRANCH=5-1-stable
-    - rvm: 2.6.5
+    - rvm: 2.6.9
       env: BRANCH=5-2-stable
-    - rvm: 2.6.5
+    - rvm: 2.6.9
       env: BRANCH=6-0-stable
-    - rvm: 2.7.2
+    - rvm: 2.7.5
       env: BRANCH=6-0-stable
-    - rvm: 2.7.2
+    - rvm: 2.7.5
       env: BRANCH=6-1-stable
+    - rvm: 3.0.3
+      env: BRANCH=6-1-stable
+    - rvm: 2.7.5
+      env: BRANCH=7-0-stable
+    - rvm: 3.0.3
+      env: BRANCH=7-0-stable
 
 notifications:
   email: false

activeresource.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.2.2"
 
-  s.add_dependency("activesupport", ">= 5.0", "< 7")
-  s.add_dependency("activemodel", ">= 5.0", "< 7")
+  s.add_dependency("activesupport", ">= 5.0", "< 8")
+  s.add_dependency("activemodel", ">= 5.0", "< 8")
   s.add_dependency("activemodel-serializers-xml", "~> 1.0")
 
   s.add_development_dependency("rake")

test/cases/base_errors_test.rb

@@ -64,7 +64,11 @@ def test_should_iterate_over_errors
     [ :json, :xml ].each do |format|
       invalid_user_using_format(format) do
         errors = []
-        @person.errors.each { |attribute, message| errors << [attribute, message] }
+        if ActiveSupport.gem_version >= Gem::Version.new("6.1.x")
+          @person.errors.each { |error| errors << [error.attribute, error.message] }
+        else
+          @person.errors.each { |attribute, message| errors << [attribute, message] }
+        end
         assert errors.include?([:name, "can't be blank"])
       end
     end