Skip to content

Commit 59dea98

Browse files
Add log_server_port to context in dev.
1 parent 884fd8a commit 59dea98

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

lib/server.js

+1
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ var SolidusServer = function( options ){
135135
};
136136
if( options.dev ){
137137
locals.livereload_port = options.livereload_port;
138+
locals.log_server_port = options.log_server_port;
138139
}
139140
router.locals(locals);
140141

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "solidus",
3-
"version": "0.2.0",
3+
"version": "0.2.1",
44
"bugs": {
55
"url": "https://github.com/solidusjs/solidus/issues"
66
},

test/solidus.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -834,6 +834,7 @@ describe( 'Solidus', function(){
834834
beforeEach(function(done) {
835835
process.chdir(site1_path);
836836
solidus_server = solidus.start({
837+
dev: true,
837838
log_level: 0,
838839
port: 9009,
839840
log_server_port: 12345,
@@ -850,7 +851,9 @@ describe( 'Solidus', function(){
850851
var socket = require('socket.io-client')('http://localhost:12345');
851852
socket.on('connect', function() {
852853
// Our web socket client is connected, make a Solidus request then close the server
853-
request(solidus_server.router).get('/helpers').end(function() {
854+
request(solidus_server.router).get('/helpers.json').end(function(err, res) {
855+
if (err) throw err;
856+
assert.equal(12345, res.body.log_server_port);
854857
solidus_server.stop();
855858
});
856859
});
@@ -864,7 +867,7 @@ describe( 'Solidus', function(){
864867
socket.on('disconnect', function() {
865868
// The log server was closed, we're done
866869
assert.equal(3, last_message.level);
867-
assert(/\/helpers served in \d+ms/.test(last_message.message));
870+
assert(/\/helpers preprocessed in \d+ms/.test(last_message.message));
868871
done();
869872
});
870873
});

0 commit comments

Comments
 (0)