aboutsummaryrefslogtreecommitdiffstats
path: root/spec/models
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2014-01-27 12:13:35 +0000
committerLouise Crow <louise.crow@gmail.com>2014-01-27 12:13:35 +0000
commit46d9ea69a421a5065e282a102c3a1f2b2e2fcd2b (patch)
tree0a8987d48f31a32f4aa89a6b300a13a355b101a5 /spec/models
parentd10ab0836196d4e9a6e49529f838f1b1488950b7 (diff)
parent6dc2c6fde65b6f521e5b9e18b0cbeb33a7e156c5 (diff)
Merge branch 'feature/1269-improve-quoting-recognition' into rails-3-develop
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/incoming_message_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb
index c0a7e5340..c27870afc 100644
--- a/spec/models/incoming_message_spec.rb
+++ b/spec/models/incoming_message_spec.rb
@@ -165,7 +165,7 @@ describe IncomingMessage, " when dealing with incoming mail" do
message = File.read(file)
parsed = IncomingMessage.remove_quoted_sections(message)
expected = File.read("#{file}.expected")
- parsed.should include(expected)
+ parsed.should be_equal_modulo_whitespace_to expected
end
end
@@ -462,7 +462,7 @@ describe IncomingMessage, " when censoring data" do
data.should == "His email was x\000x\000x\000@\000x\000x\000x\000.\000x\000x\000x\000, indeed"
end
- it 'should handle multibyte characters correctly', :focus => true do
+ it 'should handle multibyte characters correctly' do
orig_data = 'á'
data = orig_data.dup
@regex_censor_rule = CensorRule.new()