removed port and baseUrl. runs testcafe on host as set in devServerTarget host option

Author: Tim Nederhoff

README.md

@@ -21,8 +21,6 @@ $ npm install --save-dev @politie/angular-testcafe-builder
               "firefox"
             ],
             "src": ["e2e/*.e2e-spec.ts"],
-            "host": "localhost",
-            "port": "4200",
             "reporters": [
               {
                 "name": "html",
@@ -56,4 +54,5 @@ $ npm pack
 ## NOT Implemented (TODO):
 * remote browsers
 * QR code
-* testS
+* video
+* ssl

demo-app/angular.json

@@ -112,12 +112,10 @@
         "e2e": {
           "builder": "@politie/angular-testcafe-builder:testcafe",
           "options": {
-            "devServerTarget": "demo-app:serve:stubbed",
             "browsers": [
               "chrome --no-sandbox --window-size=1920,1080"
             ],
-            "host": "localhost",
-            "port": 4200,
+            "screenshotsOnFails": true,
             "reporters": [
               {
                 "name": "spec"
@@ -130,13 +128,18 @@
           },
           "configurations": {
             "passing": {
+              "devServerTarget": "demo-app:serve:stubbed",
               "src": ["e2e/passing.e2e-spec.ts"]
             },
             "failing": {
-              "src": ["e2e/passing.e2e-spec.ts"]
+              "devServerTarget": "demo-app:serve:stubbed",
+              "src": ["e2e/failing.e2e-spec.ts"]
             },
-            "error": {
+            "error": {"devServerTarget": "demo-app:serve:stubbed",
               "src": ["my/invalid/path-to-src"]
+            },
+            "externalsite": {
+              "src": ["e2e/externalsite.e2e-spec.ts"]
             }
           }
         }

demo-app/e2e/externalsite.e2e-spec.ts

@@ -0,0 +1,5 @@
+import { Selector } from 'testcafe';
+
+fixture('Google search').page('http://www.google.com');
+
+test('google logo', async t => await t.expect(Selector('#hplogo').exists).ok());

src/testcafe/schema.d.ts

@@ -1,12 +1,10 @@
 export interface TestcafeBuilderOptions {
-    devServerTarget?: string;
     src: string | string[];
-    browsers: string[];
-    host: string;
-    port?: number;
-    baseUrl?: string;
-    reporters: Reporter[];
-    live?: boolean;
+    browsers?: string[]; // default in schema.json
+    reporters?: Reporter[]; // default in schema.json
+    devServerTarget?: string; // set to run ng serve
+    host?: string; // default in schema.json
+    live?: boolean; // default in schema.json
     concurrency?: number;
     screenshotsPath?: string;
     screenshotsOnFails?: boolean;
@@ -20,7 +18,7 @@ export interface TestcafeBuilderOptions {
     assertionTimeout?: number;
     pageLoadTimeout?: number;
     speed?: number;
-    ports?: number[];
+    ports?: number[]; // testcafe ports
     proxy?: string;
     proxyBypass?: string[];
     disablePageReloads?: boolean;

src/testcafe/schema.json

@@ -27,17 +27,9 @@
     },
     "host": {
       "type": "string",
-      "description": "[Angular & TestCafe] Host to use to serve the application and host to run TestCafe on",
+      "description": "[TestCafe] Host to use to run TestCafe on (only if devServerTarget is not set), default = localhost",
       "default": "localhost"
     },
-    "port": {
-      "type": "number",
-      "description": "[Angular] The port to use to serve the application."
-    },
-    "baseUrl": {
-      "type": "string",
-      "description": "Base URL for Testcafe to connect to."
-    },
     "live": {
       "type": "boolean",
       "description": "Enables live mode. In this mode, TestCafe watches for changes you make in the test files and all files referenced in them (like page objects or helper modules). These changes immediately restart the tests so that you can see the effect.",
@@ -183,9 +175,6 @@
   },
   "additionalProperties": false,
   "required": [
-    "browsers",
-    "host",
-    "port",
     "src"
   ]
 }

src/testcafe/testcafe.builder.ts

@@ -4,20 +4,19 @@ import {
 	createBuilder,
 	targetFromTargetString
 } from "@angular-devkit/architect";
-import { JsonObject, tags } from "@angular-devkit/core";
+import { JsonObject } from "@angular-devkit/core";
 import { TestcafeBuilderOptions } from "./schema";
-import * as url from "url";
 import { isMatch } from "lodash";
 const createTestCafe = require("testcafe");
 
-async function runTestcafe(opts: TestcafeBuilderOptions) {
+async function runTestcafe(opts: TestcafeBuilderOptions, hostName) {
 	const port1 = opts.ports && opts.ports[0];
 	const port2 = opts.ports && opts.ports[1];
 	const proxy = opts.proxy;
 	const proxyBypass = opts.proxyBypass;
 
 	const testCafe = await createTestCafe(
-		opts.host,
+		hostName,
 		port1,
 		port2,
 		opts.ssl,
@@ -67,63 +66,23 @@ async function execute(
 	options: TestcafeBuilderOptions,
 	context: BuilderContext
 ): Promise<BuilderOutput> {
-	// ensure that only one of these options is used
-	if (options.devServerTarget && options.baseUrl) {
-		throw new Error(tags.stripIndents`
-    The 'baseUrl' option cannot be used with 'devServerTarget'.
-    `);
-	}
-
-	let baseUrl;
 	let server;
+	let serverOptions;
 	if (options.devServerTarget) {
 		const target = targetFromTargetString(options.devServerTarget);
-		const serverOptions = await context.getTargetOptions(target);
-
-		const overrides: Record<string, string | number | boolean> = {
-			watch: false
-		};
-		if (options.host !== undefined) {
-			overrides.host = options.host;
-		} else if (typeof serverOptions.host === "string") {
-			options.host = serverOptions.host;
-		} else {
-			options.host = overrides.host = "localhost";
-		}
+		serverOptions = await context.getTargetOptions(target);
 
-		if (options.port !== undefined) {
-			overrides.port = options.port;
-		} else if (typeof serverOptions.port === "number") {
-			options.port = serverOptions.port;
-		}
-
-		server = await context.scheduleTarget(target, overrides);
+		server = await context.scheduleTarget(target);
 		const result = await server.result;
 		if (!result.success) {
 			console.log('SERVER.RESULT IS NOT SUCCESS!!!');
 			return { success: false };
 		}
-
-		if (typeof serverOptions.publicHost === "string") {
-			let publicHost = serverOptions.publicHost as string;
-			if (!/^\w+:\/\//.test(publicHost)) {
-				publicHost = `${serverOptions.ssl ? "https" : "http"}://${publicHost}`;
-			}
-			const clientUrl = url.parse(publicHost);
-			baseUrl = url.format(clientUrl);
-		} else if (typeof result.baseUrl === "string") {
-			baseUrl = result.baseUrl;
-		} else if (typeof result.port === "number") {
-			baseUrl = url.format({
-				protocol: serverOptions.ssl ? "https" : "http",
-				hostname: options.host,
-				port: result.port.toString()
-			});
-		}
 	}
 
 	try {
-		const failedCount = await runTestcafe({ ...options, baseUrl });
+	    const host = serverOptions ? serverOptions.host : options.host;
+		const failedCount = await runTestcafe(options, host);
 		if (failedCount > 0) {
 			return { success: false }
 		} else {