1 files changed, 9 insertions, 22 deletions
diff --git a/e2e/command_addbookmark.test.ts b/e2e/command_addbookmark.test.ts
index bd7ae1a..4fa30d8 100644
--- a/e2e/command_addbookmark.test.ts
+++ b/e2e/command_addbookmark.test.ts
@@ -1,53 +1,40 @@
-import express from 'express';
 import * as path from 'path';
 import * as assert from 'assert';
-import * as http from 'http';
 
+import TestServer from './lib/TestServer';
 import eventually from './eventually';
 import { Builder, Lanthan } from 'lanthan';
 import { WebDriver } from 'selenium-webdriver';
 import Page from './lib/Page';
 
-const newApp = () => {
-  let app = express();
-  app.get('/happy', (_req, res) => {
-    res.send(`<!DOCTYPEhtml>
-<html lang="en">
-  <head>
-    <title>how to be happy</title>
-  </head>
-</html">`);
-  });
-  return app;
-};
-
 describe('addbookmark command test', () => {
-  const port = 12321;
-  let http: http.Server;
+  let server = new TestServer().receiveContent('/happy', `
+      <!DOCTYPE html>
+      <html lang="en"><head><title>how to be happy</title></head></html">`,
+  );
   let lanthan: Lanthan;
   let webdriver: WebDriver;
   let browser: any;
 
   before(async() => {
-    http = newApp().listen(port);
-
     lanthan = await Builder
       .forBrowser('firefox')
       .spyAddon(path.join(__dirname, '..'))
       .build();
     webdriver = lanthan.getWebDriver();
     browser = lanthan.getWebExtBrowser();
+    await server.start();
   });
 
   after(async() => {
-    http.close();
+    await server.stop();
     if (lanthan) {
       await lanthan.quit();
     }
   });
 
   beforeEach(async() => {
-    await webdriver.navigate().to(`http://127.0.0.1:${port}/happy`);
+    await webdriver.navigate().to(server.url('/happy'));
   });
 
   it('should add a bookmark from the current page', async() => {
@@ -58,7 +45,7 @@ describe('addbookmark command test', () => {
     await eventually(async() => {
       var bookmarks = await browser.bookmarks.search({ title: 'how to be happy' });
       assert.equal(bookmarks.length, 1);
-      assert.equal(bookmarks[0].url, `http://127.0.0.1:${port}/happy`);
+      assert.equal(bookmarks[0].url, server.url('/happy'));
     });
   });
 });