fix(@angular/cli): Fixed e2e task to respect --publicHost setting as …

…baseUrl for protractor

#6173 added two new settings
to the serve task. The --publicHost setting is not respected as baseUrl
for protractor in the e2e-task.

With this fix, if --publicHost is set, it will be used as baseUrl for protrator.

packages/@angular/cli/tasks/e2e.ts

@@ -26,7 +26,17 @@ export const E2eTask = Task.extend({
       };
 
       // use serve url as override for protractors baseUrl
-      if (e2eTaskOptions.serve) {
+      if (e2eTaskOptions.serve && e2eTaskOptions.publicHost) {
+        const clientUrl = url.parse(e2eTaskOptions.publicHost);
+        if (!clientUrl.host) {
+          return Promise.reject(new SilentError(`'publicHost' must be a full URL.`));
+        }
+        additionalProtractorConfig.baseUrl = url.format({
+          protocol: e2eTaskOptions.ssl ? 'https' : 'http',
+          hostname: clientUrl.host,
+          port: clientUrl.port
+        });
+      } else if (e2eTaskOptions.serve) {
         additionalProtractorConfig.baseUrl = url.format({
           protocol: e2eTaskOptions.ssl ? 'https' : 'http',
           hostname: e2eTaskOptions.host,