From c4a593f9a2933efb7d070e83dacd1e986bc7752a Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Mon, 5 Sep 2016 10:23:27 +0100 Subject: [PATCH] Fix unit tests --- .../ng2-activiti-form/src/services/form.service.spec.ts | 3 ++- .../src/services/activiti-process.service.spec.ts | 3 ++- .../src/services/activiti-tasklist.service.spec.ts | 3 ++- .../alfresco-search-autocomplete.component.spec.ts | 2 ++ .../components/alfresco-search-control.component.spec.ts | 8 +++++++- .../src/components/alfresco-search.component.spec.ts | 2 ++ .../src/services/alfresco-search.service.spec.ts | 3 ++- .../src/services/upload.service.spec.ts | 4 ++-- .../src/webscript.component.spec.ts | 3 ++- 9 files changed, 23 insertions(+), 8 deletions(-) diff --git a/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts b/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts index a93a0abe25..577963736e 100644 --- a/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts +++ b/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts @@ -16,7 +16,7 @@ */ import { it, inject, describe, expect, beforeEach, beforeEachProviders, afterEach } from '@angular/core/testing'; -import { AlfrescoAuthenticationService, AlfrescoSettingsService } from 'ng2-alfresco-core'; +import { AlfrescoAuthenticationService, AlfrescoSettingsService, AlfrescoApiService } from 'ng2-alfresco-core'; import { HTTP_PROVIDERS, Response, ResponseOptions } from '@angular/http'; import { FormService } from './form.service'; import { EcmModelService } from './ecm-model.service'; @@ -32,6 +32,7 @@ describe('FormService', () => { return [ FormService, AlfrescoSettingsService, + AlfrescoApiService, AlfrescoAuthenticationService, EcmModelService, HTTP_PROVIDERS, diff --git a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts index ddfe2d0ab9..a5695d4a21 100644 --- a/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/services/activiti-process.service.spec.ts @@ -16,7 +16,7 @@ */ import { it, describe, expect, beforeEachProviders, beforeEach, inject } from '@angular/core/testing'; -import { AlfrescoAuthenticationService, AlfrescoSettingsService } from 'ng2-alfresco-core'; +import { AlfrescoAuthenticationService, AlfrescoSettingsService, AlfrescoApiService } from 'ng2-alfresco-core'; import { ActivitiProcessService } from './activiti-process.service'; // import { ProcessInstance } from '../models/process-instance'; @@ -28,6 +28,7 @@ describe('ActivitiProcessService', () => { return [ ActivitiProcessService, AlfrescoSettingsService, + AlfrescoApiService, AlfrescoAuthenticationService ]; }); diff --git a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts b/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts index 8684988f3a..982d9642f6 100644 --- a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts @@ -17,7 +17,7 @@ import { it, describe, inject, beforeEach, beforeEachProviders } from '@angular/core/testing'; import { ActivitiTaskListService } from './activiti-tasklist.service'; -import { AlfrescoSettingsService, AlfrescoAuthenticationService } from 'ng2-alfresco-core'; +import { AlfrescoSettingsService, AlfrescoAuthenticationService, AlfrescoApiService } from 'ng2-alfresco-core'; import { TaskDetailsModel } from '../models/task-details.model'; import { Comment } from '../models/comment.model'; @@ -97,6 +97,7 @@ describe('ActivitiTaskListService', () => { return [ ActivitiTaskListService, AlfrescoSettingsService, + AlfrescoApiService, AlfrescoAuthenticationService ]; }); diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts index dd1474c155..a2a6f261d2 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts @@ -22,6 +22,7 @@ import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.servi import { TranslationMock } from './../assets/translation.service.mock'; import { AlfrescoSearchService } from '../services/alfresco-search.service'; import { + AlfrescoApiService, AlfrescoSettingsService, AlfrescoAuthenticationService, AlfrescoContentService, @@ -68,6 +69,7 @@ describe('AlfrescoSearchAutocompleteComponent', () => { {provide: AlfrescoTranslationService, useClass: TranslationMock}, AlfrescoThumbnailService, AlfrescoSettingsService, + AlfrescoApiService, AlfrescoAuthenticationService, AlfrescoContentService, AlfrescoSearchService diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts index daaa56deee..f06af22be2 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts @@ -21,7 +21,12 @@ import { TestComponentBuilder } from '@angular/compiler/testing'; import { AlfrescoSearchControlComponent } from './alfresco-search-control.component'; import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.service'; import { TranslationMock } from './../assets/translation.service.mock'; -import { AlfrescoSettingsService, AlfrescoAuthenticationService, AlfrescoContentService, AlfrescoTranslationService +import { + AlfrescoSettingsService, + AlfrescoApiService, + AlfrescoAuthenticationService, + AlfrescoContentService, + AlfrescoTranslationService } from 'ng2-alfresco-core'; import { AlfrescoSearchService } from '../services/alfresco-search.service'; @@ -36,6 +41,7 @@ describe('AlfrescoSearchControlComponent', () => { provide(AlfrescoTranslationService, {useClass: TranslationMock}), AlfrescoThumbnailService, AlfrescoSettingsService, + AlfrescoApiService, AlfrescoAuthenticationService, AlfrescoContentService ]; diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts index d1ac7b7fa7..055a6f043a 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts @@ -24,6 +24,7 @@ import { TranslationMock } from './../assets/translation.service.mock'; import { AlfrescoSearchService } from '../services/alfresco-search.service'; import { AlfrescoSettingsService, + AlfrescoApiService, AlfrescoAuthenticationService, AlfrescoContentService, AlfrescoTranslationService @@ -70,6 +71,7 @@ describe('AlfrescoSearchComponent', () => { {provide: AlfrescoTranslationService, useClass: TranslationMock}, AlfrescoThumbnailService, AlfrescoSettingsService, + AlfrescoApiService, AlfrescoAuthenticationService, AlfrescoContentService ]; diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts index e72f0c8509..64e4062759 100644 --- a/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts +++ b/ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.spec.ts @@ -17,7 +17,7 @@ import { it, describe, beforeEach, inject, beforeEachProviders } from '@angular/core/testing'; import { AlfrescoSearchService } from './alfresco-search.service'; -import { AlfrescoAuthenticationService, AlfrescoSettingsService } from 'ng2-alfresco-core'; +import { AlfrescoAuthenticationService, AlfrescoSettingsService, AlfrescoApiService } from 'ng2-alfresco-core'; declare let jasmine: any; @@ -58,6 +58,7 @@ describe('AlfrescoSearchService', () => { return [ AlfrescoSearchService, AlfrescoSettingsService, + AlfrescoApiService, AlfrescoAuthenticationService ]; }); 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 71edad5b85..395aa9ae04 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 @@ -87,7 +87,7 @@ describe('AlfrescoUploadService', () => { service.uploadFilesInTheQueue('fake-dir', emitter); let request = jasmine.Ajax.requests.mostRecent(); - expect(request.url).toBe('http://localhost:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/-root-/children?autoRename=true'); + expect(request.url).toBe('http://127.0.0.1:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/-root-/children?autoRename=true'); expect(request.method).toBe('POST'); jasmine.Ajax.requests.mostRecent().respondWith({ @@ -109,7 +109,7 @@ describe('AlfrescoUploadService', () => { service.addToQueue(filesFake); service.uploadFilesInTheQueue('', emitter); expect(jasmine.Ajax.requests.mostRecent().url) - .toBe('http://localhost:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/-root-/children?autoRename=true'); + .toBe('http://127.0.0.1:8080/alfresco/api/-default-/public/alfresco/versions/1/nodes/-root-/children?autoRename=true'); jasmine.Ajax.requests.mostRecent().respondWith({ 'status': 404, diff --git a/ng2-components/ng2-alfresco-webscript/src/webscript.component.spec.ts b/ng2-components/ng2-alfresco-webscript/src/webscript.component.spec.ts index bdade46782..fd11aa8534 100644 --- a/ng2-components/ng2-alfresco-webscript/src/webscript.component.spec.ts +++ b/ng2-components/ng2-alfresco-webscript/src/webscript.component.spec.ts @@ -19,7 +19,7 @@ import { describe, expect, it, inject, beforeEachProviders, beforeEach, afterEac import { TestComponentBuilder } from '@angular/compiler/testing'; import { WebscriptComponent } from '../src/webscript.component'; -import { AlfrescoAuthenticationService, AlfrescoSettingsService } from 'ng2-alfresco-core'; +import { AlfrescoAuthenticationService, AlfrescoSettingsService, AlfrescoApiService } from 'ng2-alfresco-core'; declare let jasmine: any; @@ -30,6 +30,7 @@ describe('Test ng2-alfresco-webscript', () => { beforeEachProviders(() => { return [ AlfrescoSettingsService, + AlfrescoApiService, AlfrescoAuthenticationService ]; });