Skip to content

Commit 111b8be

Browse files
committed
Do not run coerceable tests during SS only. No fixtures munging!
1 parent 4b0de74 commit 111b8be

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

Guardfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ guard :minitest, {
1313
autorun: false,
1414
include: ['lib', 'test', ar_lib, ar_test],
1515
test_folders: ['test'],
16-
test_file_patterns: ["*_test.rb", "*_test_sqlserver.rb", "*_tests.rb"]
16+
test_file_patterns: ["*_test.rb", "*_test_sqlserver.rb"]
1717
} do
1818
# Our project watchers.
1919
if ENV['TEST_FILES']

test/cases/coerced_tests.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ def self.search(term)
2323
require 'models/author'
2424
class YamlSerializationTest < ActiveRecord::TestCase
2525

26-
fixtures :authors
27-
2826
coerce_tests! :test_types_of_virtual_columns_are_not_changed_on_round_trip
2927
def test_types_of_virtual_columns_are_not_changed_on_round_trip_coerced
3028
author = Author.select('authors.*, 5 as posts_count').first
@@ -72,8 +70,6 @@ def test_not_eq_with_array_parameter_coerced
7270
require 'models/company'
7371
class InheritanceTest < ActiveRecord::TestCase
7472

75-
fixtures :companies, :projects, :subscribers, :accounts, :vegetables
76-
7773
coerce_tests! :test_eager_load_belongs_to_primary_key_quoting
7874
def test_eager_load_belongs_to_primary_key_quoting_coerced
7975
con = Account.connection
@@ -90,8 +86,6 @@ def test_eager_load_belongs_to_primary_key_quoting_coerced
9086
require 'models/computer'
9187
class NestedRelationScopingTest < ActiveRecord::TestCase
9288

93-
fixtures :authors, :developers, :projects, :comments, :posts
94-
9589
coerce_tests! :test_merge_options
9690
def test_merge_options_coerced
9791
Developer.where('salary = 80000').scoping do
@@ -112,8 +106,6 @@ def test_merge_options_coerced
112106
require 'models/subscriber'
113107
class EachTest < ActiveRecord::TestCase
114108

115-
fixtures :posts, :subscribers
116-
117109
coerce_tests! :test_find_in_batches_should_quote_batch_order
118110
def test_find_in_batches_should_quote_batch_order_coerced
119111
c = Post.connection

test/support/rake_helpers.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def test_files
3232
return env_ar_test_files.unshift(SQLSERVER_HELPER) if env_ar_test_files
3333
return env_test_files if env_test_files
3434
if ENV['ONLY_SQLSERVER']
35-
sqlserver_cases + [SQLSERVER_COERCED]
35+
sqlserver_cases
3636
elsif ENV['ONLY_ACTIVERECORD']
3737
[SQLSERVER_HELPER] + (ar_cases + [SQLSERVER_COERCED])
3838
else

0 commit comments

Comments
 (0)