#60 more fix fot tests

This commit is contained in:
Mario Romano
2016-05-17 14:00:42 +01:00
parent 847a350de2
commit 53d321e581
12 changed files with 107 additions and 103 deletions

View File

@@ -75,6 +75,6 @@ module.exports = function (config) {
] ]
}, },
singleRun: true singleRun: false
}) })
}; };

View File

@@ -73,6 +73,6 @@ module.exports = function (config) {
] ]
}, },
singleRun: true singleRun: false
}) })
}; };

View File

@@ -75,6 +75,6 @@ module.exports = function (config) {
] ]
}, },
singleRun: true singleRun: false
}) })
}; };

View File

@@ -32,7 +32,7 @@ import { Location, Router, RouteRegistry, ROUTER_PRIMARY_COMPONENT, Route } from
import { RootRouter } from 'angular2/src/router/router'; import { RootRouter } from 'angular2/src/router/router';
import { SpyLocation } from 'angular2/src/mock/location_mock'; import { SpyLocation } from 'angular2/src/mock/location_mock';
import { TranslateService } from 'ng2-translate/ng2-translate'; import { TranslateService } from 'ng2-translate/ng2-translate';
import { AlfrescoLoginComponent } from '../../src/components/alfresco-login'; import { AlfrescoLoginComponent } from './components/alfresco-login.component';
import { AuthenticationMock } from '../assets/authentication.service.mock'; import { AuthenticationMock } from '../assets/authentication.service.mock';
import { TranslationMock } from '../assets/translation.service.mock'; import { TranslationMock } from '../assets/translation.service.mock';

View File

@@ -27,8 +27,8 @@ declare let __moduleName: string;
selector: 'alfresco-login', selector: 'alfresco-login',
moduleId: __moduleName, moduleId: __moduleName,
directives: [ROUTER_DIRECTIVES, FORM_DIRECTIVES], directives: [ROUTER_DIRECTIVES, FORM_DIRECTIVES],
templateUrl: './alfresco-login.html', templateUrl: './alfresco-login.component.html',
styleUrls: ['./alfresco-login.css'], styleUrls: ['./alfresco-login.component.css'],
pipes: [TranslatePipe] pipes: [TranslatePipe]
}) })

View File

@@ -5,16 +5,16 @@ module.exports = function (config) {
basePath: '.', basePath: '.',
frameworks: ['jasmine'], frameworks: ['jasmine-ajax', 'jasmine'],
files: [ files: [
// paths loaded by Karma // paths loaded by Karma
{pattern: 'node_modules/angular2/bundles/angular2-polyfills.js', included: true, watched: false}, {pattern: 'node_modules/angular2/bundles/angular2-polyfills.js', included: true, watched: false},
{pattern: 'node_modules/systemjs/dist/system.src.js', included: true, watched: false}, {pattern: 'node_modules/systemjs/dist/system.src.js', included: true, watched: false},
{pattern: 'node_modules/rxjs/bundles/Rx.js', included: true, watched: false}, {pattern: 'node_modules/rxjs/bundles/Rx.js', included: true, watched: false},
{pattern: 'node_modules/angular2/bundles/angular2.dev.js', included: true, watched: false}, {pattern: 'node_modules/angular2/bundles/angular2.dev.js', included: true, served: true, watched: false},
{pattern: 'node_modules/angular2/bundles/testing.dev.js', included: true, watched: false}, {pattern: 'node_modules/angular2/bundles/testing.dev.js', included: true, served: true, watched: false},
{pattern: 'node_modules/angular2/bundles/http.dev.js', included: true, watched: false}, {pattern: 'node_modules/angular2/bundles/http.dev.js', included: true, served: true, watched: false},
{pattern: 'node_modules/angular2/bundles/router.dev.js', included: true, watched: false}, {pattern: 'node_modules/angular2/bundles/router.dev.js', included: true, watched: false},
{pattern: 'node_modules/alfresco-core-rest-api/bundle.js', included: true, watched: false}, {pattern: 'node_modules/alfresco-core-rest-api/bundle.js', included: true, watched: false},
{pattern: 'node_modules/ng2-translate/bundles/ng2-translate.js', included: true, watched: false}, {pattern: 'node_modules/ng2-translate/bundles/ng2-translate.js', included: true, watched: false},
@@ -53,6 +53,7 @@ module.exports = function (config) {
plugins: [ plugins: [
'karma-jasmine', 'karma-jasmine',
'karma-coverage', 'karma-coverage',
'karma-jasmine-ajax',
'karma-chrome-launcher', 'karma-chrome-launcher',
'karma-mocha-reporter' 'karma-mocha-reporter'
], ],
@@ -73,6 +74,8 @@ module.exports = function (config) {
{type: 'json', subdir: '.', file: 'coverage-final.json'}, {type: 'json', subdir: '.', file: 'coverage-final.json'},
{type: 'html'} {type: 'html'}
] ]
} },
singleRun: false
}) })
}; };

View File

@@ -65,6 +65,7 @@
"karma-chrome-launcher": "~1.0.1", "karma-chrome-launcher": "~1.0.1",
"karma-coverage": "^1.0.0", "karma-coverage": "^1.0.0",
"karma-jasmine": "~1.0.2", "karma-jasmine": "~1.0.2",
"karma-jasmine-ajax": "^0.1.13",
"karma-mocha-reporter": "^2.0.3", "karma-mocha-reporter": "^2.0.3",
"license-check": "^1.0.4", "license-check": "^1.0.4",
"remap-istanbul": "^0.6.3", "remap-istanbul": "^0.6.3",

View File

@@ -17,7 +17,7 @@
import { it, describe, expect, injectAsync, TestComponentBuilder } from 'angular2/testing'; import { it, describe, expect, injectAsync, TestComponentBuilder } from 'angular2/testing';
import { FileUploadingDialogComponent } from '../../src/components/file-uploading-dialog.component'; import { FileUploadingDialogComponent } from './file-uploading-dialog.component';
describe('FileUploadDialog', () => { describe('FileUploadDialog', () => {

View File

@@ -19,7 +19,7 @@
import { TEST_BROWSER_PLATFORM_PROVIDERS, TEST_BROWSER_APPLICATION_PROVIDERS } from 'angular2/platform/testing/browser'; import { TEST_BROWSER_PLATFORM_PROVIDERS, TEST_BROWSER_APPLICATION_PROVIDERS } from 'angular2/platform/testing/browser';
import { it, describe, expect, injectAsync, beforeEachProviders, TestComponentBuilder, setBaseTestProviders } from 'angular2/testing'; import { it, describe, expect, injectAsync, beforeEachProviders, TestComponentBuilder, setBaseTestProviders } from 'angular2/testing';
import { provide } from 'angular2/core'; import { provide } from 'angular2/core';
import { UploadButtonComponent } from '../../src/components/upload-button.component'; import { UploadButtonComponent } from './upload-button.component';
import { TranslateService } from 'ng2-translate/ng2-translate'; import { TranslateService } from 'ng2-translate/ng2-translate';
import { TranslationMock } from '../assets/translation.service.mock'; import { TranslationMock } from '../assets/translation.service.mock';

View File

@@ -16,8 +16,8 @@
*/ */
import { it, describe, beforeEach, expect } from 'angular2/testing'; import { it, describe, beforeEach, expect } from 'angular2/testing';
import { UploadService } from '../../src/services/upload.service'; import { UploadService } from './upload.service';
import { FileModel } from '../../src/models/file.model'; import { FileModel } from './../models/file.model';
declare let jasmine: any; declare let jasmine: any;