merge from ecomp a88f0072 - Modern UI

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

2 files changed, 21 insertions, 17 deletions

diff --git a/vid-webpack-master/src/app/shared/pipes/dynamicInputLabel/dynamic-input-label.pipe.spec.ts b/vid-webpack-master/src/app/shared/pipes/dynamicInputLabel/dynamic-input-label.pipe.spec.ts
index 22b619290..9938a1c57 100644
--- a/vid-webpack-master/src/app/shared/pipes/dynamicInputLabel/dynamic-input-label.pipe.spec.ts
+++ b/vid-webpack-master/src/app/shared/pipes/dynamicInputLabel/dynamic-input-label.pipe.spec.ts
@@ -1,43 +1,47 @@
 import { DynamicInputLabelPipe } from './dynamic-input-label.pipe';
+import {TestBed} from "@angular/core/testing";
 
 describe('Dynamic input label Pipe', () => {
-  let dynamicInputLabelPipe: DynamicInputLabelPipe;
 
-  beforeEach(() => {
+  let dynamicInputLabelPipe: DynamicInputLabelPipe;
+  beforeAll(done => (async () => {
+    TestBed.configureTestingModule({});
+    await TestBed.compileComponents();
     dynamicInputLabelPipe = new DynamicInputLabelPipe();
-  });
 
-  it('Dynamic input label Pipe should be defined', () => {
+  })().then(done).catch(done.fail));
+
+  test('Dynamic input label Pipe should be defined', () => {
     expect(dynamicInputLabelPipe).toBeDefined();
   });
 
-  it('Dynamic input label Pipe : Empty string should return empty string', ()=> {
+  test('Dynamic input label Pipe : Empty string should return empty string', ()=> {
       let result: string = dynamicInputLabelPipe.transform('');
-      expect(result).toEqual(':*');
+      expect(result).toEqual(':');
   });
 
-  it('Dynamic input label Pipe: vnf should be VNF (UPPERCASE)', ()=> {
+  test('Dynamic input label Pipe: vnf should be VNF (UPPERCASE)', ()=> {
     let result: string = dynamicInputLabelPipe.transform('vnf');
-    expect(result).toEqual('VNF:*');
+    expect(result).toEqual('VNF:');
   });
 
-  it('Dynamic input label Pipe : nf should be NF (UPPERCASE)\'', ()=> {
+  test('Dynamic input label Pipe : nf should be NF (UPPERCASE)\'', ()=> {
     let result: string = dynamicInputLabelPipe.transform('nf');
-    expect(result).toEqual('NF:*');
+    expect(result).toEqual('NF:');
   });
 
-  it('Dynamic input label Pipe : Underscore should replace by empty character', ()=> {
+  test('Dynamic input label Pipe : Underscore should replace by empty character', ()=> {
     let result: string = dynamicInputLabelPipe.transform('nf_Test');
-    expect(result).toEqual('NF test:*');
+    expect(result).toEqual('NF test:');
   });
 
-  it('Dynamic input label Pipe : Complex string', ()=> {
+  test('Dynamic input label Pipe : Complex string', ()=> {
     let result: string = dynamicInputLabelPipe.transform('nf_Test_vnf_nf');
-    expect(result).toEqual('NF test VNF NF:*');
+    expect(result).toEqual('NF test VNF NF:');
   });
 
-  it('Dynamic input label Pipe : First letter should be uppercase', ()=> {
+  test('Dynamic input label Pipe : First letter should be uppercase', ()=> {
     let result: string = dynamicInputLabelPipe.transform('nfr');
-    expect(result).toEqual('Nfr:*');
+    expect(result).toEqual('Nfr:');
   });
 });
diff --git a/vid-webpack-master/src/app/shared/pipes/dynamicInputLabel/dynamic-input-label.pipe.ts b/vid-webpack-master/src/app/shared/pipes/dynamicInputLabel/dynamic-input-label.pipe.ts
index bec87b46d..f0896befb 100644
--- a/vid-webpack-master/src/app/shared/pipes/dynamicInputLabel/dynamic-input-label.pipe.ts
+++ b/vid-webpack-master/src/app/shared/pipes/dynamicInputLabel/dynamic-input-label.pipe.ts
@@ -7,6 +7,6 @@ export class DynamicInputLabelPipe implements PipeTransform {
     let uppercase_vnf = split_label.replace(/\bvnf\b/ig, 'VNF');
     let uppercase_nf = uppercase_vnf.replace(/\bnf\b/ig, 'NF');
     let capitalize_sentence = uppercase_nf.charAt(0).toUpperCase() + uppercase_nf.slice(1);
-    return capitalize_sentence + ':*';
+    return capitalize_sentence + ':';
   }
 }