Merge pull request #1216 from GitbookIO/fix/ignore

Fix #1215: fix ignore rules not working
This commit is contained in:
Samy Pessé
2016-04-08 15:48:33 +02:00
3 changed files with 39 additions and 0 deletions
+5
View File
@@ -37,6 +37,11 @@ function Output(book, opts, parent) {
// Files to ignore in output
this.ignore = Ignore();
// Hack to inherits from rules of the book:
// Waiting for https://github.com/kaelzhang/node-ignore/pull/19 to be merged
this.ignore._rules = this.ignore._rules.concat(this.book.ignore._rules);
this.ignore._cache = {};
}
// Default name for generator
+1
View File
@@ -19,6 +19,7 @@ require('./git');
require('./plugins');
require('./template');
require('./conrefs');
require('./ignore');
// Page and HTML generation
require('./page');
+33
View File
@@ -0,0 +1,33 @@
var mock = require('./mock');
var WebsiteOutput = require('../lib/output/website');
describe('Ignore', function() {
var output;
before(function() {
return mock.outputDefaultBook(WebsiteOutput, {
'.ignore': 'test-1.js',
'.gitignore': 'test-2.js\ntest-3.js',
'.bookignore': '!test-3.js',
'test-1.js': '1',
'test-2.js': '2',
'test-3.js': '3'
})
.then(function(_output) {
output = _output;
});
});
it('should load rules from .ignore', function() {
output.should.not.have.file('test-1.js');
});
it('should load rules from .gitignore', function() {
output.should.not.have.file('test-2.js');
});
it('should load rules from .bookignore', function() {
output.should.have.file('test-3.js');
});
});