aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2012-11-08 16:18:25 +0000
committerLouise Crow <louise.crow@gmail.com>2012-11-08 16:18:25 +0000
commit9dd0b8b27bc7072c7e6afe54ff3693f653b7c90c (patch)
tree477a3a68beefe0c432c68c6950a41e42e7991014
parent6e052f7e0e973b9e80f3decc7488d8ef0e9f4904 (diff)
Make error message expectation slightly less specific - message format is slightly different under ruby 1.9.
-rw-r--r--spec/models/application_mailer_spec.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/models/application_mailer_spec.rb b/spec/models/application_mailer_spec.rb
index a90f79c01..acf5f43bc 100644
--- a/spec/models/application_mailer_spec.rb
+++ b/spec/models/application_mailer_spec.rb
@@ -80,7 +80,8 @@ describe ApplicationMailer do
it 'should raise an error if the template is in neither core nor theme' do
prepend_theme_views('theme_one')
- lambda{ ApplicationMailer.create_neither() }.should raise_error('Missing template application_mailer/neither.erb in view path spec/fixtures/theme_views/theme_one:spec/fixtures/theme_views/core')
+ expected_error = 'Missing template application_mailer/neither.erb in view path'
+ lambda{ ApplicationMailer.create_neither() }.should raise_error(/#{expected_error}/)
end
it 'should render a multipart email using a theme template' do
@@ -125,7 +126,8 @@ describe ApplicationMailer do
it 'should raise an error if the template is in neither core nor theme' do
append_theme_views('theme_one')
- lambda{ ApplicationMailer.create_neither() }.should raise_error('Missing template application_mailer/neither.erb in view path spec/fixtures/theme_views/core:spec/fixtures/theme_views/theme_one')
+ expected_error = 'Missing template application_mailer/neither.erb in view path'
+ lambda{ ApplicationMailer.create_neither() }.should raise_error(/#{expected_error}/)
end
it 'should render a multipart email using a core template' do