Skip to content

Commit

Permalink
Modified the order of middlewares. Fixed hexojs/hexo#1032
Browse files Browse the repository at this point in the history
  • Loading branch information
tommy351 committed Feb 5, 2015
1 parent 05f03b1 commit f0ada33
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
6 changes: 3 additions & 3 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ hexo.extend.console.register('server', 'Start the server.', {
]
}, require('./lib/server'));

hexo.extend.filter.register('server_middleware', require('./lib/middlewares/logger'));
hexo.extend.filter.register('server_middleware', require('./lib/middlewares/header'));
hexo.extend.filter.register('server_middleware', require('./lib/middlewares/gzip'));
hexo.extend.filter.register('server_middleware', require('./lib/middlewares/logger'));
hexo.extend.filter.register('server_middleware', require('./lib/middlewares/route'));
hexo.extend.filter.register('server_middleware', require('./lib/middlewares/static'));
hexo.extend.filter.register('server_middleware', require('./lib/middlewares/redirect'));
hexo.extend.filter.register('server_middleware', require('./lib/middlewares/gzip'));
hexo.extend.filter.register('server_middleware', require('./lib/middlewares/redirect'));
12 changes: 10 additions & 2 deletions test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ describe('server', function(){
});

// Register middlewares
hexo.extend.filter.register('server_middleware', require('../lib/middlewares/logger'));
hexo.extend.filter.register('server_middleware', require('../lib/middlewares/header'));
hexo.extend.filter.register('server_middleware', require('../lib/middlewares/gzip'));
hexo.extend.filter.register('server_middleware', require('../lib/middlewares/logger'));
hexo.extend.filter.register('server_middleware', require('../lib/middlewares/route'));
hexo.extend.filter.register('server_middleware', require('../lib/middlewares/static'));
hexo.extend.filter.register('server_middleware', require('../lib/middlewares/redirect'));
hexo.extend.filter.register('server_middleware', require('../lib/middlewares/gzip'));

before(function(){
return Promise.all([
Expand Down Expand Up @@ -81,6 +81,14 @@ describe('server', function(){
});
});

it('Gzip', function(done){
server({}).then(function(app){
request('http://localhost:4000').get('/')
.expect('Content-Encoding', 'gzip')
.end(stopServer(app, done));
});
});

it('static asset', function(done){
fs.writeFile(pathFn.join(hexo.public_dir, 'test.html'), 'test html').then(function(){
server({}).then(function(app){
Expand Down

0 comments on commit f0ada33

Please sign in to comment.