diff --git a/ponyracer/e2e/app.e2e-spec.ts b/ponyracer/e2e/app.e2e-spec.ts index 98c1d470a..605376d44 100644 --- a/ponyracer/e2e/app.e2e-spec.ts +++ b/ponyracer/e2e/app.e2e-spec.ts @@ -7,10 +7,8 @@ describe('ponyracer App', () => { page = new PonyracerPage(); }); - it('should display welcome message', done => { + it('should display welcome message', () => { page.navigateTo(); - page.getParagraphText() - .then(msg => expect(msg).toEqual('Welcome to app!!')) - .then(done, done.fail); + expect(page.getParagraphText()).toEqual('Welcome to app!!'); }); }); diff --git a/ponyracer/e2e/tsconfig.e2e.json b/ponyracer/e2e/tsconfig.e2e.json index e2a9a2fc7..39b800f78 100644 --- a/ponyracer/e2e/tsconfig.e2e.json +++ b/ponyracer/e2e/tsconfig.e2e.json @@ -6,6 +6,7 @@ "target": "es5", "types": [ "jasmine", + "jasminewd2", "node" ] } diff --git a/ponyracer/package.json b/ponyracer/package.json index 9f79460e7..63990c259 100644 --- a/ponyracer/package.json +++ b/ponyracer/package.json @@ -26,10 +26,11 @@ "zone.js": "^0.8.4" }, "devDependencies": { - "@angular/cli": "1.1.0", + "@angular/cli": "1.2.0", "@angular/compiler-cli": "^4.0.0", "@angular/language-service": "^4.0.0", - "@types/jasmine": "2.5.45", + "@types/jasmine": "~2.5.53", + "@types/jasminewd2": "~2.0.2", "@types/node": "~6.0.60", "codelyzer": "~3.0.1", "jasmine-core": "~2.6.2", @@ -37,9 +38,9 @@ "karma": "~1.7.0", "karma-chrome-launcher": "~2.1.1", "karma-cli": "~1.0.1", + "karma-coverage-istanbul-reporter": "^1.2.1", "karma-jasmine": "~1.1.0", "karma-jasmine-html-reporter": "^0.2.2", - "karma-coverage-istanbul-reporter": "^1.2.1", "protractor": "~5.1.2", "ts-node": "~3.0.4", "tslint": "~5.3.2", diff --git a/ponyracer/src/app/app.component.html b/ponyracer/src/app/app.component.html index d0322ef6c..1a00adb0a 100644 --- a/ponyracer/src/app/app.component.html +++ b/ponyracer/src/app/app.component.html @@ -1,14 +1,14 @@ - +

Welcome to {{title}}!!

- +

Here are some links to help you start: