From 314e4bbaeacc91297689761308eba0d2fac29e16 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sat, 8 Dec 2012 19:22:09 -0200 Subject: Fix method assertion ensuring it will match "end" with the same indentation Otherwise it was matching "end" lines from blocks within the method body, making tests such as the migration ones fail. --- railties/lib/rails/generators/test_case.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/lib/rails') diff --git a/railties/lib/rails/generators/test_case.rb b/railties/lib/rails/generators/test_case.rb index 01e0e66d89..85a8914ccc 100644 --- a/railties/lib/rails/generators/test_case.rb +++ b/railties/lib/rails/generators/test_case.rb @@ -163,8 +163,8 @@ module Rails # end # end def assert_instance_method(method, content) - assert content =~ /def #{method}(\(.+\))?(.*?)\n\s+end/m, "Expected to have method #{method}" - yield $2.strip if block_given? + assert content =~ /(\s+)def #{method}(\(.+\))?(.*?)\n\1end/m, "Expected to have method #{method}" + yield $3.strip if block_given? end alias :assert_method :assert_instance_method -- cgit v1.2.3