[ADF-763] Add Chrome default browser for karma chrome launcher for Chrome versi… (#1941)

* Add Chrome default browser for karma chrome launcher for Chrome version<59

* Fixing intermittently failing test in ng2-activiti-analytics component
This commit is contained in:
Popovics András
2017-06-07 15:08:34 +01:00
committed by Eugenio Romano
parent 6aa6a155e2
commit 8c68fbb50e
2 changed files with 2 additions and 3 deletions

View File

@@ -68,7 +68,7 @@ module.exports = function (config) {
browserDisconnectTolerance: 10, browserDisconnectTolerance: 10,
browserNoActivityTimeout: 3000000, browserNoActivityTimeout: 3000000,
browsers: ['Chrome_headless'], browsers: ['Chrome_headless', 'Chrome'],
customLaunchers: { customLaunchers: {
Chrome_travis_ci: { Chrome_travis_ci: {

View File

@@ -499,7 +499,7 @@ describe('AnalyticsReportParametersComponent', () => {
reportName.focus(); reportName.focus();
component.reportParameters.name = 'FAKE_TEST_NAME'; component.reportParameters.name = 'FAKE_TEST_NAME';
reportName.value = 'FAKE_TEST_NAME'; reportName.value = 'FAKE_TEST_NAME';
reportName.blur(); reportName.dispatchEvent(new Event('blur'));
fixture.detectChanges(); fixture.detectChanges();
fixture.whenStable().then(() => { fixture.whenStable().then(() => {
@@ -514,7 +514,6 @@ describe('AnalyticsReportParametersComponent', () => {
contentType: 'json', contentType: 'json',
responseText: analyticParamsMock.reportDefParamStatus responseText: analyticParamsMock.reportDefParamStatus
}); });
}); });
it('Should show a dialog to allowing report save', async(() => { it('Should show a dialog to allowing report save', async(() => {