Skip to content

Command serve feature: Allow content to be served from virtual host path #2727

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

Closed
suau wants to merge 10 commits into from
Closed

Command serve feature: Allow content to be served from virtual host path #2727

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c5ba235
Feature: Allow content to be served from virtual host path e.g. http:…
suau Oct 16, 2016
76e0465
Fix tslint error
suau Oct 17, 2016
efd5b90
Merge branch 'master' into master
suau Oct 17, 2016
1c37fa9
Merge branch 'master' of https://github.com/angular/angular-cli
suau Oct 25, 2016
7a92b06
Rename --path option for ng serve command to --base-href (alias --bh)…
suau Oct 25, 2016
9bf013f
Merge branch 'master' into master
suau Oct 31, 2016
74613ec
Merge branch 'master' into master
suau Nov 2, 2016
c2ce47c
Merge branch 'master' of https://github.com/angular/angular-cli
suau Nov 18, 2016
d2fc15a
Add e2e test for serve --base-href option. WARNING: This test should …
suau Nov 19, 2016
0bfd9ca
Add --base-href e2e tests with expected fail and spec changes to make…
suau Nov 22, 2016
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
Prev Previous commit
Add --base-href e2e tests with expected fail and spec changes to make… 
… it pass
  • Loading branch information
@suau
suau committed Nov 22, 2016
commit 0bfd9ca840169621d053bd9ccf35e33d2ad3f37f
7 changes: 7 additions & 0 deletions tests/e2e/tests/test/e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {ng, killAllProcesses} from '../../utils/process';
import {expectToFail} from '../../utils/utils';
import {ngServe} from '../../utils/project';
import {replaceInFile} from "../../utils/fs";


function _runServeAndE2e(...args: string[]) {
Expand All @@ -20,5 +21,11 @@ export default function() {
.then(() => _runServeAndE2e('--prod'))
.then(() => _runServeAndE2e('--aot'))
.then(() => _runServeAndE2e('--aot', '--prod'))
// this should fail because we haven't changed the e2e test yet
.then(() => expectToFail(() => _runServeAndE2e('--base-href /test-base-href/')))
.then(() => replaceInFile('e2e/app.po.ts',
'browser.get(\'/\');',
'browser.get(\'/test-base-href/\');'))
// now it should pass
.then(() => _runServeAndE2e('--base-href /test-base-href/'));
}