Skip to content

Commit a077a98

Browse files
committed
use hash website and circle ci tests
1 parent 4f13a15 commit a077a98

9 files changed

+50
-9
lines changed

.angular-cli.json

+2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
"apps": [
77
{
88
"root": "src",
9+
"baseHref": "/protractor-new-hope/",
910
"outDir": "dist",
11+
"deployUrl": "/protractor-new-hope/",
1012
"assets": [
1113
"assets",
1214
"favicon.ico"

.circleci/config.yml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
version: 2
2+
jobs:
3+
build:
4+
working_directory: ~/workspace
5+
docker:
6+
- image: circleci/node:8-browsers
7+
steps:
8+
- checkout
9+
10+
- run: export UPDATE_SCREENSHOTS='0'
11+
- run: export GITHUB_PAGES='https://angular-seattle.github.io/protractor-new-hope/'
12+
13+
- run: node --version
14+
- run: npm --version
15+
- run: yarn --version
16+
- run: google-chrome --version
17+
18+
- run: yarn install
19+
- run: yarn run webdriver-update
20+
21+
- run: $(npm bin)/protractor protractor.conf.js --specs='e2e/tractor.e2e-spec.ts' --directConnect=true

e2e/firing-form.e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {type, go, see, slow, click, under, leftOf, below, rightOf} from 'blue-ha
33

44
describe('Firing form', () => {
55
beforeAll(async() => {
6-
await browser.get('/firing');
6+
await browser.get('/protractor-new-hope/#/firing');
77
});
88

99
it('should fillout the required fields', async() => {

e2e/goldens/tractor_control4.png

15.8 KB
Loading

e2e/prisoners.e2e-spec.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ describe('Prisoner manifest', () => {
88
describe('with login page', () => {
99
it('should redirect to the login', async() => {
1010
browser.waitForAngularEnabled(false);
11-
await browser.get('/prisoners');
11+
await browser.get('/protractor-new-hope/#/prisoners');
1212
expect(await browser.getCurrentUrl()).toBe(browser.baseUrl + 'assets/login.html');
1313
});
1414

@@ -19,7 +19,7 @@ describe('Prisoner manifest', () => {
1919
browser.waitForAngularEnabled(true);
2020
await browser.wait(() => {
2121
return browser.getCurrentUrl().then(url => {
22-
return url !== browser.baseUrl + 'assets/login.html';
22+
return url !== browser.baseUrl + '/protractor-new-hope/assets/login.html';
2323
});
2424
}, 3000);
2525
expect(await browser.getCurrentUrl()).toBe(browser.baseUrl + 'prisoners');
@@ -29,10 +29,10 @@ describe('Prisoner manifest', () => {
2929
describe('with a cookie', () => {
3030
it('should automatically load prisoners', async() => {
3131
// TODO (milestone #2): Run through chrome://inspect and debug.
32-
await browser.get('/prisoner');
32+
await browser.get('/protractor-new-hope/#/prisoner');
3333
await (browser.manage() as any).addCookie({name: 'userflame', value: 'spock'});
34-
await browser.get('/prisoner');
35-
expect(await browser.getCurrentUrl()).toBe(browser.baseUrl + 'prisoner');
34+
await browser.get('/protractor-new-hope/#/prisoner');
35+
expect(await browser.getCurrentUrl()).toBe(browser.baseUrl + '/protractor-new-hope/#/prisoner');
3636
})
3737
});
3838

e2e/tractor.e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const GOLDEN_IMAGES = [1,2,3,4].map((i) => {
1010
describe('Tractor beam control page', () => {
1111

1212
beforeEach(async() => {
13-
await browser.get('/tractor');
13+
await browser.get('/protractor-new-hope/#/tractor');
1414
let width = 1280;
1515
let height = 900;
1616
await browser.driver.manage().window().setSize(width, height);

protractor.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ exports.config = {
88
capabilities: {
99
'browserName': 'chrome'
1010
},
11-
baseUrl: 'http://localhost:4200/',
11+
baseUrl: (process.env['GITHUB_PAGES'] || 'http://localhost:4200/'),
1212
framework: 'jasmine',
1313
jasmineNodeOpts: {
1414
showColors: true,

scripts/gh-pages.sh

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
npm install
3+
npm run ng build
4+
5+
git checkout gh-pages
6+
7+
rm -rf e2e/ examples/ src/
8+
rm .angular-cli.json .editorconfig karma.conf.js
9+
rm package-lock.json package.json protractor.conf.js
10+
rm README.md tsconfig.json tslint.json
11+
12+
cp -r dist/* .
13+
14+
rm -rf dist/ node_modules/
15+
16+
git add -A
17+
git commit -m "release gh-pages"
18+
git push origin gh-pages

src/app/app.routes.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ const appRoutes: Routes = [
2626
}
2727
];
2828

29-
export const AppRoutes = RouterModule.forRoot(appRoutes);
29+
export const AppRoutes = RouterModule.forRoot(appRoutes, {useHash: true});

0 commit comments

Comments
 (0)