From e1b64e9e8ee6fe9cac0c506f5e8a8e735aae4289 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Thu, 7 Jun 2018 07:11:17 +0100 Subject: [PATCH] use port 4000 for e2e runs --- docker-compose.yml | 4 ++-- package.json | 2 +- protractor.conf.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 720c0b1de..a05cc0891 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -72,7 +72,7 @@ services: networks: - internal ports: - - 3001:80 + - 4001:80 # volumes: # - ./app.config.json:/usr/share/nginx/html/app.config.json # - ./nginx.conf:/etc/nginx/conf.d/default.conf @@ -86,7 +86,7 @@ services: networks: - internal ports: - - 3000:80 + - 4000:80 networks: internal: diff --git a/package.json b/package.json index ff5d8ffcd..1d5c6a9f2 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "_e2e": "ng e2e", "wd:update": "webdriver-manager update --gecko=false --versions.chrome=2.38", "e2e": "npm run wd:update && protractor protractor.conf.js", - "start:docker": "docker-compose up -d --build && wait-on http://localhost:8080 && wait-on http://localhost:3000", + "start:docker": "docker-compose up -d --build && wait-on http://localhost:8080 && wait-on http://localhost:4000", "stop:docker": "docker-compose stop", "e2e:docker": "npm run start:docker && npm run e2e && npm run stop:docker", "spellcheck": "cspell 'src/**/*.ts' 'e2e/**/*.ts'" diff --git a/protractor.conf.js b/protractor.conf.js index 3971e2d2c..6b6fbb0d4 100755 --- a/protractor.conf.js +++ b/protractor.conf.js @@ -34,7 +34,7 @@ exports.config = { directConnect: true, - baseUrl: 'http://localhost:3000', + baseUrl: 'http://localhost:4000', framework: 'jasmine2', jasmineNodeOpts: {