diff options
| -rw-r--r-- | Rakefile | 2 | ||||
| -rw-r--r-- | config/boot.rb | 2 | ||||
| -rw-r--r-- | config/environment.rb | 2 | ||||
| -rw-r--r-- | lib/old_rubygems_patch.rb | 6 | ||||
| -rw-r--r-- | spec/models/incoming_message_spec.rb | 20 |
5 files changed, 24 insertions, 8 deletions
@@ -5,7 +5,7 @@ require(File.join(File.dirname(__FILE__), 'config', 'boot')) require 'rake' require 'rake/testtask' -require 'rake/rdoctask' +require 'rdoc/task' require 'tasks/rails' diff --git a/config/boot.rb b/config/boot.rb index 90fd9cd4d..0f5e661ed 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -31,7 +31,7 @@ module Rails end def vendor_rails? - File.exist?("#{RAILS_ROOT}/vendor/rails") + File.exist?("#{RAILS_ROOT}/vendor/rails/Rakefile") end def preinitialize diff --git a/config/environment.rb b/config/environment.rb index 0af465049..91839c043 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -6,7 +6,7 @@ # ENV['RAILS_ENV'] ||= 'production' # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.3.11' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') diff --git a/lib/old_rubygems_patch.rb b/lib/old_rubygems_patch.rb index 5601a5e90..3001a7381 100644 --- a/lib/old_rubygems_patch.rb +++ b/lib/old_rubygems_patch.rb @@ -1,4 +1,8 @@ -require File.join(File.dirname(__FILE__),'..','vendor','rails','railties','lib','rails','gem_dependency.rb') +if File.exist? File.join(File.dirname(__FILE__),'..','vendor','rails','railties','lib','rails','gem_dependency.rb') + require File.join(File.dirname(__FILE__),'..','vendor','rails','railties','lib','rails','gem_dependency.rb') +else + require 'rails/gem_dependency' +end module Rails class GemDependency < Gem::Dependency diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb index 662b4bf9a..a8411bc34 100644 --- a/spec/models/incoming_message_spec.rb +++ b/spec/models/incoming_message_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe IncomingMessage, " when dealing with incoming mail" do - fixtures :incoming_messages, :raw_emails, :info_requests + fixtures :users, :raw_emails, :public_bodies, :public_body_translations, :info_requests, :incoming_messages before(:each) do @im = incoming_messages(:useless_incoming_message) @@ -26,6 +26,18 @@ describe IncomingMessage, " when dealing with incoming mail" do end end + it "should fold multiline sections" do + { + "foo\n--------\nconfidential" => "foo\nFOLDED_QUOTED_SECTION\n", # basic test + "foo\n--------\nbar - confidential" => "foo\nFOLDED_QUOTED_SECTION\n", # allow scorechar inside folded section + "foo\n--------\nbar\n--------\nconfidential" => "foo\n--------\nbar\nFOLDED_QUOTED_SECTION\n", # don't assume that anything after a score is a folded section + "foo\n--------\nbar\n--------\nconfidential\n--------\nrest" => "foo\n--------\nbar\nFOLDED_QUOTED_SECTION\nrest", # don't assume that a folded section continues to the end of the message + "foo\n--------\nbar\n- - - - - - - -\nconfidential\n--------\nrest" => "foo\n--------\nbar\nFOLDED_QUOTED_SECTION\nrest", # allow spaces in the score + }.each do |input,output| + IncomingMessage.remove_quoted_sections(input).should == output + end + end + end describe IncomingMessage, "when parsing HTML mail" do @@ -148,7 +160,7 @@ describe IncomingMessage, " checking validity to reply to" do end describe IncomingMessage, " checking validity to reply to with real emails" do - fixtures :incoming_messages, :raw_emails, :public_bodies, :public_body_translations, :info_requests, :users + fixtures :users, :raw_emails, :public_bodies, :public_body_translations, :info_requests, :incoming_messages after(:all) do ActionMailer::Base.deliveries.clear @@ -172,7 +184,7 @@ describe IncomingMessage, " checking validity to reply to with real emails" do end describe IncomingMessage, " when censoring data" do - fixtures :incoming_messages, :raw_emails, :public_bodies, :public_body_translations, :info_requests, :users + fixtures :users, :raw_emails, :public_bodies, :public_body_translations, :info_requests, :incoming_messages before(:each) do @test_data = "There was a mouse called Stilton, he wished that he was blue." @@ -282,7 +294,7 @@ describe IncomingMessage, " when censoring data" do end describe IncomingMessage, " when censoring whole users" do - fixtures :incoming_messages, :raw_emails, :public_bodies, :public_body_translations, :info_requests, :users + fixtures :users, :raw_emails, :public_bodies, :public_body_translations, :info_requests, :incoming_messages before(:each) do @test_data = "There was a mouse called Stilton, he wished that he was blue." |