Skip to content

Commit 4c1fc00

Browse files
authored
Merge pull request #964 from aidanharan/cleanup-unfound-coerced-tests
[Rails 7] Cleanup unfound coerced tests
2 parents 6af339d + a659f19 commit 4c1fc00

File tree

1 file changed

+2
-37
lines changed

1 file changed

+2
-37
lines changed

test/cases/coerced_tests.rb

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ module ActiveRecord
5252
class AdapterTest < ActiveRecord::TestCase
5353
# Legacy binds are not supported.
5454
coerce_tests! :test_select_all_insert_update_delete_with_casted_binds
55-
coerce_tests! :test_select_all_insert_update_delete_with_legacy_binds
5655

5756
# As far as I can tell, SQL Server does not support null bytes in strings.
5857
coerce_tests! :test_update_prepared_statement
@@ -535,30 +534,6 @@ def test_create_table_with_defaults_coerce
535534
end
536535
end
537536

538-
module ActiveRecord
539-
module ConnectionAdapters
540-
class QuoteARBaseTest < ActiveRecord::TestCase
541-
# Use our date format.
542-
coerce_tests! :test_quote_ar_object
543-
def test_quote_ar_object_coerced
544-
value = DatetimePrimaryKey.new(id: @time)
545-
assert_deprecated do
546-
assert_equal "'02-14-2017 12:34:56.79'", @connection.quote(value)
547-
end
548-
end
549-
550-
# Use our date format.
551-
coerce_tests! :test_type_cast_ar_object
552-
def test_type_cast_ar_object_coerced
553-
value = DatetimePrimaryKey.new(id: @time)
554-
assert_deprecated do
555-
assert_equal "02-14-2017 12:34:56.79", @connection.type_cast(value)
556-
end
557-
end
558-
end
559-
end
560-
end
561-
562537
module ActiveRecord
563538
class Migration
564539
class ColumnAttributesTest < ActiveRecord::TestCase
@@ -1265,16 +1240,6 @@ def test_does_not_duplicate_optimizer_hints_on_merge_coerced
12651240
query = Post.optimizer_hints("OMGHINT").merge(Post.optimizer_hints("OMGHINT")).to_sql
12661241
assert_equal expected, query
12671242
end
1268-
1269-
# Original Rails test fails on Windows CI because the dump file was not being binary read.
1270-
coerce_tests! :test_marshal_load_legacy_relation
1271-
def test_marshal_load_legacy_relation_coerced
1272-
path = File.expand_path(
1273-
"support/marshal_compatibility_fixtures/legacy_relation.dump",
1274-
ARTest::SQLServer.root_activerecord_test
1275-
)
1276-
assert_equal 11, Marshal.load(File.binread(path)).size
1277-
end
12781243
end
12791244
end
12801245

@@ -1844,8 +1809,8 @@ def test_eager_loading_too_many_ids_coerced
18441809

18451810
class LogSubscriberTest < ActiveRecord::TestCase
18461811
# Call original test from coerced test. Fixes issue on CI with Rails installed as a gem.
1847-
coerce_tests! :test_vebose_query_logs
1848-
def test_vebose_query_logs_coerced
1812+
coerce_tests! :test_verbose_query_logs
1813+
def test_verbose_query_logs_coerced
18491814
original_test_vebose_query_logs
18501815
end
18511816

0 commit comments

Comments
 (0)