diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-06-14 10:19:45 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-06-14 10:19:45 +0100 |
| commit | c78e3b2aba67ad9844175e1e27016692759f498a (patch) | |
| tree | b2555bab443ce173356c49dffeb7ebcc1224ea3d /spec/spec_helper.rb | |
| parent | 557a25aec4f41ebaba67349011052e04e1c68f9f (diff) | |
| parent | f2b779ec4e095afeb1b1da2a92a335069c59dccd (diff) | |
merge WTDK changes to master (preparation for closing WTDK branch and deploying WTDK website straight from master)
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f0f50d61e..87a89f755 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -53,7 +53,7 @@ end # XXX No idea what namespace/class/module to put this in def receive_incoming_mail(email_name, email_to, email_from = 'geraldinequango@localhost') - email_name = File.join(Spec::Runner.configuration.fixture_path, email_name) + email_name = file_fixture_name(email_name) content = File.read(email_name) content.gsub!('EMAIL_TO', email_to) content.gsub!('EMAIL_FROM', email_from) @@ -61,7 +61,7 @@ def receive_incoming_mail(email_name, email_to, email_from = 'geraldinequango@lo end def file_fixture_name(file_name) - return File.join(Spec::Runner.configuration.fixture_path, file_name) + return File.join(Spec::Runner.configuration.fixture_path, "files", file_name) end def load_file_fixture(file_name) |