summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/books/conrefs/README.md3
-rw-r--r--test/books/conrefs/block.md1
-rw-r--r--test/conrefs.js42
-rw-r--r--test/helper.js38
-rw-r--r--test/plugins.js47
5 files changed, 88 insertions, 43 deletions
diff --git a/test/books/conrefs/README.md b/test/books/conrefs/README.md
index 804a77a..324ee1f 100644
--- a/test/books/conrefs/README.md
+++ b/test/books/conrefs/README.md
@@ -1,5 +1,8 @@
# Readme
+<p id="test-plugin-block-shortcuts-1">$$test_block1$$</p>
+<p id="test-plugin-block-shortcuts-2">{% include "./block.md" %}</p>
+
### Relative
<p id="t1">{% include "./hello.md" %}</p>
diff --git a/test/books/conrefs/block.md b/test/books/conrefs/block.md
new file mode 100644
index 0000000..3910cb6
--- /dev/null
+++ b/test/books/conrefs/block.md
@@ -0,0 +1 @@
+$$test_block2$$
diff --git a/test/conrefs.js b/test/conrefs.js
index 4f654b0..32e4058 100644
--- a/test/conrefs.js
+++ b/test/conrefs.js
@@ -1,66 +1,66 @@
-var fs = require("fs");
-var path = require("path");
+var fs = require('fs');
+var path = require('path');
-describe("ConRefs", function () {
+describe('ConRefs', function () {
var book, readme;
before(function() {
- return books.generate("conrefs", "website")
+ return books.generate('conrefs', 'website')
.then(function(_book) {
book = _book;
readme = fs.readFileSync(
- path.join(book.options.output, "index.html"),
- { encoding: "utf-8" }
+ path.join(book.options.output, 'index.html'),
+ { encoding: 'utf-8' }
);
});
});
- it("should handle local references", function() {
+ it('should handle local references', function() {
readme.should.be.html({
- ".page-inner p#t1": {
+ '.page-inner p#t1': {
count: 1,
- text: "Hello World",
+ text: 'Hello World',
trim: true
}
});
});
- it("should handle local references with absolute paths", function() {
+ it('should handle local references with absolute paths', function() {
readme.should.be.html({
- ".page-inner p#t2": {
+ '.page-inner p#t2': {
count: 1,
- text: "Hello World",
+ text: 'Hello World',
trim: true
}
});
});
- it("should correctly include file from git reference", function() {
+ it('should correctly include file from git reference', function() {
readme.should.be.html({
- ".page-inner p#t3": {
+ '.page-inner p#t3': {
count: 1,
- text: "Hello from git",
+ text: 'Hello from git',
trim: true
}
});
});
- it("should correctly handle deep include in git reference", function() {
+ it('should correctly handle deep include in git reference', function() {
readme.should.be.html({
- ".page-inner p#t4": {
+ '.page-inner p#t4': {
count: 1,
- text: "First Hello. Hello from git",
+ text: 'First Hello. Hello from git',
trim: true
}
});
});
- it("should correctly handle absolute include in git reference", function() {
+ it('should correctly handle absolute include in git reference', function() {
readme.should.be.html({
- ".page-inner p#t5": {
+ '.page-inner p#t5': {
count: 1,
- text: "First Hello. Hello from git",
+ text: 'First Hello. Hello from git',
trim: true
}
});
diff --git a/test/helper.js b/test/helper.js
index 95619df..bbe82de 100644
--- a/test/helper.js
+++ b/test/helper.js
@@ -1,13 +1,13 @@
-var os = require("os");
-var path = require("path");
-var Q = require("q");
-var _ = require("lodash");
+var os = require('os');
+var path = require('path');
+var Q = require('q');
+var _ = require('lodash');
-var fsUtil = require("../lib/utils/fs");
-var Book = require("../").Book;
-var LOG_LEVELS = require("../").LOG_LEVELS;
+var fsUtil = require('../lib/utils/fs');
+var Book = require('../').Book;
+var LOG_LEVELS = require('../').LOG_LEVELS;
-require("./assertions");
+require('./assertions');
var BOOKS = {};
@@ -20,7 +20,7 @@ function generateBook(bookId, test, opts) {
prepare: function() {}
});
- return parseBook(bookId, test)
+ return parseBook(bookId, test, opts)
.then(function(book) {
return Q(opts.prepare(book))
@@ -32,21 +32,27 @@ function generateBook(bookId, test, opts) {
}
// Generate and return a book
-function parseBook(bookId, test) {
- test = test || "website";
+function parseBook(bookId, test, opts) {
+ opts = _.defaults(opts || {}, {
+ testId: ''
+ });
+
+ test = test || 'website';
+ var testId = [test, opts.testId].join('-');
+
BOOKS[bookId] = BOOKS[bookId] || {};
- if (BOOKS[bookId][test]) return Q(BOOKS[bookId][test]);
+ if (BOOKS[bookId][testId]) return Q(BOOKS[bookId][testId]);
- BOOKS[bookId][test] = new Book(path.resolve(__dirname, "books", bookId), {
+ BOOKS[bookId][testId] = new Book(path.resolve(__dirname, 'books', bookId), {
logLevel: LOG_LEVELS.DISABLED,
config: {
- output: path.resolve(TMPDIR, bookId+"-"+test)
+ output: path.resolve(TMPDIR, bookId+'-'+testId)
}
});
- return BOOKS[bookId][test].parse()
+ return BOOKS[bookId][testId].parse()
.then(function() {
- return BOOKS[bookId][test];
+ return BOOKS[bookId][testId];
});
}
diff --git a/test/plugins.js b/test/plugins.js
index db2d225..1600d0d 100644
--- a/test/plugins.js
+++ b/test/plugins.js
@@ -1,4 +1,5 @@
var _ = require('lodash');
+var fs = require('fs');
var should = require('should');
var path = require('path');
@@ -193,15 +194,49 @@ describe('Plugins', function () {
});
});
- it('should correctly accept shortcuts', function() {
- return testTpl('$$hello$$', {}, {
- type: 'markdown'
- })
- .then(function(content) {
- content.should.equal('testhellotest');
+ describe('Shortcuts', function() {
+ it('should correctly accept shortcuts', function() {
+ return testTpl('$$hello$$', {}, {
+ type: 'markdown'
+ })
+ .then(function(content) {
+ content.should.equal('testhellotest');
+ });
+ });
+
+ it('should correctly apply shortcuts to included file', function() {
+ return books.generate('conrefs', 'website', {
+ testId: 'include-plugins',
+ prepare: function(bookConref) {
+ plugin = new Plugin(bookConref, 'blocks');
+ plugin.load('./blocks', PLUGINS_ROOT);
+
+ return bookConref.plugins.load(plugin);
+ }
+ })
+ .then(function(bookConref) {
+ var readme = fs.readFileSync(
+ path.join(bookConref.options.output, 'index.html'),
+ { encoding: 'utf-8' }
+ );
+
+ readme.should.be.html({
+ '.page-inner p#test-plugin-block-shortcuts-1': {
+ count: 1,
+ text: 'testtest_block1test',
+ trim: true
+ },
+ '.page-inner p#test-plugin-block-shortcuts-2': {
+ count: 1,
+ text: 'testtest_block2test',
+ trim: true
+ }
+ });
+ });
});
});
+
it('should correctly extend template blocks with defined end', function() {
return testTpl('{% test2 %}hello{% endtest2end %}')
.then(function(content) {