Skip to content

[pull] master from shippableSamples:master #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pull wants to merge 7 commits into
base: master
Choose a base branch
from
+16 −15
Open

[pull] master from shippableSamples:master #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
565837b
client expects something and server sends something else - fixed
balavignesh-s Feb 23, 2016
b850bc9
fixed merge conflict
balavignesh-s Feb 23, 2016
dfdc51f
Merge pull request #7 from balavignesh-s/master
rageshkrishna Feb 24, 2016
e45bbd2
added export DISPLAY command
balavignesh-s Feb 24, 2016
f3208cb
Merge pull request #8 from balavignesh-s/master
rageshkrishna Feb 24, 2016
fbe296b
Change output directory.
a-murphy Dec 11, 2018
22119a8
Merge pull request #11 from a-murphy/firefox
Dec 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nightwatch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"src_folders" : ["./tests"],
"output_folder" : "./reports",
"output_folder" : "./shippable/testresults",
"custom_commands_path" : "",
"custom_assertions_path" : "",
"globals_path" : "",
Expand Down
8 changes: 4 additions & 4 deletions server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ var http = require('http');

var server = http.createServer(function (req, res) {
res.writeHead(200, {'Content-Type': 'text/html'});
res.end('<html><head></head><body>Hello from blahhh world</body></html>');
res.end('<html><head></head><body>Hello World</body></html>');
// 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/');
19 changes: 10 additions & 9 deletions shippable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tests/sample_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
Expand Down