diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/controllers/admin_censor_rule_controller_spec.rb | 10 | ||||
| -rw-r--r-- | spec/controllers/public_body_controller_spec.rb | 5 | ||||
| -rw-r--r-- | spec/controllers/request_controller_spec.rb | 4 | ||||
| -rw-r--r-- | spec/models/purge_request_spec.rb | 9 | ||||
| -rw-r--r-- | spec/models/request_mailer_spec.rb | 1 | ||||
| -rw-r--r-- | spec/script/mailin_spec.rb | 8 |
6 files changed, 27 insertions, 10 deletions
diff --git a/spec/controllers/admin_censor_rule_controller_spec.rb b/spec/controllers/admin_censor_rule_controller_spec.rb index 8893a858b..fb9ddf594 100644 --- a/spec/controllers/admin_censor_rule_controller_spec.rb +++ b/spec/controllers/admin_censor_rule_controller_spec.rb @@ -2,10 +2,14 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe AdminCensorRuleController, "when making censor rules from the admin interface" do integrate_views - before { basic_auth_login @request } - + before do + basic_auth_login @request + PurgeRequest.destroy_all + end + + it "should create a censor rule and purge the corresponding request from varnish" do - ir = info_requests(:fancy_dog_request) + ir = info_requests(:fancy_dog_request) post :create, :censor_rule => { :text => "meat", :replacement => "tofu", diff --git a/spec/controllers/public_body_controller_spec.rb b/spec/controllers/public_body_controller_spec.rb index 29ece18cb..5f4012737 100644 --- a/spec/controllers/public_body_controller_spec.rb +++ b/spec/controllers/public_body_controller_spec.rb @@ -67,6 +67,11 @@ describe PublicBodyController, "when showing a body" do ActionController::Routing::Routes.filters = old_filters end + it "should remember the filter (view) setting on redirecting" do + get :show, :show_locale => "es", :url_name => "tgq", :view => 'successful' + response.should redirect_to show_public_body_successful_url(:url_name => "etgq") + end + it "should redirect to newest name if you use historic name of public body in URL" do get :show, :url_name => "hdink", :view => 'all' response.should redirect_to(:controller => 'public_body', :action => 'show', :url_name => "dfh") diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb index 6f25b605a..21dd0853a 100644 --- a/spec/controllers/request_controller_spec.rb +++ b/spec/controllers/request_controller_spec.rb @@ -121,7 +121,9 @@ end describe RequestController, "when changing things that appear on the request page" do - integrate_views + before do + PurgeRequest.destroy_all + end it "should purge the downstream cache when mail is received" do ir = info_requests(:fancy_dog_request) diff --git a/spec/models/purge_request_spec.rb b/spec/models/purge_request_spec.rb index 94fe01317..7b67fca52 100644 --- a/spec/models/purge_request_spec.rb +++ b/spec/models/purge_request_spec.rb @@ -1,12 +1,13 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') require 'fakeweb' -describe PurgeRequest, "purging things" do +describe PurgeRequest, "purging things" do before do + PurgeRequest.destroy_all FakeWeb.last_request = nil end - it 'should issue purge requests to the server' do + it 'should issue purge requests to the server' do req = PurgeRequest.new(:url => "/begone_from_here", :model => "don't care", :model_id => "don't care") @@ -16,7 +17,7 @@ describe PurgeRequest, "purging things" do PurgeRequest.all().count.should == 0 end - it 'should fail silently for a misconfigured server' do + it 'should fail silently for a misconfigured server' do FakeWeb.register_uri(:get, %r|brokenv|, :body => "BROKEN") config = MySociety::Config.load_default() config['VARNISH_HOST'] = "brokencache" @@ -29,4 +30,4 @@ describe PurgeRequest, "purging things" do PurgeRequest.all().count.should == 0 end end - + diff --git a/spec/models/request_mailer_spec.rb b/spec/models/request_mailer_spec.rb index 20d401a63..000a0c12e 100644 --- a/spec/models/request_mailer_spec.rb +++ b/spec/models/request_mailer_spec.rb @@ -1,3 +1,4 @@ +# encoding: utf-8 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe RequestMailer, " when receiving incoming mail" do diff --git a/spec/script/mailin_spec.rb b/spec/script/mailin_spec.rb index d80789635..f9368996d 100644 --- a/spec/script/mailin_spec.rb +++ b/spec/script/mailin_spec.rb @@ -4,7 +4,11 @@ require "external_command" def mailin_test(email_filename) Dir.chdir Rails.root do xc = ExternalCommand.new("script/mailin") - xc.run(load_file_fixture(email_filename)) + mail = load_file_fixture(email_filename) + ir = info_requests(:boring_request) + mail.gsub!('EMAIL_TO', ir.incoming_email) + mail.gsub!('EMAIL_FROM', 'responder@localhost') + xc.run(mail) xc.err.should == "" return xc end @@ -18,4 +22,4 @@ describe "When importing mail into the application" do r.out.should == "" end -end
\ No newline at end of file +end |