fixing viewer test and minor fix

This commit is contained in:
Eugenio Romano
2016-08-18 17:06:46 +01:00
parent d9d7b27c64
commit 96de0171ec
5 changed files with 4 additions and 42 deletions

View File

@@ -38,7 +38,7 @@ describe('AlfrescoLogin', () => {
beforeEachProviders(() => { beforeEachProviders(() => {
return [ return [
{ provide: AlfrescoAuthenticationService, useClass: AuthenticationMock }, { provide: AlfrescoAuthenticationService, useClass: AuthenticationMock },
{ provide: AlfrescoSettingsService, useClass: AlfrescoSettingsService }, AlfrescoSettingsService,
{ provide: AlfrescoTranslationService, useClass: TranslationMock } { provide: AlfrescoTranslationService, useClass: TranslationMock }
]; ];
}); });

View File

@@ -1,36 +0,0 @@
/*!
* @license
* Copyright 2016 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { Injectable } from '@angular/core';
@Injectable()
export class AlfrescoSettingsServiceMock {
static DEFAULT_HOST_ADDRESS: string = 'fakehost';
private providers: string[] = ['ECM', 'BPM'];
private _host: string = AlfrescoSettingsServiceMock.DEFAULT_HOST_ADDRESS;
public get ecmHost(): string {
return this._host;
}
getProviders(): string [] {
return this.providers;
}
}

View File

@@ -23,7 +23,6 @@ import {PDFJSmock} from './assets/PDFJS.mock';
import {PDFViewermock} from './assets/PDFViewer.mock'; import {PDFViewermock} from './assets/PDFViewer.mock';
import {EventMock} from './assets/event.mock'; import {EventMock} from './assets/event.mock';
import { AlfrescoSettingsServiceMock } from '../src/assets/AlfrescoSettingsService.service.mock';
import { AlfrescoAuthenticationService, AlfrescoSettingsService } from 'ng2-alfresco-core'; import { AlfrescoAuthenticationService, AlfrescoSettingsService } from 'ng2-alfresco-core';
describe('PdfViewer', () => { describe('PdfViewer', () => {
@@ -33,7 +32,7 @@ describe('PdfViewer', () => {
beforeEachProviders(() => { beforeEachProviders(() => {
return [ return [
{provide: AlfrescoSettingsService, useClass: AlfrescoSettingsServiceMock}, AlfrescoSettingsService,
AlfrescoAuthenticationService AlfrescoAuthenticationService
]; ];
}); });

View File

@@ -19,14 +19,13 @@ import { describe, expect, it, inject, beforeEachProviders } from '@angular/core
import { TestComponentBuilder } from '@angular/compiler/testing'; import { TestComponentBuilder } from '@angular/compiler/testing';
import { ViewerComponent } from './viewer.component'; import { ViewerComponent } from './viewer.component';
import { EventMock } from './assets/event.mock'; import { EventMock } from './assets/event.mock';
import { AlfrescoSettingsServiceMock } from '../src/assets/AlfrescoSettingsService.service.mock';
import { AlfrescoAuthenticationService, AlfrescoSettingsService } from 'ng2-alfresco-core'; import { AlfrescoAuthenticationService, AlfrescoSettingsService } from 'ng2-alfresco-core';
describe('ViewerComponent', () => { describe('ViewerComponent', () => {
beforeEachProviders(() => { beforeEachProviders(() => {
return [ return [
{provide: AlfrescoSettingsService, useClass: AlfrescoSettingsServiceMock}, AlfrescoSettingsService,
AlfrescoAuthenticationService AlfrescoAuthenticationService
]; ];
}); });

View File

@@ -29,7 +29,7 @@ for PACKAGE in \
do do
DESTDIR="$DIR/../ng2-components/${PACKAGE}" DESTDIR="$DIR/../ng2-components/${PACKAGE}"
echo "====== UPDATE VERSION of ${PACKAGE} to ${VERSION} version in all the package.json ======" echo "====== UPDATE VERSION of ${PACKAGE} to ${VERSION} version in all the package.json ======"
find ././../ -type f -name package.json -print0 | xargs -0 sed -i '' "s/\"${PACKAGE}\": \"0\\.2\\.0\"/\"${PACKAGE}\": \"${VERSION}\"/g" find ././../ -type f -name package.json -prinnpm lit0 | xargs -0 sed -i '' "s/\"${PACKAGE}\": \"0\\.2\\.0\"/\"${PACKAGE}\": \"${VERSION}\"/g"
done done
for PACKAGE in \ for PACKAGE in \