fix(testing): builder should let baseUrl option take precidence if present (#3487)

Author: ZackDeRose

Diff for: packages/cypress/src/builders/cypress/cypress.impl.spec.ts

@@ -260,6 +260,32 @@ describe('Cypress builder', () => {
     done();
   });
 
+  test('when devServerTarget AND baseUrl options are both present, baseUrl should take precidence', async (done) => {
+    const options: CypressBuilderOptions = {
+      ...cypressBuilderOptions,
+      baseUrl: 'test-url-from-options',
+    };
+    const result = await cypressBuilderRunner(
+      options,
+      mockedBuilderContext
+    ).toPromise();
+    expect(cypressRun.calls.mostRecent().args[0].config.baseUrl).toBe(
+      'test-url-from-options'
+    );
+    done();
+  });
+
+  test('when devServerTarget option present and baseUrl option is absent, baseUrl should come from devServerTarget', async (done) => {
+    const result = await cypressBuilderRunner(
+      cypressBuilderOptions,
+      mockedBuilderContext
+    ).toPromise();
+    expect(cypressRun.calls.mostRecent().args[0].config.baseUrl).toBe(
+      'http://localhost:4200'
+    );
+    done();
+  });
+
   describe('legacy', () => {
     beforeEach(() => {
       cypressConfig = {

Diff for: packages/cypress/src/builders/cypress/cypress.impl.ts

@@ -64,7 +64,9 @@ export function cypressBuilderRunner(
 
   return (!legacy
     ? options.devServerTarget
-      ? startDevServer(options.devServerTarget, options.watch, context)
+      ? startDevServer(options.devServerTarget, options.watch, context).pipe(
+          map((devServerBaseUrl) => options.baseUrl || devServerBaseUrl)
+        )
       : of(options.baseUrl)
     : legacyCompile(options, context)
   ).pipe(