fix/ e2e test with jasmine2

This commit is contained in:
Maxime GRIS
2017-07-16 19:43:04 +02:00
parent 2a90191458
commit 9c51f3247b
5 changed files with 22 additions and 15 deletions

View File

@@ -1,4 +1,5 @@
import { AngularElectronPage } from './app.po'; import { AngularElectronPage } from './app.po';
import { browser, element, by } from 'protractor';
describe('angular-electron App', () => { describe('angular-electron App', () => {
let page: AngularElectronPage; let page: AngularElectronPage;
@@ -8,7 +9,6 @@ describe('angular-electron App', () => {
}); });
it('should display message saying App works !', () => { it('should display message saying App works !', () => {
page.navigateTo(); expect(element(by.css('app-home h1')).getText()).toMatch('App works !');
expect(page.getParagraphText()).toEqual('App works !');
}); });
}); });

View File

@@ -1,11 +1,8 @@
import { browser, element, by } from 'protractor'; import { browser, element, by } from 'protractor';
/* tslint:disable */
export class AngularElectronPage { export class AngularElectronPage {
navigateTo() { navigateTo(route: string) {
return browser.get('/'); return browser.get(route);
}
getParagraphText() {
return element(by.css('app-home h1')).getText();
} }
} }

View File

@@ -4,26 +4,28 @@
const { SpecReporter } = require('jasmine-spec-reporter'); const { SpecReporter } = require('jasmine-spec-reporter');
exports.config = { exports.config = {
allScriptsTimeout: 11000, allScriptsTimeout: 25000,
getPageTimeout: 15000,
delayBrowserTimeInSeconds: 0,
specs: [ specs: [
'./e2e/**/*.e2e-spec.ts' './e2e/**/*.e2e-spec.ts'
], ],
capabilities: { capabilities: {
'browserName': 'chrome', 'browserName': 'chrome',
chromeOptions: { chromeOptions: {
binary: './node_modules/electron/dist/electron.exe', binary: './node_modules/electron/dist/electron.exe',
args: ['--test-type=webdriver', 'app=dist/main.js'] args: ['--test-type=webdriver', 'app=dist/main.js']
} }
}, },
directConnect: true, directConnect: true,
baseUrl: 'http://localhost:4200/', baseUrl: 'http://localhost:4200/',
framework: 'jasmine', framework: 'jasmine2',
jasmineNodeOpts: { jasmineNodeOpts: {
showColors: true, showColors: true,
defaultTimeoutInterval: 30000, defaultTimeoutInterval: 30000,
print: function() {} print: function () { }
}, },
beforeLaunch: function() { beforeLaunch: function () {
require('ts-node').register({ require('ts-node').register({
project: 'e2e/tsconfig.e2e.json' project: 'e2e/tsconfig.e2e.json'
}); });

View File

@@ -8,6 +8,9 @@
}, },
"exclude": [ "exclude": [
"test.ts", "test.ts",
"**/*.spec.ts" "**/*.spec.ts",
"dist",
"app-builds",
"node_modules"
] ]
} }

View File

@@ -16,5 +16,10 @@
"include": [ "include": [
"**/*.spec.ts", "**/*.spec.ts",
"**/*.d.ts" "**/*.d.ts"
],
"exclude": [
"dist",
"app-builds",
"node_modules"
] ]
} }