diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-03-13 09:16:48 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-03-13 09:16:48 -0700 |
| commit | d5045bf83cff620545b93c185e411216f814ffdd (patch) | |
| tree | 04f9a953cbfcdeba9c3d1affd6cd40dc6b61dd33 /spec/spec_helper.rb | |
| parent | bf6fc976fb29adbc8d46336d3d010c99effcaef0 (diff) | |
| parent | 20ec9b49f3407223b7cbcb25a636ba44a4b6967c (diff) | |
Merge remote-tracking branch 'openaustralia_github/one_support_email_on_admin_attention_state' into develop
Conflicts:
Gemfile.lock
app/controllers/request_controller.rb
app/models/request_mailer.rb
app/views/admin_general/index.rhtml
spec/models/request_mailer_spec.rb
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e05ef75dd..33e39e6e4 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -30,8 +30,9 @@ config['REPLY_LATE_AFTER_DAYS'] = 20 require 'fakeweb' FakeWeb.register_uri(:purge, %r|varnish.localdomain|, :body => "OK") -# Uncomment the next line to use webrat's matchers -#require 'webrat/integrations/rspec-rails' +Webrat.configure do |config| + config.mode = :rails +end # Use test-specific translations FastGettext.add_text_domain 'app', :path => File.join(File.dirname(__FILE__), 'fixtures', 'locale'), :type => :po |