diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-11-20 15:30:40 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-11-20 15:30:40 +0000 |
| commit | 766da660994dbe7c86f556d9cf863411814622fe (patch) | |
| tree | 9adc0ef695cb076216e8ebb15ab29b56ef9bbf15 /spec/models | |
| parent | 8b4003f7fce9e089f2220e6f1a21681f7cf2df3d (diff) | |
| parent | 21f4341619ae1b076521e04f2124ef86fd2b7b5f (diff) | |
Merge remote-tracking branch 'origin/develop' into wdtk
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/application_mailer_spec.rb | 6 |
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 |