@@ -1,5 +1,7 @@ == Change Log +* Fix with_error in render_matcher not causing the spec to fail when no exception raised. [Jason Garber] + === 0.8.0 RC1 * Make features task run in instance mode. [Sean Cribbs] CHANGELOG @@ -14,7 +14,7 @@ module Spec @matching = @expected end case - when @error_message: false + when @expected_error_message: false when @expected: @actual == @expected when @matching: @actual =~ @matching else true @@ -38,7 +38,11 @@ module Spec "expected page to #{action}, but got #{@actual.inspect}" end else - "expected rendering #{@content.inspect} to throw exception with message #{@expected_error_message.inspect}, but was #{@actual_error.message.inspect}" + if @actual_error + "expected rendering #{@content.inspect} to throw exception with message #{@expected_error_message.inspect}, but was #{@actual_error.message.inspect}" + else + "expected rendering #{@content.inspect} to throw exception with message #{@expected_error_message.inspect}, but no exception thrown. Rendered #{@actual.inspect} instead." + end end else "expected #{@content.inspect} to render, but an exception was thrown #{@actual_error.message}" spec/matchers/render_matcher.rb @@ -81,9 +81,9 @@ describe "Standard Tags" do it 'should error with invalid "offset" attribute' do message = "`offset' attribute of `each' tag must be a positive number between 1 and 4 digits" - page.should render(%{offset="a"}).with_error(message) - page.should render(%{offset="-10"}).with_error(message) - page.should render(%{offset="50000"}).with_error(message) + page.should render(page_children_each_tags(%{offset="a"})).with_error(message) + page.should render(page_children_each_tags(%{offset="-10"})).with_error(message) + page.should render(page_children_each_tags(%{offset="50000"})).with_error(message) end it 'should error with invalid "by" attribute' do spec/models/standard_tags_spec.rb b775ebe1f6c469fcb0fbb03b33afe1ee44bdb48a Jason Garber jg@jasongarber.com http://github.com/hairballopolis/radiant/commit/c3fb06fdf4932afa6a1a5936deed1f616a9608c7 c3fb06fdf4932afa6a1a5936deed1f616a9608c7 2009-06-05T14:00:06-07:00 2009-06-05T13:58:50-07:00 Fix with_error in render_matcher not failing specs when no exception raised. 28c8495c00ea0d49380bcda31b63706452bacdae Jason Garber jg@jasongarber.com