Merge pull request #15530 from alan-agius4/protractor_base_url

alan-agius4 · Keen Yee Liau · commit 3fc86b7ff502 · 2019-09-10T10:07:44.000-07:00
fix(@angular-devkit/build-angular): add trailing back slash to protr…
diff --git a/packages/angular_devkit/build_angular/src/protractor/index.ts b/packages/angular_devkit/build_angular/src/protractor/index.ts
@@ -139,6 +139,12 @@ async function execute(
     }
   }
 
+  // Like the baseUrl in protractor config file when using the API we need to add
+  // a trailing slash when provide to the baseUrl.
+  if (baseUrl && !baseUrl.endsWith('/')) {
+    baseUrl += '/';
+  }
+
   try {
     return await runProtractor(context.workspaceRoot, { ...options, baseUrl });
   } catch {

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,12 @@ async function execute(`
`139`	`139`	`}`
`140`	`140`	`}`
`141`	`141`
	`142`	`+ // Like the baseUrl in protractor config file when using the API we need to add`
	`143`	`+ // a trailing slash when provide to the baseUrl.`
	`144`	`+ if (baseUrl && !baseUrl.endsWith('/')) {`
	`145`	`+ baseUrl += '/';`
	`146`	`+ }`
	`147`	`+`
`142`	`148`	`try {`
`143`	`149`	`return await runProtractor(context.workspaceRoot, { ...options, baseUrl });`
`144`	`150`	`} catch {`