Skip to content

Commit

Permalink
deps: update example dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
dougwilson committed Jun 10, 2014
1 parent 898dcfa commit 3205f68
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 7 deletions.
10 changes: 5 additions & 5 deletions examples/vhost/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ edit /etc/hosts:

var main = express();

main.use(logger('dev'));
if (!module.parent) main.use(logger('dev'));

main.get('/', function(req, res){
res.send('Hello from main app!');
Expand All @@ -32,14 +32,14 @@ main.get('/:sub', function(req, res){

var redirect = express();

redirect.all('*', function(req, res){
console.log(req.subdomains);
res.redirect('http://example.com:3000/' + req.subdomains[0]);
redirect.use(function(req, res){
if (!module.parent) console.log(req.vhost);
res.redirect('http://example.com:3000/' + req.vhost[0]);
});

// Vhost app

var app = express();
var app = module.exports = express();

app.use(vhost('*.example.com', redirect)); // Serves all subdomains via Redirect app
app.use(vhost('example.com', main)); // Serves top level domain via Main server app
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@
"body-parser": "1.3.0",
"cookie-parser": "1.1.0",
"express-session": "1.2.1",
"method-override": "2.0.1",
"method-override": "2.0.2",
"morgan": "1.1.1",
"vhost": "1.0.0"
"vhost": "2.0.0"
},
"engines": {
"node": ">= 0.10.0"
Expand Down
46 changes: 46 additions & 0 deletions test/acceptance/vhost.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
var app = require('../../examples/vhost')
var request = require('supertest')

describe('vhost', function(){
describe('example.com', function(){
describe('GET /', function(){
it('should say hello', function(done){
request(app)
.get('/')
.set('Host', 'example.com')
.expect(200, /hello/i, done)
})
})

describe('GET /foo', function(){
it('should say foo', function(done){
request(app)
.get('/foo')
.set('Host', 'example.com')
.expect(200, 'requested foo', done)
})
})
})

describe('foo.example.com', function(){
describe('GET /', function(){
it('should redirect to /foo', function(done){
request(app)
.get('/')
.set('Host', 'foo.example.com')
.expect(302, /Redirecting to http:\/\/example.com:3000\/foo/, done)
})
})
})

describe('bar.example.com', function(){
describe('GET /', function(){
it('should redirect to /bar', function(done){
request(app)
.get('/')
.set('Host', 'bar.example.com')
.expect(302, /Redirecting to http:\/\/example.com:3000\/bar/, done)
})
})
})
})

0 comments on commit 3205f68

Please sign in to comment.