Fixed CI

ankane · Oct 30, 2022 · 2b3262a · 2b3262a
1 parent f589103
commit 2b3262a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/test/add_index_test.rb b/test/add_index_test.rb
@@ -73,8 +73,10 @@ def test_auto_analyze
   def test_extra_arguments
     if postgresql?
       assert_unsafe AddIndexExtraArguments
-    else
+    elsif ActiveRecord::VERSION::STRING.to_f >= 6.1
       assert_argument_error AddIndexExtraArguments
+    else
+      assert_type_error AddIndexExtraArguments
     end
   end
 

diff --git a/test/safe_by_default_test.rb b/test/safe_by_default_test.rb
@@ -14,7 +14,11 @@ def test_add_index
   end
 
   def test_add_index_extra_arguments
-    assert_argument_error AddIndexExtraArguments
+    if postgresql? || ActiveRecord::VERSION::STRING.to_f >= 6.1
+      assert_argument_error AddIndexExtraArguments
+    else
+      assert_type_error AddIndexExtraArguments
+    end
   end
 
   def test_add_index_corruption

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -116,6 +116,12 @@ def assert_argument_error(migration)
     end
   end
 
+  def assert_type_error(migration)
+    assert_raises(TypeError) do
+      migrate(migration)
+    end
+  end
+
   def with_target_version(version)
     StrongMigrations.target_version = version
     yield