diff --git a/nightwatch.json b/nightwatch.json index 6b5d06c..cbbb172 100644 --- a/nightwatch.json +++ b/nightwatch.json @@ -1,6 +1,6 @@ { "src_folders" : ["./tests"], - "output_folder" : "./reports", + "output_folder" : "./shippable/testresults", "custom_commands_path" : "", "custom_assertions_path" : "", "globals_path" : "", diff --git a/server.js b/server.js index 222a78b..fe237c9 100644 --- a/server.js +++ b/server.js @@ -2,14 +2,14 @@ var http = require('http'); var server = http.createServer(function (req, res) { res.writeHead(200, {'Content-Type': 'text/html'}); - res.end('Hello from blahhh world'); + res.end('Hello World'); // Prevents the build container from timing out by waiting for the server to close. process.nextTick(function () { - console.log('Stopping server running at http://127.0.0.1:1337'); + console.log('Stopping server running at http://127.0.0.1:5001'); process.exit(); }); }); -server.listen(1337, '127.0.0.1'); +server.listen(5001, '127.0.0.1'); -console.log('Server running at http://127.0.0.1:1337/'); +console.log('Server running at http://127.0.0.1:5001/'); diff --git a/shippable.yml b/shippable.yml index cb92260..8d262eb 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,14 +1,15 @@ language: node_js - node_js: - "0.10" - -addons: - firefox: "23.0" - services: - selenium - -before_script: - - "export DISPLAY=:99.0" - - "/etc/init.d/xvfb start" +addons: + firefox: "17.0" +build: + pre_ci_boot: + image_name: shippable/minv2 + image_tag: latest + ci: + - npm install + - export DISPLAY=:99.0 + - xvfb-run --server-args="-ac" npm test diff --git a/tests/sample_test.js b/tests/sample_test.js index a4613b6..ef578c0 100644 --- a/tests/sample_test.js +++ b/tests/sample_test.js @@ -1,7 +1,7 @@ module.exports = { "test sample" : function (browser) { browser - .url("http://127.0.0.1:1337") + .url("http://127.0.0.1:5001") .waitForElementVisible('body', 1000) .assert.containsText('body', 'Hello World') .end();