summaryrefslogtreecommitdiff
path: root/spec/helpers
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2012-09-13 15:20:00 -0400
committerRobert Speicher <rspeicher@gmail.com>2012-09-13 15:20:00 -0400
commitd993f666423744d213d7cce063b48e71fa751d43 (patch)
treed42343e4eded7ca22e545e291dc8b637dbcda061 /spec/helpers
parent85def2d62500afdab39956f0bd987340889894c4 (diff)
downloadgitlab-ce-d993f666423744d213d7cce063b48e71fa751d43.tar.gz
Fix HTML entities being parsed in GFM
Also fixes the spec so that it actually tests the thing it says it's testing. Hooray! Closes #1308
Diffstat (limited to 'spec/helpers')
-rw-r--r--spec/helpers/gitlab_markdown_helper_spec.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb
index 4dd3802a5c1..0af331424f5 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
@@ -31,6 +31,7 @@ describe GitlabMarkdownHelper do
end
it "should not touch HTML entities" do
+ @project.issues.stub(:where).with(id: '39').and_return([issue])
actual = expected = "We&#39;ll accept good pull requests."
gfm(actual).should == expected
end