1 files changed, 11 insertions, 12 deletions

diff --git a/e2e/contents/navigate.test.js b/e2e/contents/navigate.test.js
index 3b34785..590a4b3 100644
--- a/e2e/contents/navigate.test.js
+++ b/e2e/contents/navigate.test.js
@@ -2,8 +2,7 @@ import * as windows from "../ambassador/src/client/windows";
 import * as tabs from "../ambassador/src/client/tabs";
 import * as keys from "../ambassador/src/client/keys";
 import * as scrolls from "../ambassador/src/client/scrolls";
-
-const SERVER_URL = "http://localhost:11111";
+import { CLIENT_URL } from '../web-server/url';
 
 describe("navigate test", () => {
   let targetWindow;
@@ -11,7 +10,7 @@ describe("navigate test", () => {
   before(() => {
     return windows.create().then((win) => {
       targetWindow = win;
-      return tabs.create(targetWindow.id, SERVER_URL);
+      return tabs.create(targetWindow.id, CLIENT_URL);
     });
   });
 
@@ -21,7 +20,7 @@ describe("navigate test", () => {
 
   it('goes to parent', () => {
     let targetTab;
-    return tabs.create(targetWindow.id, SERVER_URL + '/a/b/c').then((tab) => {
+    return tabs.create(targetWindow.id, CLIENT_URL + '/a/b/c').then((tab) => {
       targetTab = tab;
       return keys.press(targetTab.id, 'g');
     }).then(() => {
@@ -29,13 +28,13 @@ describe("navigate test", () => {
     }).then(() => {
       return tabs.get(targetTab.id);
     }).then((tab) => {
-      expect(tab.url).to.be.equal(SERVER_URL + '/a/b/');
+      expect(tab.url).to.be.equal(CLIENT_URL + '/a/b/');
     });
   });
 
   it('removes hash', () => {
     let targetTab;
-    return tabs.create(targetWindow.id, SERVER_URL + '/a/b/c#navigate').then((tab) => {
+    return tabs.create(targetWindow.id, CLIENT_URL + '/a/b/c#navigate').then((tab) => {
       targetTab = tab;
       return keys.press(targetTab.id, 'g');
     }).then(() => {
@@ -43,13 +42,13 @@ describe("navigate test", () => {
     }).then(() => {
       return tabs.get(targetTab.id);
     }).then((tab) => {
-      expect(tab.url).to.be.equal(SERVER_URL + '/a/b/c#');
+      expect(tab.url).to.be.equal(CLIENT_URL + '/a/b/c#');
     });
   });
 
   it('goes to root', () => {
     let targetTab;
-    return tabs.create(targetWindow.id, SERVER_URL + '/a/b/c').then((tab) => {
+    return tabs.create(targetWindow.id, CLIENT_URL + '/a/b/c').then((tab) => {
       targetTab = tab;
       return keys.press(targetTab.id, 'g');
     }).then(() => {
@@ -57,13 +56,13 @@ describe("navigate test", () => {
     }).then(() => {
       return tabs.get(targetTab.id);
     }).then((tab) => {
-      expect(tab.url).to.be.equal(SERVER_URL + '/');
+      expect(tab.url).to.be.equal(CLIENT_URL + '/');
     });
   });
 
   it('goes back and forward in history', () => {
     let targetTab;
-    return tabs.create(targetWindow.id, SERVER_URL + '/#navigate').then((tab) => {
+    return tabs.create(targetWindow.id, CLIENT_URL + '/#navigate').then((tab) => {
       targetTab = tab;
       return keys.press(targetTab.id, 'g');
     }).then(() => {
@@ -75,7 +74,7 @@ describe("navigate test", () => {
     }).then(() => {
       return tabs.get(targetTab.id);
     }).then((tab) => {
-      expect(tab.url, 'go back in history').to.be.equal(SERVER_URL + '/#navigate');
+      expect(tab.url, 'go back in history').to.be.equal(CLIENT_URL + '/#navigate');
     }).then(() => {
       return new Promise(resolve => { setTimeout(() => resolve(), 2000) });
     }).then(() => {
@@ -83,7 +82,7 @@ describe("navigate test", () => {
     }).then(() => {
       return tabs.get(targetTab.id);
     }).then((tab) => {
-      expect(tab.url, 'go next in history').to.be.equal(SERVER_URL + '/#');
+      expect(tab.url, 'go next in history').to.be.equal(CLIENT_URL + '/#');
     });
   });
 });