Skip to content

Commit

Permalink
fix/ e2e test with jasmine2
Browse files Browse the repository at this point in the history
  • Loading branch information
maximegris committed Jul 16, 2017
1 parent 2a90191 commit 9c51f32
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 15 deletions.
4 changes: 2 additions & 2 deletions e2e/app.e2e-spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { AngularElectronPage } from './app.po';
import { browser, element, by } from 'protractor';

describe('angular-electron App', () => {
let page: AngularElectronPage;
Expand All @@ -8,7 +9,6 @@ describe('angular-electron App', () => {
});

it('should display message saying App works !', () => {
page.navigateTo();
expect(page.getParagraphText()).toEqual('App works !');
expect(element(by.css('app-home h1')).getText()).toMatch('App works !');
});
});
9 changes: 3 additions & 6 deletions e2e/app.po.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import { browser, element, by } from 'protractor';

/* tslint:disable */
export class AngularElectronPage {
navigateTo() {
return browser.get('/');
}

getParagraphText() {
return element(by.css('app-home h1')).getText();
navigateTo(route: string) {
return browser.get(route);
}
}
14 changes: 8 additions & 6 deletions protractor.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,28 @@
const { SpecReporter } = require('jasmine-spec-reporter');

exports.config = {
allScriptsTimeout: 11000,
allScriptsTimeout: 25000,
getPageTimeout: 15000,
delayBrowserTimeInSeconds: 0,
specs: [
'./e2e/**/*.e2e-spec.ts'
],
capabilities: {
'browserName': 'chrome',
chromeOptions: {
binary: './node_modules/electron/dist/electron.exe',
args: ['--test-type=webdriver', 'app=dist/main.js']
binary: './node_modules/electron/dist/electron.exe',
args: ['--test-type=webdriver', 'app=dist/main.js']
}
},
directConnect: true,
baseUrl: 'http://localhost:4200/',
framework: 'jasmine',
framework: 'jasmine2',
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
print: function() {}
print: function () { }
},
beforeLaunch: function() {
beforeLaunch: function () {
require('ts-node').register({
project: 'e2e/tsconfig.e2e.json'
});
Expand Down
5 changes: 4 additions & 1 deletion src/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
},
"exclude": [
"test.ts",
"**/*.spec.ts"
"**/*.spec.ts",
"dist",
"app-builds",
"node_modules"
]
}
5 changes: 5 additions & 0 deletions src/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,10 @@
"include": [
"**/*.spec.ts",
"**/*.d.ts"
],
"exclude": [
"dist",
"app-builds",
"node_modules"
]
}

0 comments on commit 9c51f32

Please sign in to comment.