aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2018-08-11 10:35:28 -0400
committerGitHub <noreply@github.com>2018-08-11 10:35:28 -0400
commit2cb87e3b31e3152475347c667d0b8a05a93d8918 (patch)
tree29c75ac298b76156cac86cc2f5b471c9946f9244 /railties
parent2d3a28b949f2e8a0b755afdb52cbcd55e5ac0d98 (diff)
parentd0edc9c7ae9a7fbb945f34b75cc0be342196708d (diff)
downloadrails-2cb87e3b31e3152475347c667d0b8a05a93d8918.tar.gz
rails-2cb87e3b31e3152475347c667d0b8a05a93d8918.tar.bz2
rails-2cb87e3b31e3152475347c667d0b8a05a93d8918.zip
Merge pull request #33553 from bogdanvlviv/ensure-load_schema-does_not-output-in-parallel-tests-execution
Ensure that running tests in parallel doesn't display schema load output
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/test_runner_test.rb18
1 files changed, 18 insertions, 0 deletions
diff --git a/railties/test/application/test_runner_test.rb b/railties/test/application/test_runner_test.rb
index 455dc60efd..5c34b205c9 100644
--- a/railties/test/application/test_runner_test.rb
+++ b/railties/test/application/test_runner_test.rb
@@ -525,9 +525,18 @@ module ApplicationTests
def test_run_in_parallel_with_processes
file_name = create_parallel_processes_test_file
+ app_file "db/schema.rb", <<-RUBY
+ ActiveRecord::Schema.define(version: 1) do
+ create_table :users do |t|
+ t.string :name
+ end
+ end
+ RUBY
+
output = run_test_command(file_name)
assert_match %r{Finished in.*\n2 runs, 2 assertions}, output
+ assert_no_match "create_table(:users)", output
end
def test_run_in_parallel_with_threads
@@ -539,9 +548,18 @@ module ApplicationTests
file_name = create_parallel_threads_test_file
+ app_file "db/schema.rb", <<-RUBY
+ ActiveRecord::Schema.define(version: 1) do
+ create_table :users do |t|
+ t.string :name
+ end
+ end
+ RUBY
+
output = run_test_command(file_name)
assert_match %r{Finished in.*\n2 runs, 2 assertions}, output
+ assert_no_match "create_table(:users)", output
end
def test_raise_error_when_specified_file_does_not_exist