SHIBUI-1270 Fixed existing tests

TIER · Jul 16, 2019 · 226e377 · 226e377
1 parent 339c49e
commit 226e377
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 13 deletions.
diff --git a/ui/src/app/metadata/configuration/component/array-property.component.spec.ts b/ui/src/app/metadata/configuration/component/array-property.component.spec.ts
@@ -21,12 +21,12 @@ class TestHostComponent {
     @ViewChild(ArrayPropertyComponent)
     public componentUnderTest: ArrayPropertyComponent;
 
-    property: Property = getStepProperty(SCHEMA.properties.list, {
+    property: Property = getStepProperty(SCHEMA.properties.list, [{
         name: 'foo',
         type: 'baz',
         description: 'foo bar baz',
         list: []
-    }, SCHEMA.definitions);
+    }], SCHEMA.definitions);
 
     setProperty(property: Property): void {
         this.property = property;

diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.spec.ts b/ui/src/app/metadata/configuration/component/metadata-configuration.component.spec.ts
@@ -14,6 +14,7 @@ import { MockI18nModule } from '../../../../testing/i18n.stub';
 })
 class ObjectPropertyComponent {
     @Input() property: Property;
+    @Input() columns = 1;
 }
 
 @Component({
@@ -25,7 +26,10 @@ class TestHostComponent {
     @ViewChild(MetadataConfigurationComponent)
     public componentUnderTest: MetadataConfigurationComponent;
 
-    configuration: MetadataConfiguration = {sections: []};
+    configuration: MetadataConfiguration = {
+        dates: [],
+        sections: []
+    };
 }
 
 describe('Metadata Configuration Component', () => {

diff --git a/ui/src/app/metadata/configuration/container/configuration.component.spec.ts b/ui/src/app/metadata/configuration/container/configuration.component.spec.ts
@@ -18,7 +18,10 @@ class TestHostComponent {
     @ViewChild(ConfigurationComponent)
     public componentUnderTest: ConfigurationComponent;
 
-    configuration: MetadataConfiguration = { sections: [] };
+    configuration: MetadataConfiguration = {
+        dates: [],
+        sections: []
+    };
 }
 
 describe('Metadata Configuration Page Component', () => {

diff --git a/ui/src/app/metadata/configuration/container/metadata-history.component.spec.ts b/ui/src/app/metadata/configuration/container/metadata-history.component.spec.ts
@@ -8,6 +8,9 @@ import { MetadataHistoryService } from '../service/history.service';
 import { of } from 'rxjs';
 import { StoreModule, combineReducers } from '@ngrx/store';
 import * as fromConfiguration from '../reducer';
+import { Router, ActivatedRoute } from '@angular/router';
+import { RouterStub } from '../../../../testing/router.stub';
+import { ActivatedRouteStub } from '../../../../testing/activated-route.stub';
 
 export const TestData = {
     versions: [
@@ -43,6 +46,12 @@ describe('Metadata Version History Component', () => {
             providers: [
                 {
                     provide: MetadataHistoryService, useValue: MockHistoryService
+                },
+                {
+                    provide: Router, useClass: RouterStub
+                },
+                {
+                    provide: ActivatedRoute, useClass: ActivatedRouteStub
                 }
             ],
             imports: [

diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.spec.ts b/ui/src/app/metadata/configuration/container/metadata-options.component.spec.ts
@@ -40,7 +40,10 @@ class TestHostComponent {
     @ViewChild(MetadataOptionsComponent)
     public componentUnderTest: MetadataOptionsComponent;
 
-    configuration: MetadataConfiguration = { sections: [] };
+    configuration: MetadataConfiguration = {
+        dates: [],
+        sections: []
+    };
 }
 
 describe('Metadata Options Page Component', () => {

diff --git a/ui/src/app/metadata/configuration/container/metadata-xml.component.spec.ts b/ui/src/app/metadata/configuration/container/metadata-xml.component.spec.ts
@@ -17,8 +17,6 @@ import { MetadataXmlComponent } from './metadata-xml.component';
 class TestHostComponent {
     @ViewChild(MetadataXmlComponent)
     public componentUnderTest: MetadataXmlComponent;
-
-    configuration: MetadataConfiguration = { sections: [] };
 }
 
 describe('Metadata Xml Page Component', () => {

diff --git a/ui/src/app/metadata/configuration/reducer/index.spec.ts b/ui/src/app/metadata/configuration/reducer/index.spec.ts
@@ -12,7 +12,7 @@ describe('Configuration Reducer', () => {
 
     describe('getConfigurationSectionsFn', () => {
         it('should parse the schema, definition, and model into a MetadataConfiguration', () => {
-            const config = getConfigurationSectionsFn(model, definition, schema);
+            const config = getConfigurationSectionsFn([model], definition, schema);
             expect(config.sections).toBeDefined();
         });
     });

diff --git a/ui/src/app/metadata/configuration/reducer/index.ts b/ui/src/app/metadata/configuration/reducer/index.ts
@@ -63,7 +63,7 @@ export const assignValueToProperties = (models, properties): any[] => {
 export const getConfigurationSectionsFn = (models, definition, schema): MetadataConfiguration => {
     return !definition || !schema ? null :
         ({
-            dates: models.map(m => m.updatedDate),
+            dates: models.map(m => m.modifiedDate),
             sections: definition.steps
                 .filter(step => step.id !== 'summary')
                 .map(

diff --git a/ui/src/app/metadata/resolver/reducer/collection.reducer.spec.ts b/ui/src/app/metadata/resolver/reducer/collection.reducer.spec.ts
@@ -73,13 +73,13 @@ describe('Resolver Reducer', () => {
     describe('Select Resolver', () => {
         it('should update the selected draft id', () => {
             let id = 'foo',
+                createdDate = new Date().toDateString(),
                 expected = { ...snapshot, selectedResolverId: id };
-            const action = new resolverActions.SelectResolver(id);
+            const action = new resolverActions.SelectResolverSuccess({ id, createdDate } as MetadataResolver);
             const result = reducer({ ...snapshot }, action);
 
-            expect(result).toEqual(
-                Object.assign({}, initialState, expected)
-            );
+            expect(result.selectedResolverId).toEqual(id);
+            expect(result.ids.length).toBe(3);
         });
     });
 });