diff --git a/.circleci/config.yml b/.circleci/config.yml
index 666a9564a..8a756b3de 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -64,6 +64,12 @@ jobs:
- run:
name: Test - Mustache Spans
command: npm run test:mustache-syntax
+ - run:
+ name: Test - Definition Lists
+ command: npm run test:definition-lists
+ - run:
+ name: Test - Variables
+ command: npm run test:variables
- run:
name: Test - Routes
command: npm run test:route
diff --git a/package.json b/package.json
index 38440d38e..79e78931b 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
"test:mustache-syntax:inline": "jest '.*(mustache-syntax).*' -t '^Inline:.*' --verbose --noStackTrace",
"test:mustache-syntax:block": "jest '.*(mustache-syntax).*' -t '^Block:.*' --verbose --noStackTrace",
"test:mustache-syntax:injection": "jest '.*(mustache-syntax).*' -t '^Injection:.*' --verbose --noStackTrace",
- "test:marked-extensions": "jest tests/markdown/marked-extensions.test.js --verbose --noStackTrace",
+ "test:definition-lists": "jest tests/markdown/definition-lists.test.js --verbose --noStackTrace",
"test:route": "jest tests/routes/static-pages.test.js --verbose",
"phb": "node scripts/phb.js",
"prod": "set NODE_ENV=production && npm run build",
diff --git a/shared/naturalcrit/markdown.js b/shared/naturalcrit/markdown.js
index f82ec3c32..e38c31c3b 100644
--- a/shared/naturalcrit/markdown.js
+++ b/shared/naturalcrit/markdown.js
@@ -321,7 +321,7 @@ const definitionListsInline = {
renderer(token) {
return `
${token.definitions.reduce((html, def)=>{
return `${html}- ${this.parser.parseInline(def.dt)}
`
- + `- ${this.parser.parseInline(def.dd)}
`;
+ + `- ${this.parser.parseInline(def.dd)}
\n`;
}, '')}
`;
}
};
diff --git a/tests/markdown/marked-extensions.test.js b/tests/markdown/definition-lists.test.js
similarity index 93%
rename from tests/markdown/marked-extensions.test.js
rename to tests/markdown/definition-lists.test.js
index 8d6c3c1c4..ee7911729 100644
--- a/tests/markdown/marked-extensions.test.js
+++ b/tests/markdown/definition-lists.test.js
@@ -6,19 +6,19 @@ describe('Inline Definition Lists', ()=>{
test('No Term 1 Definition', function() {
const source = ':: My First Definition\n\n';
const rendered = Markdown.render(source).trim();
- expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('- My First Definition
');
+ expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('- My First Definition
\n
');
});
test('Single Definition Term', function() {
const source = 'My term :: My First Definition\n\n';
const rendered = Markdown.render(source).trim();
- expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('- My term
- My First Definition
');
+ expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('- My term
- My First Definition
\n
');
});
test('Multiple Definition Terms', function() {
const source = 'Term 1::Definition of Term 1\nTerm 2::Definition of Term 2\n\n';
const rendered = Markdown.render(source).trim();
- expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('- Term 1
- Definition of Term 1
- Term 2
- Definition of Term 2
');
+ expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('- Term 1
- Definition of Term 1
\n- Term 2
- Definition of Term 2
\n
');
});
});
@@ -68,7 +68,7 @@ describe('Multiline Definition Lists', ()=>{
test('Multiple Term, Single multi-line definition, followed by an inline dl', function() {
const source = 'Term 1\n::Definition 1\nand more and more\n\nTerm 2\n::Definition 1\n::Definition 2\n\n::Inline Definition (no term)';
const rendered = Markdown.render(source).trim();
- expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('- Term 1
\n- Definition 1 and more and more
\n- Term 2
\n- Definition 1
\n- Definition 2
- Inline Definition (no term)
');
+ expect(rendered, `Input:\n${source}`, { showPrefix: false }).toBe('- Term 1
\n- Definition 1 and more and more
\n- Term 2
\n- Definition 1
\n- Definition 2
- Inline Definition (no term)
\n
');
});
test('Multiple Term, Single multi-line definition, followed by paragraph', function() {