diff --git a/package.json b/package.json index 034626afd..371a23378 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "test": "mocha --compilers js:babel-core/register --recursive tests", "test-watch": "mocha --compilers js:babel-core/register --recursive -w tests", "embed-start": "npm run build && ./bin/www", - "pree2e": "node_modules/selenium-standalone/bin/selenium-standalone install", + "pree2e": "./pree2e.sh", "e2e": "node_modules/.bin/nightwatch" }, "config": { diff --git a/pree2e.sh b/pree2e.sh new file mode 100755 index 000000000..39c5f1297 --- /dev/null +++ b/pree2e.sh @@ -0,0 +1,5 @@ +node_modules/selenium-standalone/bin/selenium-standalone install +export TALK_PORT=3011 +export TALK_MONGO_URL='mongodb://localhost/talk_test' +npm start & +wait 2 diff --git a/tests/e2e/globals.js b/tests/e2e/globals.js index 4b3f4eaef..d90f024a4 100644 --- a/tests/e2e/globals.js +++ b/tests/e2e/globals.js @@ -1,4 +1,4 @@ module.exports = { waitForConditionTimeout: 20000, - baseUrl: 'http://localhost:3000' + baseUrl: 'http://localhost:3011' };