From 96de0171ec0d1e8e7cba015c8dd9393715b3cbdb Mon Sep 17 00:00:00 2001
From: Eugenio Romano <eugenio.romano@alfresco.com>
Date: Thu, 18 Aug 2016 17:06:46 +0100
Subject: [PATCH] fixing viewer test and minor fix

---
 .../alfresco-login.component.spec.ts          |  2 +-
 .../AlfrescoSettingsService.service.mock.ts   | 36 -------------------
 .../src/pdfViewer.component.spec.ts           |  3 +-
 .../src/viewer.component.spec.ts              |  3 +-
 scripts/update-version.sh                     |  2 +-
 5 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 ng2-components/ng2-alfresco-viewer/src/assets/AlfrescoSettingsService.service.mock.ts

diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts
index 4f6a1897ba..9d39107f0c 100644
--- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts
+++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.spec.ts
@@ -38,7 +38,7 @@ describe('AlfrescoLogin', () => {
     beforeEachProviders(() => {
         return [
             { provide: AlfrescoAuthenticationService, useClass: AuthenticationMock },
-            { provide: AlfrescoSettingsService, useClass: AlfrescoSettingsService },
+            AlfrescoSettingsService,
             { provide: AlfrescoTranslationService, useClass: TranslationMock }
         ];
     });
diff --git a/ng2-components/ng2-alfresco-viewer/src/assets/AlfrescoSettingsService.service.mock.ts b/ng2-components/ng2-alfresco-viewer/src/assets/AlfrescoSettingsService.service.mock.ts
deleted file mode 100644
index 354b652ed8..0000000000
--- a/ng2-components/ng2-alfresco-viewer/src/assets/AlfrescoSettingsService.service.mock.ts
+++ /dev/null
@@ -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;
-    }
-}
diff --git a/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.spec.ts b/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.spec.ts
index 465393c122..3d45676909 100644
--- a/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.spec.ts
+++ b/ng2-components/ng2-alfresco-viewer/src/pdfViewer.component.spec.ts
@@ -23,7 +23,6 @@ import {PDFJSmock} from './assets/PDFJS.mock';
 import {PDFViewermock} from './assets/PDFViewer.mock';
 import {EventMock} from './assets/event.mock';
 
-import { AlfrescoSettingsServiceMock } from '../src/assets/AlfrescoSettingsService.service.mock';
 import { AlfrescoAuthenticationService, AlfrescoSettingsService } from 'ng2-alfresco-core';
 
 describe('PdfViewer', () => {
@@ -33,7 +32,7 @@ describe('PdfViewer', () => {
 
     beforeEachProviders(() => {
         return [
-            {provide: AlfrescoSettingsService, useClass: AlfrescoSettingsServiceMock},
+            AlfrescoSettingsService,
             AlfrescoAuthenticationService
         ];
     });
diff --git a/ng2-components/ng2-alfresco-viewer/src/viewer.component.spec.ts b/ng2-components/ng2-alfresco-viewer/src/viewer.component.spec.ts
index 76b9ec047f..358cbcb0d9 100644
--- a/ng2-components/ng2-alfresco-viewer/src/viewer.component.spec.ts
+++ b/ng2-components/ng2-alfresco-viewer/src/viewer.component.spec.ts
@@ -19,14 +19,13 @@ import { describe, expect, it, inject, beforeEachProviders } from '@angular/core
 import { TestComponentBuilder } from '@angular/compiler/testing';
 import { ViewerComponent } from './viewer.component';
 import { EventMock } from './assets/event.mock';
-import { AlfrescoSettingsServiceMock } from '../src/assets/AlfrescoSettingsService.service.mock';
 import { AlfrescoAuthenticationService, AlfrescoSettingsService } from 'ng2-alfresco-core';
 
  describe('ViewerComponent', () => {
 
      beforeEachProviders(() => {
          return [
-             {provide: AlfrescoSettingsService, useClass: AlfrescoSettingsServiceMock},
+             AlfrescoSettingsService,
              AlfrescoAuthenticationService
          ];
      });
diff --git a/scripts/update-version.sh b/scripts/update-version.sh
index 11e116989e..95c42fdfa6 100755
--- a/scripts/update-version.sh
+++ b/scripts/update-version.sh
@@ -29,7 +29,7 @@ for PACKAGE in \
 do
   DESTDIR="$DIR/../ng2-components/${PACKAGE}"
   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
 
 for PACKAGE in \