archive-gh-me/thinkjs
1
0
Fork 0
mirror of https://github.com/thinkjs/thinkjs.git synced 2026-01-25 14:42:47 +00:00
Code Issues Projects Releases Wiki Activity

add render method for controller, alias of display

Browse Source
This commit is contained in:
lichengyin 2016-01-05 09:05:46 +08:00
parent eb81d7e78e
commit fef8765325
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/controller/base.js
View File

@ -234,6 +234,16 @@ export default class extends think.http.base {
this._baseAssign();
return this.view().display(templateFile, charset, contentType);
}
/**
* alias of display
* @param {String} templateFile [template filepath]
* @param {String} charset [content encoding]
* @param {String} contentType [content type]
* @return {Promise} []
*/
render(templateFile, charset, contentType){
return this.display(templateFile, charset, contentType);
}
/**
* output with jsonp
* @param {Object} data [output data]

11
test/controller/base.js
View File

@ -423,6 +423,17 @@ describe('controller/base.js', function(){
done();
})
})
it('render', function(done){
muk(think, 'log', function(){})
getInstance({
}).then(function(instance){
return instance.render(__filename)
}).catch(function(err){
assert.equal(think.isPrevent(err), true);
muk.restore();
done();
})
})
it('download', function(done){
getInstance({
header: function(type, value){