Skip to content

Commit cbead47

Browse files
samvloeberghssamvloeberghs
committed
updated first test scenario without cucumberjs
1 parent 555c71a commit cbead47

File tree

11 files changed

+250
-165
lines changed

11 files changed

+250
-165
lines changed

‎config/protractor.basic.conf.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var helpers = require('./helpers');
55
module.exports = merge(require('./protractor.conf'), {
66

77
specs: [
8-
'../e2e/**/*.e2e-spec.ts'
8+
'test/e2e/**/*.spec.ts'
99
],
1010

1111
jasmineNodeOpts: {

‎src/app/forgot-password/forgotPassword.component.html‎

Lines changed: 51 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,72 @@
11
<div class="container" id="forgot-password-container">
2-
<div class="col-md-4 col-md-offset-4">
3-
<div class="panel panel-default">
4-
<div class="panel-heading">
5-
<h3 class="panel-title"><strong>Forgot password</strong></h3>
6-
<div>
7-
<a [routerLink]=" ['/login']" id="forgot-password-login-link">Login?</a>
8-
</div>
9-
</div>
2+
<div class="col-md-4 col-md-offset-4">
3+
<div class="panel panel-default">
4+
<div class="panel-heading">
5+
<h3 class="panel-title" id="forgot-password-title">
6+
Forgot password
7+
</h3>
8+
<div>
9+
<a [routerLink]=" ['/login']" id="forgot-password-login-link">Login?</a>
10+
</div>
11+
</div>
1012

11-
<div class="panel-body">
12-
<form role="form" novalidate id="forgot-password-form"
13-
[formGroup]="form" (submit)="submit($event)" *ngIf="!validSubmit">
13+
<div class="panel-body">
14+
<form role="form" novalidate id="forgot-password-form"
15+
[formGroup]="form" (submit)="submit($event)" *ngIf="!validSubmit">
1416

15-
<div class="form-group" [ngClass]="{'has-error': ( submitted && !form.controls.email.valid )}">
17+
<div class="form-group" [ngClass]="{'has-error': ( submitted && !form.controls.email.valid )}">
1618

17-
<div class="input-group">
18-
<span class="input-group-addon"><i class="glyphicon glyphicon-envelope"></i></span>
19-
<input
20-
id="forgot-password-email"
21-
type="text"
22-
class="form-control"
23-
name="email"
24-
value=""
25-
placeholder="Your email"
26-
formControlName="email"
27-
required
28-
>
29-
</div>
19+
<div class="input-group">
20+
<span class="input-group-addon"><i class="glyphicon glyphicon-envelope"></i></span>
21+
<input
22+
id="forgot-password-email"
23+
type="text"
24+
class="form-control"
25+
name="email"
26+
value=""
27+
placeholder="Your email"
28+
formControlName="email"
29+
required
30+
>
31+
</div>
3032

31-
<div class="error-group" *ngIf="( submitted && !form.controls.email.valid )">
33+
<div class="error-group" *ngIf="( submitted && !form.controls.email.valid )">
3234
<span class="help-block" *ngIf="form.controls.email.hasError('required')">
3335
Your email is required
3436
</span>
35-
<span class="help-block"
36-
*ngIf="!form.controls.email.hasError('required') && form.controls.email.hasError('invalidEmail')">
37+
<span class="help-block"
38+
*ngIf="!form.controls.email.hasError('required') && form.controls.email.hasError('invalidEmail')">
3739
Your email is invalid
3840
</span>
39-
</div>
41+
</div>
4042

41-
</div>
43+
</div>
4244

43-
<button type="submit" class="btn btn-success" id="forgot-password-submit">Request new password</button>
45+
<button type="submit" class="btn btn-success" id="forgot-password-submit">Request new password
46+
</button>
4447

45-
<hr/>
48+
<hr/>
4649

47-
<div class="form-group" style="margin-bottom:0;">
50+
<div class="form-group" style="margin-bottom:0;">
4851

49-
<div style="font-size:85%">
50-
Don't have an account?
51-
<a [routerLink]=" ['/register']" id="forgot-password-register-link">
52-
Register here
53-
</a>
54-
</div>
52+
<div style="font-size:85%">
53+
Don't have an account?
54+
<a [routerLink]=" ['/register']" id="forgot-password-register-link">
55+
Register here
56+
</a>
57+
</div>
5558

56-
</div>
57-
</form>
58-
<div id=""
59-
*ngIf="validSubmit">
59+
</div>
60+
</form>
61+
<div id=""
62+
*ngIf="validSubmit">
6063

61-
<div class="alert alert-success">
62-
Email with further instructions send!
63-
</div>
64+
<div class="alert alert-success">
65+
Email with further instructions send!
66+
</div>
6467

68+
</div>
69+
</div>
6570
</div>
66-
</div>
6771
</div>
68-
</div>
6972
</div>

‎src/app/login/login.component.html‎

Lines changed: 58 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,86 @@
11
<div class="container" id="login-container">
2-
<div class="col-md-4 col-md-offset-4">
3-
<div class="panel panel-default">
4-
<div class="panel-heading">
5-
<h3 class="panel-title"><strong>Login</strong></h3>
6-
<div>
7-
<a [routerLink]=" ['/forgot-password']" id="login-forgot-password-link">Forgot password?</a>
8-
</div>
9-
</div>
2+
<div class="col-md-4 col-md-offset-4">
3+
<div class="panel panel-default">
4+
<div class="panel-heading">
5+
<h3 class="panel-title" id="login-title">
6+
Login
7+
</h3>
8+
<div>
9+
<a [routerLink]=" ['/forgot-password']" id="login-forgot-password-link">Forgot password?</a>
10+
</div>
11+
</div>
1012

11-
<div class="panel-body">
13+
<div class="panel-body">
1214

13-
<form role="form" novalidate id="login-form"
14-
[formGroup]="form" (submit)="submit($event)"
15-
*ngIf="!authenticated">
15+
<form role="form" novalidate id="login-form"
16+
[formGroup]="form" (submit)="submit($event)"
17+
*ngIf="!authenticated">
1618

17-
<div class="form-group" [ngClass]="{'has-error': ( submitted && !form.controls.email.valid )}">
18-
<div class="input-group">
19-
<label class="input-group-addon" for="login-email"><i class="glyphicon glyphicon-envelope"></i></label>
20-
<input id="login-email" type="text" class="form-control" name="login-email"
21-
placeholder="Your email"
22-
required
23-
formControlName="email">
24-
</div>
19+
<div class="form-group" [ngClass]="{'has-error': ( submitted && !form.controls.email.valid )}">
20+
<div class="input-group">
21+
<label class="input-group-addon" for="login-email"><i
22+
class="glyphicon glyphicon-envelope"></i></label>
23+
<input id="login-email" type="text" class="form-control" name="login-email"
24+
placeholder="Your email"
25+
required
26+
formControlName="email">
27+
</div>
2528

26-
<div class="error-group" *ngIf="( submitted && !form.controls.email.valid )">
29+
<div class="error-group" *ngIf="( submitted && !form.controls.email.valid )">
2730
<span class="help-block" *ngIf="form.controls.email.hasError('required')">
2831
Your email is required
2932
</span>
30-
<span class="help-block"
31-
*ngIf="!form.controls.email.hasError('required') && form.controls.email.hasError('invalidEmail')">
33+
<span class="help-block"
34+
*ngIf="!form.controls.email.hasError('required') && form.controls.email.hasError('invalidEmail')">
3235
Your email is invalid
3336
</span>
34-
</div>
37+
</div>
3538

36-
</div>
39+
</div>
3740

38-
<div class="form-group" [ngClass]="{'has-error': ( submitted && !form.controls.password.valid )}">
41+
<div class="form-group" [ngClass]="{'has-error': ( submitted && !form.controls.password.valid )}">
3942

40-
<div class="input-group">
41-
<label class="input-group-addon" for="login-password"><i class="glyphicon glyphicon-lock"></i></label>
42-
<input id="login-password" type="password" class="form-control" name="login-password"
43-
placeholder="Your password"
44-
required
45-
formControlName="password">
46-
</div>
43+
<div class="input-group">
44+
<label class="input-group-addon" for="login-password"><i
45+
class="glyphicon glyphicon-lock"></i></label>
46+
<input id="login-password" type="password" class="form-control" name="login-password"
47+
placeholder="Your password"
48+
required
49+
formControlName="password">
50+
</div>
4751

48-
<div class="error-group" *ngIf="( submitted && !form.controls.password.valid )">
52+
<div class="error-group" *ngIf="( submitted && !form.controls.password.valid )">
4953
<span class="help-block" *ngIf="form.controls.password.hasError('required')">
5054
Your password is required
5155
</span>
52-
</div>
56+
</div>
5357

54-
</div>
58+
</div>
5559

56-
<button type="submit" class="btn btn-success" id="login-submit">Login</button>
60+
<button type="submit" class="btn btn-success" id="login-submit">Login</button>
5761

58-
<hr/>
62+
<hr/>
5963

60-
<div class="form-group">
64+
<div class="form-group">
6165

62-
<div>
63-
Don't have an account?
64-
<a [routerLink]=" ['/register']" id="login-register-link">
65-
Register here
66-
</a>
67-
</div>
66+
<div>
67+
Don't have an account?
68+
<a [routerLink]=" ['/register']" id="login-register-link">
69+
Register here
70+
</a>
71+
</div>
6872

69-
</div>
70-
</form>
71-
<div id=""
72-
*ngIf="authenticated">
73+
</div>
74+
</form>
75+
<div id=""
76+
*ngIf="authenticated">
7377

74-
<div class="alert alert-success">
75-
You are logged in!
76-
</div>
78+
<div class="alert alert-success">
79+
You are logged in!
80+
</div>
7781

82+
</div>
83+
</div>
7884
</div>
79-
</div>
8085
</div>
81-
</div>
8286
</div>

‎src/app/register/register.component.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
<div class="col-md-4 col-md-offset-4">
33
<div class="panel panel-default">
44
<div class="panel-heading">
5-
<h3 class="panel-title"><strong>Register</strong></h3>
5+
<h3 class="panel-title" id="forgot-password-title">
6+
Register
7+
</h3>
68
<div>
79
<a [routerLink]=" ['/forgot-password']" id="register-forgot-password-link">Forgot password?</a>
810
</div>

‎src/app/set-new-password/setNewPassword.component.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
<div class="col-md-4 col-md-offset-4">
33
<div class="panel panel-default">
44
<div class="panel-heading">
5-
<h3 class="panel-title"><strong>Set new password</strong></h3>
5+
<h3 class="panel-title" id="set-new-password-title">
6+
Set new password
7+
</h3>
68
<div>
79
<a [routerLink]=" ['/login']" id="set-new-password-login-link">Login?</a>
810
</div>

‎src/index.html‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,6 @@ <h3 class="panel-title"><strong>Loading ..</strong></h3>
6666
</div>
6767
</sv-app>
6868

69-
<!-- Google Analytics: change UA-71073175-1 to be your site's ID -->
70-
<script>
71-
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
72-
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
73-
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
74-
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
75-
76-
ga('create', 'UA-71073175-1', 'auto');
77-
ga('send', 'pageview');
78-
</script>
79-
8069
<% if (webpackConfig.metadata.ENV === 'development') { %>
8170
<!-- Webpack Dev Server reload -->
8271
<script src="/webpack-dev-server.js"></script>

‎test/e2e/authentication/forgot-password/forgotPassword.spec.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

0 commit comments

Comments
 (0)