fix(bazel): pass correct arguments to http_server in Windows (#30346)

alan-agius4 · alxhub · commit 71eba450e6d2 · 2019-05-09T11:20:52.000-07:00
Under Windows, the server binary has an extension of `.exe` and the current logic is not handling that. Partially addresses: #29785 PR Close #30346
diff --git a/integration/bazel/test/e2e/on-prepare.ts b/integration/bazel/test/e2e/on-prepare.ts
@@ -2,7 +2,7 @@ import { browser } from 'protractor';
 import {OnPrepareConfig, runServer} from '@angular/bazel/protractor-utils';
 
 export = function(config: OnPrepareConfig) {
-  const portFlag = config.server.endsWith('prodserver') ? '-p' : '-port';
+  const portFlag = /prodserver(\.exe)?$/.test(config.server) ? '-p' : '-port';
   return runServer(config.workspace, config.server, portFlag, [])
     .then(serverSpec => {
       const serverUrl = `http://localhost:${serverSpec.port}`;
diff --git a/packages/bazel/src/schematics/ng-add/files/e2e/protractor.on-prepare.js.template b/packages/bazel/src/schematics/ng-add/files/e2e/protractor.on-prepare.js.template
@@ -14,7 +14,7 @@ module.exports = function(config) {
   // selected port (given a port flag to pass to the server as an argument).
   // The port used is returned in serverSpec and the protractor serverUrl
   // is the configured.
-  const portFlag = config.server.endsWith('prodserver') ? '-p' : '-port';
+  const portFlag = /prodserver(\.exe)?$/.test(config.server) ? '-p' : '-port';
   return protractorUtils.runServer(config.workspace, config.server, portFlag, [])
       .then(serverSpec => {
         const serverUrl = `http://localhost:${serverSpec.port}`;
diff --git a/packages/bazel/test/protractor-2/on-prepare.js b/packages/bazel/test/protractor-2/on-prepare.js
@@ -13,7 +13,7 @@ module.exports = function(config) {
   if (!global.userOnPrepareGotCalled) {
     throw new Error('Expecting user configuration onPrepare to have been called');
   }
-  const portFlag = config.server.endsWith('prodserver') ? '-p' : '-port';
+  const portFlag = /prodserver(\.exe)?$/.test(config.server) ? '-p' : '-port';
   return protractorUtils.runServer(config.workspace, config.server, portFlag, [])
       .then(serverSpec => {
         const serverUrl = `http://localhost:${serverSpec.port}`;

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ module.exports = function(config) {`
`13`	`13`	`if (!global.userOnPrepareGotCalled) {`
`14`	`14`	`throw new Error('Expecting user configuration onPrepare to have been called');`
`15`	`15`	`}`
`16`		`- const portFlag = config.server.endsWith('prodserver') ? '-p' : '-port';`
	`16`	`+ const portFlag = /prodserver(\.exe)?$/.test(config.server) ? '-p' : '-port';`
`17`	`17`	`return protractorUtils.runServer(config.workspace, config.server, portFlag, [])`
`18`	`18`	`.then(serverSpec => {`
`19`	`19`	const serverUrl = `http://localhost:${serverSpec.port}`;