From c82b69a4bff56b2a1d3b4678562e3c52ee246c28 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Thu, 18 Aug 2016 17:12:16 +0100 Subject: [PATCH] fix upload mock --- .../src/assets/alfresco.service.mock.ts | 41 ------------------- .../AlfrescoSettingsService.service.mock.ts | 36 ---------------- .../upload-button.component.spec.ts | 4 +- .../upload-drag-area.component.spec.ts | 3 +- .../src/services/upload.service.spec.ts | 7 ++-- 5 files changed, 6 insertions(+), 85 deletions(-) delete mode 100644 ng2-components/ng2-alfresco-search/src/assets/alfresco.service.mock.ts delete mode 100644 ng2-components/ng2-alfresco-upload/src/assets/AlfrescoSettingsService.service.mock.ts diff --git a/ng2-components/ng2-alfresco-search/src/assets/alfresco.service.mock.ts b/ng2-components/ng2-alfresco-search/src/assets/alfresco.service.mock.ts deleted file mode 100644 index cba51e6585..0000000000 --- a/ng2-components/ng2-alfresco-search/src/assets/alfresco.service.mock.ts +++ /dev/null @@ -1,41 +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 {Observable} from 'rxjs/Rx'; - -import { - AlfrescoAuthenticationService -} from 'ng2-alfresco-core'; -import {AlfrescoSearchService} from './../../src/services/alfresco-search.service'; - -export class AlfrescoServiceMock extends AlfrescoSearchService { - - _folderToReturn: any = {}; - - constructor( - authService: AlfrescoAuthenticationService = null - ) { - super(authService); - } - - getFolder(folder: string) { - return Observable.create(observer => { - observer.next(this._folderToReturn); - observer.complete(); - }); - } -} diff --git a/ng2-components/ng2-alfresco-upload/src/assets/AlfrescoSettingsService.service.mock.ts b/ng2-components/ng2-alfresco-upload/src/assets/AlfrescoSettingsService.service.mock.ts deleted file mode 100644 index 354b652ed8..0000000000 --- a/ng2-components/ng2-alfresco-upload/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-upload/src/components/upload-button.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts index 8d30847464..25081c240b 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 @@ -21,8 +21,8 @@ import { UploadButtonComponent } from './upload-button.component'; import { AlfrescoTranslationService, AlfrescoSettingsService, AlfrescoAuthenticationService } from 'ng2-alfresco-core'; import { TranslationMock } from '../assets/translation.service.mock'; import { UploadService } from '../services/upload.service'; -import { AlfrescoSettingsServiceMock } from '../assets/AlfrescoSettingsService.service.mock'; import { HTTP_PROVIDERS } from '@angular/http'; + declare var AlfrescoApi: any; describe('AlfrescoUploadButton', () => { @@ -69,7 +69,7 @@ describe('AlfrescoUploadButton', () => { beforeEachProviders(() => { return [ HTTP_PROVIDERS, - { provide: AlfrescoSettingsService, useClass: AlfrescoSettingsServiceMock }, + AlfrescoSettingsService, AlfrescoAuthenticationService, { provide: AlfrescoTranslationService, useClass: TranslationMock }, UploadService diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts index 51030ab9bc..d90e49f0f9 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.spec.ts @@ -19,7 +19,6 @@ import { describe, expect, it, inject, beforeEach, beforeEachProviders } from '@ import { TestComponentBuilder } from '@angular/compiler/testing'; import { UploadDragAreaComponent } from './upload-drag-area.component'; import { AlfrescoTranslationService, AlfrescoSettingsService, AlfrescoAuthenticationService } from 'ng2-alfresco-core'; -import { AlfrescoSettingsServiceMock } from '../assets/AlfrescoSettingsService.service.mock'; import { TranslationMock } from '../assets/translation.service.mock'; import { UploadService } from '../services/upload.service'; import { HTTP_PROVIDERS } from '@angular/http'; @@ -38,7 +37,7 @@ describe('AlfrescoUploadDragArea', () => { beforeEachProviders(() => { return [ HTTP_PROVIDERS, - { provide: AlfrescoSettingsService, useClass: AlfrescoSettingsServiceMock }, + AlfrescoSettingsService, AlfrescoAuthenticationService, { provide: AlfrescoTranslationService, useClass: TranslationMock }, UploadService 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 34762123d2..b0b220c4e5 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 @@ -19,7 +19,6 @@ import { it, describe, inject, beforeEach, beforeEachProviders } from '@angular/ import { EventEmitter } from '@angular/core'; import { UploadService } from './upload.service'; import { AlfrescoSettingsService, AlfrescoAuthenticationService } from 'ng2-alfresco-core'; -import { AlfrescoSettingsServiceMock } from '../assets/AlfrescoSettingsService.service.mock'; declare let AlfrescoApi: any; declare let jasmine: any; @@ -39,7 +38,7 @@ describe('AlfrescoUploadService', () => { beforeEachProviders(() => { return [ - { provide: AlfrescoSettingsService, useClass: AlfrescoSettingsServiceMock }, + AlfrescoSettingsService, AlfrescoAuthenticationService, UploadService ]; @@ -86,7 +85,7 @@ describe('AlfrescoUploadService', () => { service.uploadFilesInTheQueue('fake-dir', emitter); let request = jasmine.Ajax.requests.mostRecent(); - expect(request.url).toBe('fakehost/alfresco/api/-default-/public/alfresco/versions/1/nodes/-root-/children'); + expect(request.url).toBe('http://localhost:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/-root-/children'); expect(request.method).toBe('POST'); jasmine.Ajax.requests.mostRecent().respondWith({ @@ -108,7 +107,7 @@ describe('AlfrescoUploadService', () => { service.addToQueue(filesFake); service.uploadFilesInTheQueue('', emitter); expect(jasmine.Ajax.requests.mostRecent().url) - .toBe('fakehost/alfresco/api/-default-/public/alfresco/versions/1/nodes/-root-/children'); + .toBe('http://localhost:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/-root-/children'); jasmine.Ajax.requests.mostRecent().respondWith({ 'status': 404, contentType: 'text/plain',