Mercurial > hg > thermostat-ng > web-client

changeset 191:2193384aecd8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert windows change to fix Linux integration tests This patch reverts some package.json changes made to get the web-client running on Windows. Unfortunately, integration tests on Linux were broken by that change. This tests fixes the integration tests on Linux, while work continues to get them going on Windows. Normal unit tests and the web-client proper still work on Linux and Windows after this change. Reviewed-by: aazores Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-September/024938.html
author Simon Tooke <stooke@redhat.com>
date Mon, 11 Sep 2017 10:00:39 -0400
parents ab4bcbd6d893
children 9e823981d848
files package.json
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/package.json	Fri Sep 08 11:23:07 2017 -0400
+++ b/package.json	Mon Sep 11 10:00:39 2017 -0400
@@ -100,9 +100,9 @@
     "pretest-watch": "npm run pretest",
     "test-watch": "karma start --auto-watch --no-single-run",
     "prestart-integration-test-server": "npm run stop-integration-test-server && webdriver-manager update",
-    "start-integration-test-server": "forever start -t webdriver-manager start",
+    "start-integration-test-server": "forever start -t \"$(npm bin)\"/webdriver-manager start",
     "poststart-integration-test-server": "node integration-test/wait-for-selenium.js",
-    "stop-integration-test-server": "forever stop -t --silent webdriver-manager || true",
+    "stop-integration-test-server": "forever stop -t --silent \"$(npm bin)\"/webdriver-manager || true",
     "poststop-integration-test-server": "webdriver-manager shutdown",
     "preintegration-test": "npm run lint-itests && npm run start-integration-test-server",
     "integration-test": "protractor integration-test/integration-test.config.js",