diff --git a/ng2-components/ng2-alfresco-core/karma.conf.js b/ng2-components/ng2-alfresco-core/karma.conf.js index 97f90e9d4b..b179011187 100644 --- a/ng2-components/ng2-alfresco-core/karma.conf.js +++ b/ng2-components/ng2-alfresco-core/karma.conf.js @@ -75,6 +75,6 @@ module.exports = function (config) { ] }, - singleRun: true + singleRun: false }) }; diff --git a/ng2-components/ng2-alfresco-documentlist/karma.conf.js b/ng2-components/ng2-alfresco-documentlist/karma.conf.js index 0459318f82..abf85458d4 100644 --- a/ng2-components/ng2-alfresco-documentlist/karma.conf.js +++ b/ng2-components/ng2-alfresco-documentlist/karma.conf.js @@ -73,6 +73,6 @@ module.exports = function (config) { ] }, - singleRun: true + singleRun: false }) }; diff --git a/ng2-components/ng2-alfresco-login/karma.conf.js b/ng2-components/ng2-alfresco-login/karma.conf.js index d5ba842eb5..f717fb9d8d 100644 --- a/ng2-components/ng2-alfresco-login/karma.conf.js +++ b/ng2-components/ng2-alfresco-login/karma.conf.js @@ -75,6 +75,6 @@ module.exports = function (config) { ] }, - singleRun: true + singleRun: false }) }; diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.css b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.css similarity index 100% rename from ng2-components/ng2-alfresco-login/src/components/alfresco-login.css rename to ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.css diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.html b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html similarity index 100% rename from ng2-components/ng2-alfresco-login/src/components/alfresco-login.html rename to ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.html diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.spec.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts similarity index 99% rename from ng2-components/ng2-alfresco-login/src/components/alfresco-login.spec.ts rename to ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts index 6b31ad0580..d421b857ae 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.spec.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts @@ -32,7 +32,7 @@ import { Location, Router, RouteRegistry, ROUTER_PRIMARY_COMPONENT, Route } from import { RootRouter } from 'angular2/src/router/router'; import { SpyLocation } from 'angular2/src/mock/location_mock'; 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 { TranslationMock } from '../assets/translation.service.mock'; diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts similarity index 97% rename from ng2-components/ng2-alfresco-login/src/components/alfresco-login.ts rename to ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts index c1c136a59c..7c8dc83645 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts @@ -27,8 +27,8 @@ declare let __moduleName: string; selector: 'alfresco-login', moduleId: __moduleName, directives: [ROUTER_DIRECTIVES, FORM_DIRECTIVES], - templateUrl: './alfresco-login.html', - styleUrls: ['./alfresco-login.css'], + templateUrl: './alfresco-login.component.html', + styleUrls: ['./alfresco-login.component.css'], pipes: [TranslatePipe] }) diff --git a/ng2-components/ng2-alfresco-upload/karma.conf.js b/ng2-components/ng2-alfresco-upload/karma.conf.js index 77ad312fc2..579315e28f 100644 --- a/ng2-components/ng2-alfresco-upload/karma.conf.js +++ b/ng2-components/ng2-alfresco-upload/karma.conf.js @@ -5,16 +5,16 @@ module.exports = function (config) { basePath: '.', - frameworks: ['jasmine'], + frameworks: ['jasmine-ajax', 'jasmine'], files: [ // paths loaded by Karma {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/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/testing.dev.js', included: true, watched: false}, - {pattern: 'node_modules/angular2/bundles/http.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, served: 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/alfresco-core-rest-api/bundle.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: [ 'karma-jasmine', 'karma-coverage', + 'karma-jasmine-ajax', 'karma-chrome-launcher', 'karma-mocha-reporter' ], @@ -73,6 +74,8 @@ module.exports = function (config) { {type: 'json', subdir: '.', file: 'coverage-final.json'}, {type: 'html'} ] - } + }, + + singleRun: false }) }; diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json index b9e746aae8..03da0f7fab 100644 --- a/ng2-components/ng2-alfresco-upload/package.json +++ b/ng2-components/ng2-alfresco-upload/package.json @@ -1,91 +1,92 @@ { - "name": "ng2-alfresco-upload", - "description": "Alfresco Angular2 Upload Component", - "version": "0.1.0", - "author": "Alfresco Software, Ltd.", - "scripts": { - "postinstall": "npm run typings", - "typings": "typings install", - "start": "npm run test && http-server -c-1 -o -p 8875 .", - "build": "npm run tslint && typings install && rm -rf dist && tsc && npm run copytemplates && license-check", - "tslint": "npm run tslint-test && npm run tslint-src && npm run tslint-root", - "tslint-test": "tslint -c tslint.json test/**/*.ts", - "tslint-src": "tslint -c tslint.json src/**/*.ts", - "tslint-root": "tslint -c tslint.json *.ts", - "copytemplates": "npm run copy-html && npm run copy-css", - "copy-html": "copyfiles './src/**/*.html' dist", - "copy-css": "copyfiles './src/**/*.css' dist", - "licensecheck": "license-check", - "tsc": "tsc", - "pretest": "npm run build", - "test": "karma start karma.conf.js", - "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html", - "coverage": "http-server -c-1 -o -p 9875 ./coverage" - }, - "repository": { - "type": "git", - "url": "https://github.com/Alfresco/dev-platform-webcomponents.git" - }, - "bugs": { - "url": "https://github.com/Alfresco/dev-platform-webcomponents/issues" - }, - "license": "Apache-2.0", - "contributors": [ - { - "name": "Mario Romano", - "email": "mario.romano83@gmail.com" - } - ], - "keywords": [ - "ng2", - "angular", - "angular2", - "alfresco" - ], - "dependencies": { - "angular2": "2.0.0-beta.15", - "systemjs": "0.19.26", - "es6-shim": "^0.35.0", - "reflect-metadata": "0.1.2", - "rxjs": "5.0.0-beta.2", - "ng2-translate": "^1.11.2", - "zone.js": "^0.6.12", - "es6-module-loader": "^0.17.8" - }, - "peerDependencies": { - "angular2": "2.0.0-beta.15" - }, - "devDependencies": { - "copyfiles": "^0.2.1", - "coveralls": "^2.11.9", - "http-server": "0.8.5", - "jasmine-ajax": "^3.2.0", - "jasmine-core": "2.4.1", - "karma": "~0.13.22", - "karma-chrome-launcher": "~1.0.1", - "karma-coverage": "^1.0.0", - "karma-jasmine": "~1.0.2", - "karma-mocha-reporter": "^2.0.3", - "license-check": "^1.0.4", - "remap-istanbul": "^0.6.3", - "traceur": "^0.0.91", - "tslint": "^3.8.1", - "typescript": "^1.8.10", - "typings": "^0.7.12" - }, - "license-check-config": { - "src": [ - "**/*.js", - "**/*.ts", - "!/**/coverage/**/*", - "!/**/demo/**/*", - "!/**/node_modules/**/*", - "!/**/typings/**/*", - "!*.js" - ], - "path": "assets/license_header.txt", - "blocking": false, - "logInfo": false, - "logError": true + "name": "ng2-alfresco-upload", + "description": "Alfresco Angular2 Upload Component", + "version": "0.1.0", + "author": "Alfresco Software, Ltd.", + "scripts": { + "postinstall": "npm run typings", + "typings": "typings install", + "start": "npm run test && http-server -c-1 -o -p 8875 .", + "build": "npm run tslint && typings install && rm -rf dist && tsc && npm run copytemplates && license-check", + "tslint": "npm run tslint-test && npm run tslint-src && npm run tslint-root", + "tslint-test": "tslint -c tslint.json test/**/*.ts", + "tslint-src": "tslint -c tslint.json src/**/*.ts", + "tslint-root": "tslint -c tslint.json *.ts", + "copytemplates": "npm run copy-html && npm run copy-css", + "copy-html": "copyfiles './src/**/*.html' dist", + "copy-css": "copyfiles './src/**/*.css' dist", + "licensecheck": "license-check", + "tsc": "tsc", + "pretest": "npm run build", + "test": "karma start karma.conf.js", + "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html", + "coverage": "http-server -c-1 -o -p 9875 ./coverage" + }, + "repository": { + "type": "git", + "url": "https://github.com/Alfresco/dev-platform-webcomponents.git" + }, + "bugs": { + "url": "https://github.com/Alfresco/dev-platform-webcomponents/issues" + }, + "license": "Apache-2.0", + "contributors": [ + { + "name": "Mario Romano", + "email": "mario.romano83@gmail.com" } + ], + "keywords": [ + "ng2", + "angular", + "angular2", + "alfresco" + ], + "dependencies": { + "angular2": "2.0.0-beta.15", + "systemjs": "0.19.26", + "es6-shim": "^0.35.0", + "reflect-metadata": "0.1.2", + "rxjs": "5.0.0-beta.2", + "ng2-translate": "^1.11.2", + "zone.js": "^0.6.12", + "es6-module-loader": "^0.17.8" + }, + "peerDependencies": { + "angular2": "2.0.0-beta.15" + }, + "devDependencies": { + "copyfiles": "^0.2.1", + "coveralls": "^2.11.9", + "http-server": "0.8.5", + "jasmine-ajax": "^3.2.0", + "jasmine-core": "2.4.1", + "karma": "~0.13.22", + "karma-chrome-launcher": "~1.0.1", + "karma-coverage": "^1.0.0", + "karma-jasmine": "~1.0.2", + "karma-jasmine-ajax": "^0.1.13", + "karma-mocha-reporter": "^2.0.3", + "license-check": "^1.0.4", + "remap-istanbul": "^0.6.3", + "traceur": "^0.0.91", + "tslint": "^3.8.1", + "typescript": "^1.8.10", + "typings": "^0.7.12" + }, + "license-check-config": { + "src": [ + "**/*.js", + "**/*.ts", + "!/**/coverage/**/*", + "!/**/demo/**/*", + "!/**/node_modules/**/*", + "!/**/typings/**/*", + "!*.js" + ], + "path": "assets/license_header.txt", + "blocking": false, + "logInfo": false, + "logError": true + } } diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts index f7664a6c56..5f2aad6cbc 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts @@ -17,7 +17,7 @@ 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', () => { diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts index 28ec9d463c..36c643af89 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts @@ -19,7 +19,7 @@ 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 { 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 { TranslationMock } from '../assets/translation.service.mock'; diff --git a/ng2-components/ng2-alfresco-upload/src/services/upload.service.spec.ts b/ng2-components/ng2-alfresco-upload/src/services/upload.service.spec.ts index 772f6b2475..83eb896e5d 100644 --- a/ng2-components/ng2-alfresco-upload/src/services/upload.service.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/services/upload.service.spec.ts @@ -16,8 +16,8 @@ */ import { it, describe, beforeEach, expect } from 'angular2/testing'; -import { UploadService } from '../../src/services/upload.service'; -import { FileModel } from '../../src/models/file.model'; +import { UploadService } from './upload.service'; +import { FileModel } from './../models/file.model'; declare let jasmine: any;