From 10c43404754167b992be23e464d79811fd49a61c Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Tue, 17 Dec 2019 13:24:34 -0800
Subject: [PATCH] completed tests for condition collection object

---
 ....js => ConditionCollectionViewProvider.js} | 14 +++++-----
 ...{Condition.vue => ConditionCollection.vue} |  4 +--
 src/plugins/condition/plugin.js               |  9 +++---
 src/plugins/condition/pluginSpec.js           | 28 +++++++++++--------
 4 files changed, 29 insertions(+), 26 deletions(-)
 rename src/plugins/condition/{ConditionViewProvider.js => ConditionCollectionViewProvider.js} (82%)
 rename src/plugins/condition/components/{Condition.vue => ConditionCollection.vue} (70%)

diff --git a/src/plugins/condition/ConditionViewProvider.js b/src/plugins/condition/ConditionCollectionViewProvider.js
similarity index 82%
rename from src/plugins/condition/ConditionViewProvider.js
rename to src/plugins/condition/ConditionCollectionViewProvider.js
index 629e6b0c69..30ecddb80a 100644
--- a/src/plugins/condition/ConditionViewProvider.js
+++ b/src/plugins/condition/ConditionCollectionViewProvider.js
@@ -20,16 +20,16 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import ConditionComponent from './components/Condition.vue';
+import ConditionCollectionComponent from './components/ConditionCollection.vue';
 import Vue from 'vue';
 
-export default function Condition(openmct) {
+export default function ConditionCollection(openmct) {
     return {
-        key: 'condition',
-        name: 'Condition',
+        key: 'conditionCollection',
+        name: 'Condition Collection',
         cssClass: 'icon-page',
         canView: function (domainObject) {
-            return domainObject.type === 'condition';
+            return domainObject.type === 'conditionCollection';
         },
         view: function (domainObject) {
             let component;
@@ -39,13 +39,13 @@ export default function Condition(openmct) {
                     component =  new Vue({
                         el: element,
                         components: {
-                            ConditionComponent: ConditionComponent
+                            ConditionCollectionComponent
                         },
                         provide: {
                             openmct,
                             domainObject
                         },
-                        template: '<condition-component></condition-component>'
+                        template: '<condition-collection-component></condition-collection-component>'
                     });
                 },
                 destroy: function (element) {
diff --git a/src/plugins/condition/components/Condition.vue b/src/plugins/condition/components/ConditionCollection.vue
similarity index 70%
rename from src/plugins/condition/components/Condition.vue
rename to src/plugins/condition/components/ConditionCollection.vue
index 19ec4a146b..7d81e2349f 100644
--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@@ -1,7 +1,5 @@
 <template>
-<div class="l-iframe abs">
-    <iframe :src="currentDomainObject.url"></iframe>
-</div>
+<div><!-- Condition Collection component contents will go here --></div>
 </template>
 
 <script>
diff --git a/src/plugins/condition/plugin.js b/src/plugins/condition/plugin.js
index 4c3adb11dc..ab3213554e 100644
--- a/src/plugins/condition/plugin.js
+++ b/src/plugins/condition/plugin.js
@@ -20,10 +20,11 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-export default function ConditionPlugin() {
+export default function ConditionCollectionPlugin() {
     const conditionType = {
-        name: 'Condition',
-        description: 'A conditional rule based on user-specified criteria.',
+        name: 'Condition Collection',
+        key: 'conditionCollection',
+        description: 'A set of conditional rules based on user-specified criteria.',
         creatable: true,
         cssClass: 'icon-summary-widget',
         initialize: function (domainObject) {
@@ -33,6 +34,6 @@ export default function ConditionPlugin() {
     };
 
     return function install(openmct) {
-        openmct.types.addType('condition', conditionType);
+        openmct.types.addType('conditionCollection', conditionType);
     };
 }
diff --git a/src/plugins/condition/pluginSpec.js b/src/plugins/condition/pluginSpec.js
index e800626d98..50170cb85b 100644
--- a/src/plugins/condition/pluginSpec.js
+++ b/src/plugins/condition/pluginSpec.js
@@ -20,33 +20,37 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-import ConditionPlugin from './plugin';
+import ConditionCollectionPlugin from './plugin';
 import { createOpenMct } from 'testTools';
 
 fdescribe("The plugin", () => {
     let openmct;
-    let conditionType;
     let mockDomainObject;
 
     beforeEach(() => {
-        mockDomainObject = {};
-
         openmct = createOpenMct();
-        openmct.install(new ConditionPlugin());
-        conditionType = openmct.types.get('condition');
+        openmct.install(new ConditionCollectionPlugin());
+
+        mockDomainObject = {
+            identifier: {
+                key: 'testKey',
+                namespace: ''
+            },
+            type: 'conditionCollection'
+        };
     });
 
-    it('defines a condition object with the correct name', () => {
-        expect(conditionType.definition.name).toEqual('Condition');
+    it('defines a condition collection object type with the correct key', () => {
+        expect(openmct.types.get('conditionCollection').definition.key).toEqual('conditionCollection');
     });
 
-    it('defines a condition object that is creatable', () => {
-        expect(conditionType.definition.creatable).toBeTrue();
+    it('defines a condition collection object type that is creatable', () => {
+        expect(openmct.types.get('conditionCollection').definition.creatable).toBeTrue();
     });
 
-    describe("shows the condition object is initialized with", () => {
+    describe("shows the condition collection object is initialized with", () => {
         beforeEach(() => {
-            conditionType.definition.initialize(mockDomainObject);
+            openmct.types.get('conditionCollection').definition.initialize(mockDomainObject);
         });
 
         it('a composition array', () => {