Navigation Menu

Skip to content

Commit

Permalink
Fix tests around hostname
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Aug 15, 2012
1 parent 8b49677 commit aa1005e
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 37 deletions.
2 changes: 1 addition & 1 deletion test/api-search.test.js
Expand Up @@ -23,7 +23,7 @@ suite('Search API', function() {
function testSearch(path, message, host, callback) {
test('GET ' + path + ' ' + message, function(done) {
var options = {
host: utils.testBaseHost,
host: 'localhost',
port: utils.testPort,
path: path,
headers: {Host: host}
Expand Down
45 changes: 16 additions & 29 deletions test/dashboard.test.js
@@ -1,6 +1,5 @@
var utils = require('./test-utils');
var assert = require('chai').assert;
var http = require('http');
var fs = require('fs');

suite('dashboard', function() {
Expand All @@ -15,40 +14,28 @@ suite('dashboard', function() {
});

test('GET /', function(done) {
var options = {
host: utils.testBaseHost,
port: utils.testPort,
path: '/'
};
http.get(options, function(response) {
assert.equal(response.statusCode, 200);
var body = '';
response.on('data', function(data) {
body += data;
});
response.on('end', function() {
assert.match(body, /Groonga CloudSearch/);
utils
.get('/')
.next(function(response) {
assert.equal(response.statusCode, 200);
assert.match(response.body, /Groonga CloudSearch/);
done();
})
.error(function(error) {
done(error);
});
});
});

test('GET /javascripts/templates.js', function(done) {
var options = {
host: utils.testBaseHost,
port: utils.testPort,
path: '/javascripts/templates.js'
};
http.get(options, function(response) {
assert.equal(response.statusCode, 200);
var body = '';
response.on('data', function(data) {
body += data;
});
response.on('end', function() {
assert.include(body, "this.JST");
utils
.get('/javascripts/templates.js')
.next(function(response) {
assert.equal(response.statusCode, 200);
assert.include(response.body, "this.JST");
done();
})
.error(function(error) {
done(error);
});
});
});
});
16 changes: 9 additions & 7 deletions test/test-utils.js
Expand Up @@ -11,18 +11,20 @@ var spawn = require('child_process').spawn;

var temporaryDirectory = exports.temporaryDirectory = path.join(__dirname, 'tmp');

var testBaseHost = 'api.localhost:80';
var testConfigurationHost = 'configuration.localhost:80';
var testBaseHost = 'api.localhost';
var testConfigurationHost = 'configuration.localhost';
var testPort = 3333;
exports.testBaseHost = testBaseHost;
exports.testConfigurationHost = testConfigurationHost;
exports.testPort = testPort;

function setupServer(context) {
var server = gcsServer.createServer({ context: context,
port: testPort,
baseHost: exports.testBaseHost,
configurationHost: exports.testConfigurationHost });
var server = gcsServer.createServer({
context: context,
port: testPort,
baseHost: exports.testBaseHost + ':80',
configurationHost: exports.testConfigurationHost + ':80'
});
server.listen(testPort);
return server;
}
Expand All @@ -32,7 +34,7 @@ function sendRequest(method, path, postData, headers) {
var deferred = new Deferred();

var options = {
host: testBaseHost,
host: 'localhost',
port: testPort,
path: path,
method: method,
Expand Down

0 comments on commit aa1005e

Please sign in to comment.