From 565837b5c2efbbaa4b1bb7b1d35390354fc09256 Mon Sep 17 00:00:00 2001 From: balavignesh-s Date: Tue, 23 Feb 2016 13:56:28 +0530 Subject: [PATCH 1/4] client expects something and server sends something else - fixed --- server.js | 8 ++++---- shippable.yml | 29 +++++++++++++++++++++++------ tests/sample_test.js | 2 +- 3 files changed, 28 insertions(+), 11 deletions(-) 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..8d8b06f 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,14 +1,31 @@ +build_image: drydock/u12nodall:prod language: node_js - node_js: - "0.10" +<<<<<<< HEAD +build: + pre_ci_boot: + image_name: drydock/u14nodpls + image_tag: prod + pull: true + ci: + - docker pull drydock/u14nodpls:prod + - ls -al -addons: - firefox: "23.0" + on_failure: + - echo "The job failed!!!!!" + + on_success: + - echo "The job succeeded!!!!" services: - selenium -before_script: - - "export DISPLAY=:99.0" - - "/etc/init.d/xvfb start" +script: + - sudo npm install +======= +services: + - selenium +script: +>>>>>>> 47ed546... client expects something and server sends something else - fixed + - 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(); From b850bc94a90885a74252771106ddbdb302286bd9 Mon Sep 17 00:00:00 2001 From: balavignesh-s Date: Tue, 23 Feb 2016 18:30:31 +0530 Subject: [PATCH 2/4] fixed merge conflict --- shippable.yml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/shippable.yml b/shippable.yml index 8d8b06f..7c0bae5 100644 --- a/shippable.yml +++ b/shippable.yml @@ -2,30 +2,8 @@ build_image: drydock/u12nodall:prod language: node_js node_js: - "0.10" -<<<<<<< HEAD -build: - pre_ci_boot: - image_name: drydock/u14nodpls - image_tag: prod - pull: true - ci: - - docker pull drydock/u14nodpls:prod - - ls -al - - on_failure: - - echo "The job failed!!!!!" - - on_success: - - echo "The job succeeded!!!!" - services: - selenium - script: - sudo npm install -======= -services: - - selenium -script: ->>>>>>> 47ed546... client expects something and server sends something else - fixed - xvfb-run --server-args="-ac" npm test From e45bbd25084e05f17d0c0a12414ad3c7ce52f53f Mon Sep 17 00:00:00 2001 From: balavignesh-s Date: Wed, 24 Feb 2016 11:29:01 +0530 Subject: [PATCH 3/4] added export DISPLAY command --- shippable.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shippable.yml b/shippable.yml index 7c0bae5..31c8218 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,9 +1,12 @@ -build_image: drydock/u12nodall:prod +build_image: shippable/minv2:latest language: node_js node_js: - "0.10" services: - selenium +addons: + firefox: "17.0" script: - sudo npm install + - export DISPLAY=:99.0 - xvfb-run --server-args="-ac" npm test From fbe296b5923fea6f74ccf98686250099a036e25b Mon Sep 17 00:00:00 2001 From: Aidan Murphy Date: Tue, 11 Dec 2018 12:14:23 -0800 Subject: [PATCH 4/4] Change output directory. --- nightwatch.json | 2 +- shippable.yml | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) 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/shippable.yml b/shippable.yml index 31c8218..8d262eb 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,4 +1,3 @@ -build_image: shippable/minv2:latest language: node_js node_js: - "0.10" @@ -6,7 +5,11 @@ services: - selenium addons: firefox: "17.0" -script: - - sudo npm install - - export DISPLAY=:99.0 - - xvfb-run --server-args="-ac" npm test +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