Permalink
Browse files

Merge pull request #6550 from arunagw/warning_removed_assert_match

Some of the warnings removed from "railties"
  • Loading branch information...
2 parents 555d815 + 397e47d commit 0cc4e37178e3ed9ed8722d1335e1e789e7c95fd3 @josevalim josevalim committed May 30, 2012
@@ -288,16 +288,16 @@ def update
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
@@ -33,14 +33,14 @@ def teardown
output = `bundle exec rake notes`
lines = output.scan(/\[([0-9\s]+)\](\s)/)
- assert_match /note in erb/, output
- assert_match /note in haml/, output
- assert_match /note in slim/, output
- assert_match /note in ruby/, output
- assert_match /note in coffee/, output
- assert_match /note in js/, output
- assert_match /note in css/, output
- assert_match /note in scss/, output
+ assert_match(/note in erb/, output)
+ assert_match(/note in haml/, output)
+ assert_match(/note in slim/, output)
+ assert_match(/note in ruby/, output)
+ assert_match(/note in coffee/, output)
+ assert_match(/note in js/, output)
+ assert_match(/note in css/, output)
+ assert_match(/note in scss/, output)
assert_equal 8, lines.size
@@ -72,12 +72,12 @@ def teardown
output = `bundle exec rake notes`
lines = output.scan(/\[([0-9\s]+)\]/).flatten
- assert_match /note in app directory/, output
- assert_match /note in config directory/, output
- assert_match /note in lib directory/, output
- assert_match /note in script directory/, output
- assert_match /note in test directory/, output
- assert_no_match /note in some_other directory/, output
+ assert_match(/note in app directory/, output)
+ assert_match(/note in config directory/, output)
+ assert_match(/note in lib directory/, output)
+ assert_match(/note in script directory/, output)
+ assert_match(/note in test directory/, output)
+ assert_no_match(/note in some_other directory/, output)
assert_equal 5, lines.size
@@ -108,13 +108,13 @@ def teardown
output = `SOURCE_ANNOTATION_DIRECTORIES='some_other_dir' bundle exec rake notes`
lines = output.scan(/\[([0-9\s]+)\]/).flatten
- assert_match /note in app directory/, output
- assert_match /note in config directory/, output
- assert_match /note in lib directory/, output
- assert_match /note in script directory/, output
- assert_match /note in test directory/, output
+ assert_match(/note in app directory/, output)
+ assert_match(/note in config directory/, output)
+ assert_match(/note in lib directory/, output)
+ assert_match(/note in script directory/, output)
+ assert_match(/note in test directory/, output)
- assert_match /note in some_other directory/, output
+ assert_match(/note in some_other directory/, output)
assert_equal 6, lines.size
@@ -35,7 +35,7 @@ def test_start
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 @@ def test_start_with_sandbox
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 @@ def test_console_with_environment
start ["-e production"]
- assert_match /production/, output
+ assert_match(/production/, output)
end
def test_console_with_rails_environment
@@ -70,7 +70,7 @@ def test_console_with_rails_environment
start ["RAILS_ENV=production"]
- assert_match /production/, output
+ assert_match(/production/, output)
end
@@ -12,7 +12,7 @@ def test_config
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 @@ def test_oracle_include_password
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 @@ def test_print_help_short
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 @@ def test_print_help_long
end
assert aborted
assert_equal '', output
- assert_match /Usage:.*dbconsole/, stdout
+ assert_match(/Usage:.*dbconsole/, stdout)
end
private
@@ -186,7 +186,7 @@ def test_rails_root_templates
mkdir_p(File.dirname(template))
File.open(template, 'w'){ |f| f.write "empty" }
- output = capture(:stdout) do
+ capture(:stdout) do
Rails::Generators.invoke :model, ["user"], :destination_root => destination_root
end
@@ -205,7 +205,7 @@ def test_source_paths_for_not_namespaced_generators
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

0 comments on commit 0cc4e37

Please sign in to comment.