diff options
| -rw-r--r-- | actionpack/lib/action_controller/assertions/response_assertions.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/assertions/response_assertions.rb b/actionpack/lib/action_controller/assertions/response_assertions.rb index 67dd3a5724..c5fc6c7966 100644 --- a/actionpack/lib/action_controller/assertions/response_assertions.rb +++ b/actionpack/lib/action_controller/assertions/response_assertions.rb @@ -34,7 +34,9 @@ module ActionController assert_block("") { true } # to count the assertion else if @response.error? - assert_block(build_message(message, "Expected response to be a <?>, but was <?>\n<?>", type, @response.response_code, @response.template.instance_variable_get(:@exception).message)) { false } + exception = @response.template.instance_variable_get(:@exception) + exception_message = exception && exception.message + assert_block(build_message(message, "Expected response to be a <?>, but was <?>\n<?>", type, @response.response_code, exception_message.to_s)) { false } else assert_block(build_message(message, "Expected response to be a <?>, but was <?>", type, @response.response_code)) { false } end |