fix(@angular-devkit/build-angular): protractor should use dev server …

…baseUrl
angular · May 9, 2019 · 2b72b58 · 2b72b58
1 parent deacee0
commit 2b72b58
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/packages/angular_devkit/build_angular/src/protractor/index.ts b/packages/angular_devkit/build_angular/src/protractor/index.ts
@@ -140,6 +140,8 @@ async function execute(
       }
       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',

diff --git a/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts b/packages/angular_devkit/build_angular/test/protractor/works_spec_large.ts
@@ -81,4 +81,20 @@ describe('Protractor Builder', () => {
     await run.stop();
   }, 30000);
 
+  it('supports dev server builder with browser builder base HREF option', async () => {
+    host.replaceInFile(
+      'angular.json',
+      '"main": "src/main.ts",',
+      '"main": "src/main.ts", "baseHref": "/base/",',
+    );
+    // Need to reset architect to use the modified config
+    architect = (await createArchitect(host.root())).architect;
+
+    const run = await architect.scheduleTarget(protractorTargetSpec);
+
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
+
+    await run.stop();
+  }, 30000);
+
 });