X Tutup
Skip to content

Commit 9d42b52

Browse files
chore(doc-gen): add spaces when removing linebreaks for Jade _data.json files
Closes angular#3623 Closes angular#3997
1 parent 34b91c6 commit 9d42b52

File tree

3 files changed

+44
-1
lines changed

3 files changed

+44
-1
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
var Package = require('dgeni').Package;
2+
3+
module.exports = function mockPackage() {
4+
5+
return new Package('mockPackage', [require('../')])
6+
7+
.factory('log', function() { return require('dgeni/lib/mocks/log')(false); })
8+
};

docs/angular.io-package/processors/addJadeDataDocsProcessor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ module.exports = function addJadeDataDocsProcessor() {
4444
title: _.map(path.basename(doc.fileInfo.baseName).split('_'), function(part) {
4545
return titleCase(part);
4646
}).join(' '),
47-
intro: doc.description.replace('"', '\"').replace(/\r?\n|\r/g,"")
47+
intro: doc.description.replace('"', '\"').replace(/\s*(\r?\n|\r)\s*/g," ")
4848
}];
4949

5050
// GET DATA FOR EACH PAGE (CLASS, VARS, FUNCTIONS)
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
var mockPackage = require('../mocks/mockPackage');
2+
var Dgeni = require('dgeni');
3+
4+
describe('addJadeDataDocsProcessor', function() {
5+
var dgeni, injector, processor;
6+
7+
beforeEach(function() {
8+
dgeni = new Dgeni([mockPackage()]);
9+
injector = dgeni.configureInjector();
10+
processor = injector.get('addJadeDataDocsProcessor');
11+
});
12+
13+
it('should add a doc for each module', function() {
14+
var docs = [
15+
{
16+
docType: 'module',
17+
id: 'someModule',
18+
exports: [{ name: 'MyClass', docType: 'class'}],
19+
fileInfo: { baseName: 'x_y' },
20+
description: 'some description\nsecond line'
21+
}
22+
];
23+
docs = processor.$process(docs);
24+
25+
expect(docs[1]).toEqual({
26+
id : 'someModule-data',
27+
aliases : [ 'someModule-data' ],
28+
docType : 'jade-data',
29+
originalDoc : docs[0],
30+
data : [
31+
{ name : 'index', title : 'X Y', intro : 'some description second line' },
32+
{ name : 'MyClass-class', title : 'MyClass', varType : undefined }
33+
] });
34+
});
35+
});

0 commit comments

Comments
 (0)
X Tutup