Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRaphael Sofaer <raphael@joindiaspora.com>2011-07-18 05:12:20 +0400
committerRaphael Sofaer <raphael@joindiaspora.com>2011-07-18 05:12:20 +0400
commitd30228abb83a5947ff178e7284d32941090ef7e7 (patch)
tree9453eb7cd6b66a183cf07df3d4878afa5787950e /spec
parent6a11784a2efc0db79f0b2f9c031aa9c4fc641231 (diff)
parentd4257f4a68c2c5603711ce440c4e2099343d90f7 (diff)
Merge remote branch 'untitaker/1589-remove-unicode-smileys'
Diffstat (limited to 'spec')
-rw-r--r--spec/helpers/markdownify_helper_spec.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/helpers/markdownify_helper_spec.rb b/spec/helpers/markdownify_helper_spec.rb
index b9feb7fd0..1e036aa8d 100644
--- a/spec/helpers/markdownify_helper_spec.rb
+++ b/spec/helpers/markdownify_helper_spec.rb
@@ -150,20 +150,20 @@ describe MarkdownifyHelper do
end
end
- describe "emoticons" do
+ describe "specialchars" do
it "replaces &lt;3 with &hearts;" do
message = "i <3 you"
markdownify(message).should == "i &hearts; you"
end
it "replaces various things with (their) HTML entities" do
- message = ":) :-) :( :-( ... <-> -> <- (tm) (r) (c)"
- markdownify(message).should == "&#9786; &#9786; &#9785; &#9785; &hellip; &#8596; &rarr; &larr; &trade; &reg; &copy;"
+ message = "... <-> -> <- (tm) (r) (c)"
+ markdownify(message).should == "&hellip; &#8596; &rarr; &larr; &trade; &reg; &copy;"
end
it "skips doing it if you say so" do
- message = ":) :-) :( :-( ... -> <-"
- markdownify(message, :emoticons => false).should == ":) :-) :( :-( ... -&gt; &lt;-"
+ message = "... -> <-"
+ markdownify(message, :specialchars => false).should == "... -&gt; &lt;-"
end
end
@@ -263,4 +263,4 @@ describe MarkdownifyHelper do
end
end
end
-end
+end \ No newline at end of file