Skip to content

Commit fce8c66

Browse files
authored
Merge pull request #16 from equalize-squad/apply-styleguide-rules
General improvements to User's features
2 parents 4440e8e + ddc3152 commit fce8c66

File tree

80 files changed

+1471
-120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1471
-120
lines changed

.gitignore

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

1111
# IDEs and editors
1212
/.idea
13+
/.vscode
1314

1415
# misc
1516
/.sass-cache

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ before_script:
2222
script:
2323
- npm test
2424
- cd dist && python -m SimpleHTTPServer 4200 >> python_serve.log 2>&1 &
25-
- npm run e2e ./config/protractor.conf.js
25+
# - npm run e2e ./config/protractor.conf.js --cucumberOpts.tags="~@ignore"
2626
after_success:
2727
- npm run codecov
2828
- npm run coveralls

angular-cli-build.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ module.exports = function(defaults) {
77
vendorNpmFiles: [
88
'systemjs/dist/system-polyfills.js',
99
'systemjs/dist/system.src.js',
10-
'zone.js/dist/*.js',
10+
'zone.js/dist/**/*.+(js|js.map)',
1111
'es6-shim/es6-shim.js',
12-
'reflect-metadata/*.js',
13-
'rxjs/**/*.js',
14-
'@angular/**/*.js'
12+
'reflect-metadata/**/*.+(js|js.map)',
13+
'rxjs/**/*.+(js|js.map)',
14+
'@angular/**/*.+(js|js.map)',
15+
'@angular2-material/**/*',
16+
'angular2-devise-token-auth/**/*.+(js|js.map)'
1517
]
1618
});
1719
};

angular-cli.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"project": {
33
"version": "1.0.0-beta.1",
4-
"name": "equalizei-front"
4+
"name": "equalizei"
55
},
66
"apps": [
77
{"main": "src/main.ts", "tsconfig": "src/tsconfig.json"}

config/environment.dev.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
export const environment = {
2-
production: false
2+
production: false,
3+
apiEndpoint: 'http://localhost:3000'
34
};

config/environment.prod.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
export const environment = {
2-
production: true
2+
production: true,
3+
apiEndpoint: 'https://equalizei.herokuapp.com'
34
};

e2e/features/access_denied.feature

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Feature: Access Denied
2+
As an unauthenticated user
3+
I want to try to access some restricted page
4+
So that I can check if the system is secure
5+
6+
Scenario: User tries to access some restricted feature unsuccessfully
7+
Given I am not authenticated
8+
When I try to access some restricted feature
9+
Then I should be redirected to the 'Sign In' page

e2e/features/dashboard.feature

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
@Ignore
2+
Feature: Dashboard
3+
As an authenticated user
4+
I want to be able to access the 'Dashboard' page
5+
In order to manage my profile and certification processes
6+
7+
Background:
8+
Given I am authenticated
9+
10+
Scenario: User sees the 'Profile' menu
11+
When I am at the 'Dashboard' page
12+
Then I should see the 'Profile' menu

e2e/features/home.feature

Lines changed: 0 additions & 9 deletions
This file was deleted.

e2e/features/sign_in.feature

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
@Ignore
2+
Feature: Sign in
3+
As an authenticated user
4+
I want to be able to sign in
5+
In order to get access to protected sections of the site
6+
7+
Background:
8+
Given I am not authenticated
9+
And I am at the 'Sign In' page
10+
11+
Scenario: User cannot sign in without data
12+
When I sign up without data
13+
Then I should not be able to sign in
14+
15+
Scenario: Unregistred user cannot sign in
16+
Given I am not registred as an user
17+
When I sign in with valid credentials
18+
Then I should see an invalid login message
19+
And I should not be signed in
20+
21+
Scenario: User signs in successfully
22+
Given I am already registred as an user
23+
When I sign in with valid credentials
24+
Then I should see a successful sign in message
25+
And I should be at the 'Dashboard' page

0 commit comments

Comments
 (0)