Skip to content

Commit

Permalink
chore(lint): upgrade angular-cli to beta25.5 and lint project
Browse files Browse the repository at this point in the history
  • Loading branch information
CarreraPHP committed Jan 13, 2017
1 parent e8d23b1 commit a287dc8
Show file tree
Hide file tree
Showing 12 changed files with 152 additions and 156 deletions.
6 changes: 3 additions & 3 deletions web/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ScaffoldingAll

This project was generated with [angular-cli](https://github.com/angular/angular-cli) version 1.0.0-beta.24.
This project was generated with [angular-cli](https://github.com/angular/angular-cli) version 1.0.0-beta.25.5.

## Development server
Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
Expand All @@ -22,9 +22,9 @@ Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.
Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
Before running the tests make sure you are serving the app via `ng serve`.

## Deploying to Github Pages
## Deploying to GitHub Pages

Run `ng github-pages:deploy` to deploy to Github Pages.
Run `ng github-pages:deploy` to deploy to GitHub Pages.

## Further help

Expand Down
13 changes: 9 additions & 4 deletions web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,15 @@
"scripts": {
"ng": "ng",
"start": "ng serve",
"lint": "tslint \"src/**/*.ts\"",
"lint": "tslint \"src/**/*.ts\" --project src/tsconfig.json --type-check && tslint \"e2e/**/*.ts\" --project e2e/tsconfig.json --type-check",
"test": "ng test",
"pree2e": "webdriver-manager update --standalone false --gecko false",
"e2e": "protractor"
"e2e": "protractor",
"prefirebase:init": "firebase init",
"firebase:init": "firebase init",
"postfirebase:init": "firebase init",
"prefirebase:deploy": "echo \"run firebase:init if deploy fails\" && ng build --prod",
"firebase:deploy": "firebase deploy"
},
"private": true,
"dependencies": {
Expand Down Expand Up @@ -39,7 +44,7 @@
"@types/jasmine": "2.5.38",
"@types/json5": "0.0.29",
"@types/node": "^6.0.42",
"angular-cli": "1.0.0-beta.24",
"angular-cli": "1.0.0-beta.25.5",
"codelyzer": "~2.0.0-beta.1",
"jasmine-core": "2.5.2",
"jasmine-spec-reporter": "2.5.0",
Expand All @@ -50,7 +55,7 @@
"karma-remap-istanbul": "^0.2.1",
"protractor": "~4.0.13",
"ts-node": "1.2.1",
"tslint": "^4.0.2",
"tslint": "^4.3.0",
"typescript": "~2.0.3"
}
}
12 changes: 6 additions & 6 deletions web/src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ describe('AppComponent', () => {
});

it('should create the app', async(() => {
let fixture = TestBed.createComponent(AppComponent);
let app = fixture.debugElement.componentInstance;
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.debugElement.componentInstance;
expect(app).toBeTruthy();
}));

it(`should have as title 'app works!'`, async(() => {
let fixture = TestBed.createComponent(AppComponent);
let app = fixture.debugElement.componentInstance;
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.debugElement.componentInstance;
expect(app.title).toEqual('app works!');
}));

it('should render title in a h1 tag', async(() => {
let fixture = TestBed.createComponent(AppComponent);
const fixture = TestBed.createComponent(AppComponent);
fixture.detectChanges();
let compiled = fixture.debugElement.nativeElement;
const compiled = fixture.debugElement.nativeElement;
expect(compiled.querySelector('h1').textContent).toContain('app works!');
}));
});
1 change: 0 additions & 1 deletion web/src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ import {Component} from '@angular/core';
styleUrls: ['./app.component.scss']
})
export class AppComponent {

}
Loading

0 comments on commit a287dc8

Please sign in to comment.