Merge branch 'TBSliver/CoreUI' into finn/MoreCoreUI

This commit is contained in:
piratefinn 2017-08-25 12:20:44 +01:00
commit 4fd1b60369
12 changed files with 962 additions and 3271 deletions

View file

@ -1,14 +0,0 @@
import { CoreUIPage } from './app.po';
describe('core-ui App', function() {
let page: CoreUIPage;
beforeEach(() => {
page = new CoreUIPage();
});
it('should display message saying app works', () => {
page.navigateTo();
expect(page.getParagraphText()).toEqual('app works!');
});
});

View file

@ -1,11 +0,0 @@
import { browser, element, by } from 'protractor/globals';
export class CoreUIPage {
navigateTo() {
return browser.get('/');
}
getParagraphText() {
return element(by.css('app-root h1')).getText();
}
}

24
e2e/login.e2e-spec.ts Normal file
View file

@ -0,0 +1,24 @@
import { LoginPageObject } from './login.po';
describe('Login Page', () => {
let page: LoginPageObject;
beforeEach(() => {
page = new LoginPageObject();
page.navigateTo();
});
it('should have a header saying login', () => {
expect(page.getLoginHeaderText()).toEqual('Login');
});
it('should have a username box of type text', () => {
expect(page.isUsernameFieldPresent()).toBeTruthy();
expect(page.getUsernameFieldType()).toBe('text');
});
it('should have a password box of type password', () => {
expect(page.isPasswordFieldPresent()).toBeTruthy();
expect(page.getPasswordFieldType()).toBe('password');
});
});

20
e2e/login.po.ts Normal file
View file

@ -0,0 +1,20 @@
import { browser, element, by } from 'protractor';
export class LoginPageObject {
navigateTo() {
return browser.get('/login');
}
getLoginHeaderText() {
return element(by.css('app-root h1')).getText();
}
getUsernameField() { return element(by.id('username')); }
getPasswordField() { return element(by.id('password')); }
isUsernameFieldPresent() { return this.getUsernameField().isPresent(); }
isPasswordFieldPresent() { return this.getPasswordField().isPresent(); }
getUsernameFieldType() { return this.getUsernameField().getAttribute('type'); }
getPasswordFieldType() { return this.getPasswordField().getAttribute('type'); }
}

View file

@ -4,8 +4,9 @@
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"types":[
"types": [
"jasmine",
"jasminewd2",
"node"
]
}

4128
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -41,19 +41,20 @@
"devDependencies": {
"@angular/cli": "1.3.0",
"@angular/compiler-cli": "4.0.3",
"@types/jasmine": "2.5.47",
"@types/node": "7.0.13",
"@types/jasmine": "2.5.54",
"@types/jasminewd2": "2.0.2",
"@types/node": "8.0.24",
"codelyzer": "2.1.1",
"jasmine-core": "2.5.2",
"jasmine-spec-reporter": "3.2.0",
"karma": "1.6.0",
"karma-chrome-launcher": "2.0.0",
"jasmine-core": "2.7.0",
"jasmine-spec-reporter": "4.2.1",
"karma": "1.7.0",
"karma-chrome-launcher": "2.2.0",
"karma-cli": "1.0.1",
"karma-coverage-istanbul-reporter": "1.2.0",
"karma-coverage-istanbul-reporter": "1.3.0",
"karma-jasmine": "1.1.0",
"karma-jasmine-html-reporter": "0.2.2",
"protractor": "5.1.1",
"ts-node": "3.0.2",
"protractor": "5.1.2",
"ts-node": "3.3.0",
"tslint": "4.5.1",
"typescript": "2.4.2"
}

View file

@ -25,12 +25,14 @@ describe('AppComponent', () => {
]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(AppComponent);
app = fixture.componentInstance;
de = fixture.debugElement;
appDocument = de.nativeElement;
}));
});
it('should create the app', async(() => {
expect(app).toBeTruthy();

View file

@ -1,8 +1,7 @@
import { Component } from '@angular/core';
@Component({
// tslint:disable-next-line
selector: 'body',
selector: 'app-root',
template: '<router-outlet></router-outlet>'
})
export class AppComponent { }

View file

@ -10,11 +10,11 @@
<form [formGroup]="signin" (ngSubmit)="onSubmit()">
<div class="input-group mb-3">
<span class="input-group-addon">@</span>
<input type="text" class="form-control" formControlName="email" placeholder="Email">
<input id="username" type="text" class="form-control" formControlName="email" placeholder="Email">
</div>
<div class="input-group mb-4">
<span class="input-group-addon"><i class="icon-lock"></i></span>
<input type="password" class="form-control" formControlName="password" placeholder="Password">
<input id="password" type="password" class="form-control" formControlName="password" placeholder="Password">
</div>
<div class="mb-4">
<div [ngSwitch]="loginStatus">

View file

@ -21,8 +21,7 @@
<body class="app header-fixed sidebar-fixed">
<!-- Enable bootstrap 4 theme -->
<script>window.__theme = 'bs4';</script>
<!-- App Loading... -->
<app-root><i>Loading...</i></app-root>
</body>
</html>