From 83d0232304a16fc7431b6778f80e42cc073b3600 Mon Sep 17 00:00:00 2001 From: Pablo Herrero Date: Fri, 12 Apr 2013 15:40:30 -0300 Subject: Extract method declaration regexp into a constant --- railties/lib/rails/generators/testing/assertions.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'railties/lib/rails') diff --git a/railties/lib/rails/generators/testing/assertions.rb b/railties/lib/rails/generators/testing/assertions.rb index 6267b2f2ee..14fd4efd4e 100644 --- a/railties/lib/rails/generators/testing/assertions.rb +++ b/railties/lib/rails/generators/testing/assertions.rb @@ -2,6 +2,8 @@ module Rails module Generators module Testing module Assertions + METHOD_DECLARATION_REGEXP = /(\s+)def #{method}(\(.+\))?(.*?)\n\1end/m + # Asserts a given file exists. You need to supply an absolute path or a path relative # to the configured destination: # @@ -96,7 +98,7 @@ module Rails # end # end def assert_instance_method(method, content) - assert content =~ /(\s+)def #{method}(\(.+\))?(.*?)\n\1end/m, "Expected to have method #{method}" + assert content =~ METHOD_DECLARATION_REGEXP, "Expected to have method #{method}" yield $3.strip if block_given? end alias :assert_method :assert_instance_method -- cgit v1.2.3