Skip to content

Commit c3f068f

Browse files
committed
Followup form removal of mixin_test with clean Rake::TestTask#test_files.
1 parent d8354d1 commit c3f068f

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

Rakefile

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,9 @@ for adapter in %w( sqlserver sqlserver_odbc )
7979
t.libs << "test"
8080
t.libs << "test/connections/native_#{adapter}"
8181
t.libs << "../../../rails/activerecord/test/"
82-
# Run our create_tables tests first, then the rails ones, then our other ones
83-
# Mostly because we want mixin_test from rails to be included *BEFORE* our
84-
# mixin_test_sqlserver and thus not have it be included twice and cause
85-
# Time.now_with_forcing recursion.
86-
# TODO raise a patch against rails to stop this sort of thing happening if
87-
# someone includes mixin_test twice.
88-
t.test_files = (FileList["test/**/*create_tables_test_sqlserver.rb", "../../../rails/activerecord/test/**/*_test.rb"].to_a +
89-
FileList["test/**/*_test_sqlserver.rb"].exclude('test/**/*create_tables_test_sqlserver.rb').to_a)
82+
t.test_files = (
83+
Dir.glob("test/cases/**/*_test_sqlserver.rb").sort +
84+
Dir.glob("../../../rails/activerecord/test/**/*_test.rb").sort )
9085
t.verbose = true
9186
}
9287

0 commit comments

Comments
 (0)