IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Broken JS tests

Browse Source
This commit is contained in:
Robin Ward 2018-04-02 14:18:10 -04:00
parent 58c81db279
commit 895bca5f5b
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/javascripts/lib/pretty-text-test.js.es6
View File

@ -235,7 +235,7 @@ QUnit.test("Quotes", assert => {
assert.cookedOptions("[quote=\"eviltrout, post: 1\"]\na quote\n\nsecond line\n\nthird line\n[/quote]", assert.cookedOptions("[quote=\"eviltrout, post: 1\"]\na quote\n\nsecond line\n\nthird line\n[/quote]",
{ topicId: 2 }, { topicId: 2 },
`<aside class=\"quote\" data-post=\"1\"> `<aside class=\"quote no-group\" data-post=\"1\">
<div class=\"title\"> <div class=\"title\">
<div class=\"quote-controls\"></div> <div class=\"quote-controls\"></div>
eviltrout:</div> eviltrout:</div>
@ -249,7 +249,7 @@ QUnit.test("Quotes", assert => {
assert.cookedOptions("[quote=\"bob, post:1\"]\nmy quote\n[/quote]", assert.cookedOptions("[quote=\"bob, post:1\"]\nmy quote\n[/quote]",
{ topicId: 2, lookupAvatar: function() { } }, { topicId: 2, lookupAvatar: function() { } },
`<aside class=\"quote\" data-post=\"1\"> `<aside class=\"quote no-group\" data-post=\"1\">
<div class=\"title\"> <div class=\"title\">
<div class=\"quote-controls\"></div> <div class=\"quote-controls\"></div>
bob:</div> bob:</div>
@ -260,10 +260,10 @@ QUnit.test("Quotes", assert => {
"includes no avatar if none is found"); "includes no avatar if none is found");
assert.cooked(`[quote]\na\n\n[quote]\nb\n[/quote]\n[/quote]`, assert.cooked(`[quote]\na\n\n[quote]\nb\n[/quote]\n[/quote]`,
`<aside class=\"quote\"> `<aside class=\"quote no-group\">
<blockquote> <blockquote>
<p>a</p> <p>a</p>
<aside class=\"quote\"> <aside class=\"quote no-group\">
<blockquote> <blockquote>
<p>b</p> <p>b</p>
</blockquote> </blockquote>
@ -722,22 +722,22 @@ QUnit.test("quotes", assert => {
"it escapes the contents of the quote"); "it escapes the contents of the quote");
assert.cooked("[quote]\ntest\n[/quote]", assert.cooked("[quote]\ntest\n[/quote]",
"<aside class=\"quote\">\n<blockquote>\n<p>test</p>\n</blockquote>\n</aside>", "<aside class=\"quote no-group\">\n<blockquote>\n<p>test</p>\n</blockquote>\n</aside>",
"it supports quotes without params"); "it supports quotes without params");
assert.cooked("[quote]\n*test*\n[/quote]", assert.cooked("[quote]\n*test*\n[/quote]",
"<aside class=\"quote\">\n<blockquote>\n<p><em>test</em></p>\n</blockquote>\n</aside>", "<aside class=\"quote no-group\">\n<blockquote>\n<p><em>test</em></p>\n</blockquote>\n</aside>",
"it doesn't insert a new line for italics"); "it doesn't insert a new line for italics");
assert.cooked("[quote=,script='a'><script>alert('test');//':a]\n[/quote]", assert.cooked("[quote=,script='a'><script>alert('test');//':a]\n[/quote]",
"<aside class=\"quote\">\n<blockquote></blockquote>\n</aside>", "<aside class=\"quote no-group\">\n<blockquote></blockquote>\n</aside>",
"It will not create a script tag within an attribute"); "It will not create a script tag within an attribute");
}); });
QUnit.test("quote formatting", assert => { QUnit.test("quote formatting", assert => {
assert.cooked("[quote=\"EvilTrout, post:123, topic:456, full:true\"]\n[sam]\n[/quote]", assert.cooked("[quote=\"EvilTrout, post:123, topic:456, full:true\"]\n[sam]\n[/quote]",
`<aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\"> `<aside class=\"quote no-group\" data-post=\"123\" data-topic=\"456\" data-full=\"true\">
<div class=\"title\"> <div class=\"title\">
<div class=\"quote-controls\"></div> <div class=\"quote-controls\"></div>
EvilTrout:</div> EvilTrout:</div>
@ -748,7 +748,7 @@ QUnit.test("quote formatting", assert => {
"it allows quotes with [] inside"); "it allows quotes with [] inside");
assert.cooked("[quote=\"eviltrout, post:1, topic:1\"]\nabc\n[/quote]", assert.cooked("[quote=\"eviltrout, post:1, topic:1\"]\nabc\n[/quote]",
`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\"> `<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
<div class=\"title\"> <div class=\"title\">
<div class=\"quote-controls\"></div> <div class=\"quote-controls\"></div>
eviltrout:</div> eviltrout:</div>
@ -759,7 +759,7 @@ QUnit.test("quote formatting", assert => {
"renders quotes properly"); "renders quotes properly");
assert.cooked("[quote=\"eviltrout, post:1, topic:1\"]\nabc\n[/quote]\nhello", assert.cooked("[quote=\"eviltrout, post:1, topic:1\"]\nabc\n[/quote]\nhello",
`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\"> `<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
<div class=\"title\"> <div class=\"title\">
<div class=\"quote-controls\"></div> <div class=\"quote-controls\"></div>
eviltrout:</div> eviltrout:</div>
@ -771,12 +771,12 @@ QUnit.test("quote formatting", assert => {
"handles new lines properly"); "handles new lines properly");
assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n[quote=\"Bob, post:2, topic:1\"]\n[/quote]\n[/quote]", assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n[quote=\"Bob, post:2, topic:1\"]\n[/quote]\n[/quote]",
`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\"> `<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
<div class=\"title\"> <div class=\"title\">
<div class=\"quote-controls\"></div> <div class=\"quote-controls\"></div>
Alice:</div> Alice:</div>
<blockquote> <blockquote>
<aside class=\"quote\" data-post=\"2\" data-topic=\"1\"> <aside class=\"quote no-group\" data-post=\"2\" data-topic=\"1\">
<div class=\"title\"> <div class=\"title\">
<div class=\"quote-controls\"></div> <div class=\"quote-controls\"></div>
Bob:</div> Bob:</div>
@ -788,7 +788,7 @@ QUnit.test("quote formatting", assert => {
assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n[quote=\"Bob, post:2, topic:1\"]\n[/quote]", assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n[quote=\"Bob, post:2, topic:1\"]\n[/quote]",
`<p>[quote=&quot;Alice, post:1, topic:1&quot;]</p> `<p>[quote=&quot;Alice, post:1, topic:1&quot;]</p>
<aside class=\"quote\" data-post=\"2\" data-topic=\"1\"> <aside class=\"quote no-group\" data-post=\"2\" data-topic=\"1\">
<div class=\"title\"> <div class=\"title\">
<div class=\"quote-controls\"></div> <div class=\"quote-controls\"></div>
Bob:</div> Bob:</div>
@ -798,7 +798,7 @@ QUnit.test("quote formatting", assert => {
"handles mismatched nested quote tags (non greedy)"); "handles mismatched nested quote tags (non greedy)");
assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n```javascript\nvar foo ='foo';\nvar bar = 'bar';\n```\n[/quote]", assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n```javascript\nvar foo ='foo';\nvar bar = 'bar';\n```\n[/quote]",
`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\"> `<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
<div class=\"title\"> <div class=\"title\">
<div class=\"quote-controls\"></div> <div class=\"quote-controls\"></div>
Alice:</div> Alice:</div>
@ -811,7 +811,7 @@ var bar = 'bar';
"quotes can have code blocks without leading newline"); "quotes can have code blocks without leading newline");
assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n\n```javascript\nvar foo ='foo';\nvar bar = 'bar';\n```\n[/quote]", assert.cooked("[quote=\"Alice, post:1, topic:1\"]\n\n```javascript\nvar foo ='foo';\nvar bar = 'bar';\n```\n[/quote]",
`<aside class=\"quote\" data-post=\"1\" data-topic=\"1\"> `<aside class=\"quote no-group\" data-post=\"1\" data-topic=\"1\">
<div class=\"title\"> <div class=\"title\">
<div class=\"quote-controls\"></div> <div class=\"quote-controls\"></div>
Alice:</div> Alice:</div>
@ -827,7 +827,7 @@ var bar = 'bar';
QUnit.test("quotes with trailing formatting", assert => { QUnit.test("quotes with trailing formatting", assert => {
const result = new PrettyText(defaultOpts).cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]\nhello\n[/quote]\n*Test*"); const result = new PrettyText(defaultOpts).cook("[quote=\"EvilTrout, post:123, topic:456, full:true\"]\nhello\n[/quote]\n*Test*");
assert.equal(result, assert.equal(result,
`<aside class=\"quote\" data-post=\"123\" data-topic=\"456\" data-full=\"true\"> `<aside class=\"quote no-group\" data-post=\"123\" data-topic=\"456\" data-full=\"true\">
<div class=\"title\"> <div class=\"title\">
<div class=\"quote-controls\"></div> <div class=\"quote-controls\"></div>
EvilTrout:</div> EvilTrout:</div>