merge from ecomp a88f0072 - Modern UI

Issue-ID: VID-378
Change-Id: Ibcb23dd27f550cf32ce2fe0239f0f496ae014ff6
Signed-off-by: Ittay Stern <ittay.stern@att.com>

1 files changed, 11 insertions, 10 deletions

diff --git a/vid-webpack-master/src/app/shared/components/messageBox/messageBox.service.spec.ts b/vid-webpack-master/src/app/shared/components/messageBox/messageBox.service.spec.ts
index 89562ac54..1d0e18ffb 100644
--- a/vid-webpack-master/src/app/shared/components/messageBox/messageBox.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/messageBox/messageBox.service.spec.ts
@@ -3,35 +3,37 @@ import {
   HttpClientTestingModule,
   HttpTestingController
 } from '@angular/common/http/testing';
-
 import { MessageBoxService } from './messageBox.service';
-import {MessageBoxData, ModalSize, ModalType } from './messageBox.data';
+import {MessageBoxData} from './messageBox.data';
+import { SdcUiCommon} from "onap-ui-angular";
 
 describe('MessageBoxService', () => {
   let injector;
   let service: MessageBoxService;
   let httpMock: HttpTestingController;
 
-  beforeEach(() => {
+  beforeAll(done => (async () => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule],
       providers: [MessageBoxService]
     });
+    await TestBed.compileComponents();
 
     injector = getTestBed();
     service = injector.get(MessageBoxService);
     httpMock = injector.get(HttpTestingController);
-  });
+
+  })().then(done).catch(done.fail));
 
   describe('#setConfig', () => {
-    it('should return <IModalConfig>', (done: DoneFn) => {
+    test('should return <IModalConfig>', () => {
       let title = "Delete Instantiation";
       let message = "You are about to stop the instantiation process of this service. \nAll data will be lost. Are you sure you want to stop?";
       let messageBoxData : MessageBoxData = new MessageBoxData(
         title,
         message,
-        ModalType.alert,
-        ModalSize.medium,
+        SdcUiCommon.ModalType.warning,
+        SdcUiCommon.ModalSize.medium,
         [
           {text:"Stop Instantiation", size:"large", closeModal:true},
           {text:"Cancel", size:"medium", closeModal:true}
@@ -41,9 +43,8 @@ describe('MessageBoxService', () => {
       expect(result.title).toEqual(title);
       expect(result.message).toEqual(message);
       expect(result.buttons.length).toEqual(2);
-      expect(result.type).toEqual(ModalType.alert);
-      expect(result.size).toEqual(ModalSize.medium);
-      done();
+      expect(result.type).toEqual(SdcUiCommon.ModalType.warning);
+      expect(result.size).toEqual(SdcUiCommon.ModalSize.medium);
     });
   });
 });