diff options
author | Arun Agrawal <arunagw@gmail.com> | 2012-05-30 14:38:56 +0530 |
---|---|---|
committer | Arun Agrawal <arunagw@gmail.com> | 2012-05-30 14:46:08 +0530 |
commit | 05f88024de99cbd3f8743a8edc76203d69207235 (patch) | |
tree | 0d3586584cdfe3566ddef23a52af0db780222170 | |
parent | 4646b2ecacaa06e5652618623f2e76cab67018b7 (diff) | |
download | rails-05f88024de99cbd3f8743a8edc76203d69207235.tar.gz rails-05f88024de99cbd3f8743a8edc76203d69207235.tar.bz2 rails-05f88024de99cbd3f8743a8edc76203d69207235.zip |
More assert_match warnings fixed.
-rw-r--r-- | railties/test/application/configuration_test.rb | 6 | ||||
-rw-r--r-- | railties/test/commands/console_test.rb | 8 | ||||
-rw-r--r-- | railties/test/commands/dbconsole_test.rb | 8 | ||||
-rw-r--r-- | railties/test/generators_test.rb | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index 252dd0e31a..d7689863e6 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -288,16 +288,16 @@ module ApplicationTests params = {:authenticity_token => token} get "/posts/1" - assert_match /patch/, last_response.body + assert_match(/patch/, last_response.body) patch "/posts/1", params - assert_match /update/, last_response.body + assert_match(/update/, last_response.body) patch "/posts/1", params assert_equal 200, last_response.status put "/posts/1", params - assert_match /update/, last_response.body + assert_match(/update/, last_response.body) put "/posts/1", params assert_equal 200, last_response.status diff --git a/railties/test/commands/console_test.rb b/railties/test/commands/console_test.rb index 9aa1d68675..78648a16b3 100644 --- a/railties/test/commands/console_test.rb +++ b/railties/test/commands/console_test.rb @@ -35,7 +35,7 @@ class Rails::ConsoleTest < ActiveSupport::TestCase start - assert_match /Loading \w+ environment \(Rails/, output + assert_match(/Loading \w+ environment \(Rails/, output) end def test_start_with_debugger @@ -52,7 +52,7 @@ class Rails::ConsoleTest < ActiveSupport::TestCase start ["--sandbox"] - assert_match /Loading \w+ environment in sandbox \(Rails/, output + assert_match(/Loading \w+ environment in sandbox \(Rails/, output) end def test_console_with_environment @@ -61,7 +61,7 @@ class Rails::ConsoleTest < ActiveSupport::TestCase start ["-e production"] - assert_match /production/, output + assert_match(/production/, output) end def test_console_with_rails_environment @@ -70,7 +70,7 @@ class Rails::ConsoleTest < ActiveSupport::TestCase start ["RAILS_ENV=production"] - assert_match /production/, output + assert_match(/production/, output) end diff --git a/railties/test/commands/dbconsole_test.rb b/railties/test/commands/dbconsole_test.rb index 6d0f5ca073..562b83713b 100644 --- a/railties/test/commands/dbconsole_test.rb +++ b/railties/test/commands/dbconsole_test.rb @@ -12,7 +12,7 @@ class Rails::DBConsoleTest < ActiveSupport::TestCase app_config({}) capture_abort { Rails::DBConsole.config } assert aborted - assert_match /No database is configured for the environment '\w+'/, output + assert_match(/No database is configured for the environment '\w+'/, output) app_config(test: "with_init") assert_equal Rails::DBConsole.config, "with_init" @@ -129,7 +129,7 @@ class Rails::DBConsoleTest < ActiveSupport::TestCase def test_unknown_command_line_client start(adapter: 'unknown', database: 'db') assert aborted - assert_match /Unknown command-line client for db/, output + assert_match(/Unknown command-line client for db/, output) end def test_print_help_short @@ -138,7 +138,7 @@ class Rails::DBConsoleTest < ActiveSupport::TestCase end assert aborted assert_equal '', output - assert_match /Usage:.*dbconsole/, stdout + assert_match(/Usage:.*dbconsole/, stdout) end def test_print_help_long @@ -147,7 +147,7 @@ class Rails::DBConsoleTest < ActiveSupport::TestCase end assert aborted assert_equal '', output - assert_match /Usage:.*dbconsole/, stdout + assert_match(/Usage:.*dbconsole/, stdout) end private diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb index 60e7e57a91..3823332a3b 100644 --- a/railties/test/generators_test.rb +++ b/railties/test/generators_test.rb @@ -205,7 +205,7 @@ class GeneratorsTest < Rails::Generators::TestCase def test_usage_with_embedded_ruby require File.expand_path("fixtures/lib/generators/usage_template/usage_template_generator", File.dirname(__FILE__)) output = capture(:stdout) { Rails::Generators.invoke :usage_template, ['--help'] } - assert_match /:: 2 ::/, output + assert_match(/:: 2 ::/, output) end def test_hide_namespace |