diff options
author | Seb Bacon <seb.bacon@gmail.com> | 2011-03-09 14:58:30 +0000 |
---|---|---|
committer | Seb Bacon <seb.bacon@gmail.com> | 2011-03-09 14:58:30 +0000 |
commit | b4585af18e9c3a033f6cfe27213f0575af795a66 (patch) | |
tree | 996efa1487ac0d8cb7e4f53ee6478ad625b9d27d /spec/lib | |
parent | 224b8a4ba3a24af91068505c7907724448a4096d (diff) | |
parent | 4cc2cf2a6d935adfd263ea4fd7791a6d84f704da (diff) |
merge from master (post-CSRF changes)
Diffstat (limited to 'spec/lib')
-rw-r--r-- | spec/lib/fcgi_fixes_spec.rb | 14 | ||||
-rw-r--r-- | spec/lib/sendmail_return_path_spec.rb | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/spec/lib/fcgi_fixes_spec.rb b/spec/lib/fcgi_fixes_spec.rb deleted file mode 100644 index edc1c9d98..000000000 --- a/spec/lib/fcgi_fixes_spec.rb +++ /dev/null @@ -1,14 +0,0 @@ -# This is a test of the monkey patches in lib/fcgi_fixes.rb - -require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') - -require 'railties/lib/fcgi_handler.rb' - -describe "when doing FastCGI" do - - it "should have fixed dynamic FastCGI bug" do - RailsFCGIHandler::SIGNALS['TERM'].should == :exit - end - -end - diff --git a/spec/lib/sendmail_return_path_spec.rb b/spec/lib/sendmail_return_path_spec.rb index 0a9f60953..f1a91240b 100644 --- a/spec/lib/sendmail_return_path_spec.rb +++ b/spec/lib/sendmail_return_path_spec.rb @@ -22,7 +22,7 @@ describe "when sending email with an altered return path" do mock_smtp.should_receive(:start).once.and_yield(mock_smtp_session) # the second parameter to the SMTP session is the sender (return path) - mock_smtp_session.should_receive(:sendmail).once.with(anything(), ["test@localhost"], anything()) + mock_smtp_session.should_receive(:sendmail).once.with(anything(), "test@localhost", anything()) Net::SMTP.stub!(:new).and_return(mock_smtp) |