Skip to content

fix(@angular-devkit/build-angular): addresses issue were deployUrl #12360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hansl merged 2 commits into from
Sep 27, 2018
Merged

fix(@angular-devkit/build-angular): addresses issue were deployUrl #12360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea1045f
test: fix tests so it fails when servePath is not working
alan-agius4 Sep 25, 2018
40ffb5b
fix(@angular-devkit/build-angular): addresses issue were `deployUrl` …
alan-agius4 Sep 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/angular_devkit/build_angular/src/dev-server/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ export interface DevServerBuilderOptions {
vendorChunk?: boolean;
commonChunk?: boolean;
baseHref?: string;
deployUrl?: string;
progress?: boolean;
poll?: number;
verbose?: boolean;
Expand Down Expand Up @@ -406,6 +407,7 @@ export class DevServerBuilder implements Builder<DevServerBuilderOptions> {
'progress',
'poll',
'verbose',
'deployUrl',
];

// remove options that are undefined or not to be overrriden
Expand Down
30 changes: 30 additions & 0 deletions packages/angular_devkit/build_angular/test/dev-server/deploy-url_spec_large.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/**
* @license
* Copyright Google Inc. All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/

import { request, runTargetSpec } from '@angular-devkit/architect/testing';
import { from } from 'rxjs';
import { concatMap, take, tap } from 'rxjs/operators';
import { DevServerBuilderOptions } from '../../src';
import { devServerTargetSpec, host } from '../utils';


describe('Dev Server Deploy Url', () => {
beforeEach(done => host.initialize().toPromise().then(done, done.fail));
afterEach(done => host.restore().toPromise().then(done, done.fail));

it('works', (done) => {
const overrides: Partial<DevServerBuilderOptions> = { deployUrl: 'test/' };

runTargetSpec(host, devServerTargetSpec, overrides).pipe(
tap((buildEvent) => expect(buildEvent.success).toBe(true)),
concatMap(() => from(request('http://localhost:4200/test/polyfills.js'))),
tap(response => expect(response).toContain('window["webpackJsonp"]')),
take(1),
).toPromise().then(done, done.fail);
}, 30000);
});
7 changes: 2 additions & 5 deletions packages/angular_devkit/build_angular/test/dev-server/serve-path_spec_large.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,13 @@ describe('Dev Server Builder serve path', () => {
beforeEach(done => host.initialize().toPromise().then(done, done.fail));
afterEach(done => host.restore().toPromise().then(done, done.fail));

// TODO: review this test, it seems to pass with or without the servePath.
it('works', (done) => {
const overrides: Partial<DevServerBuilderOptions> = { servePath: 'test/' };

runTargetSpec(host, devServerTargetSpec, overrides).pipe(
tap((buildEvent) => expect(buildEvent.success).toBe(true)),
concatMap(() => from(request('http://localhost:4200/test/'))),
tap(response => expect(response).toContain('<title>HelloWorldApp</title>')),
concatMap(() => from(request('http://localhost:4200/test/abc/'))),
tap(response => expect(response).toContain('<title>HelloWorldApp</title>')),
concatMap(() => from(request('http://localhost:4200/test/polyfills.js'))),
tap(response => expect(response).toContain('window["webpackJsonp"]')),
take(1),
).toPromise().then(done, done.fail);
}, 30000);
Expand Down