From 09043c25caa2c655be075a227fea0c337faae633 Mon Sep 17 00:00:00 2001
From: Joshua Pan <joshuapan8@gmail.com>
Date: Tue, 18 Jul 2017 11:24:18 -0700
Subject: [PATCH] markdown.js: Move markdown.js test to bugdown-data.json.

---
 frontend_tests/node_tests/markdown.js | 2 --
 zerver/fixtures/bugdown-data.json     | 6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend_tests/node_tests/markdown.js b/frontend_tests/node_tests/markdown.js
index cfc4f7e5d4..d6fd64f55d 100644
--- a/frontend_tests/node_tests/markdown.js
+++ b/frontend_tests/node_tests/markdown.js
@@ -240,8 +240,6 @@ var bugdown_data = JSON.parse(fs.readFileSync(path.join(__dirname, '../../zerver
           expected: '<p>T<br>\n<span class="user-mention" data-user-id="101">@Cordelia Lear</span></p>'},
         {input: 'This is a realm filter `hello` with text after it',
          expected: '<p>This is a realm filter <code>hello</code> with text after it</p>'},
-        {input: '```quote\n# line 1\n# line 2\n```',
-         expected: '<blockquote>\n<p># line 1<br>\n# line 2</p>\n</blockquote>'},
     ];
 
     // We remove one of the unicode emoji we put as input in one of the test
diff --git a/zerver/fixtures/bugdown-data.json b/zerver/fixtures/bugdown-data.json
index 13b74e6905..96e695f97f 100644
--- a/zerver/fixtures/bugdown-data.json
+++ b/zerver/fixtures/bugdown-data.json
@@ -54,6 +54,12 @@
       "expected_output": "<p>I heard about this second hand...</p>\n<blockquote>\n<p>He said:</p>\n<blockquote>\n<p>The customer is complaining.</p>\n<p>They looked at this code:</p>\n<div class=\"codehilite\"><pre><span></span>def hello(): print &#39;hello\n</pre></div>\n\n\n<p>They would prefer:</p>\n</blockquote>\n<p>def hello()<br>\n  puts 'hello'<br>\nend</p>\n</blockquote>\n<p>Please advise.</p>\n<div class=\"codehilite\"><pre><span></span>She said:\n~~~ quote\nJust send them this:\n```\necho &quot;hello\n&quot;\n```\n</pre></div>",
       "bugdown_matches_marked": false
     },
+    {
+      "name": "fenced_quote_with_hashtag",
+      "input": "```quote\n# line 1\n# line 2\n```",
+      "expected_output": "<blockquote>\n<p># line 1<br>\n# line 2</p>\n</blockquote>",
+      "bugdown_matches_marked": true
+    },
     {
       "name": "dangerous_block",
       "input": "xxxxxx xxxxx xxxxxxxx xxxx. x xxxx xxxxxxxxxx:\n\n```\"xxxx xxxx\\xxxxx\\xxxxxx\"```\n\nxxx xxxx xxxxx:```xx.xxxxxxx(x'^xxxx$', xx.xxxxxxxxx)```\n\nxxxxxxx'x xxxx xxxxxxxxxx ```'xxxx'```, xxxxx xxxxxxxxx xxxxx ^ xxx $ xxxxxx xxxxx xxxxxxxxxxxx xxx xxxx xx x xxxx xx xxxx xx xxx xxxxx xxxxxx?",