From 654333dabeb7f76d11790b9416ba546ddb18761b Mon Sep 17 00:00:00 2001
From: Joshi <simplyrender@gmail.com>
Date: Tue, 14 Jan 2020 10:59:11 -0800
Subject: [PATCH 1/2] Removes fdescribe

---
 src/plugins/condition/ConditionSetCompositionPolicySpec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/condition/ConditionSetCompositionPolicySpec.js b/src/plugins/condition/ConditionSetCompositionPolicySpec.js
index ee6a7d6b04..9a9424785d 100644
--- a/src/plugins/condition/ConditionSetCompositionPolicySpec.js
+++ b/src/plugins/condition/ConditionSetCompositionPolicySpec.js
@@ -22,7 +22,7 @@
 
 import ConditionSetCompositionPolicy  from './ConditionSetCompositionPolicy';
 
-fdescribe('ConditionSetCompositionPolicy', () => {
+describe('ConditionSetCompositionPolicy', () => {
 
     let policy;
     let testTelemetryObject;

From 8df549e8d9190fe30e4cb2675a14cc3492d4964e Mon Sep 17 00:00:00 2001
From: Shefali Joshi <simplyrender@gmail.com>
Date: Wed, 15 Jan 2020 15:39:31 -0800
Subject: [PATCH 2/2] Addresses comments from PR:
 https://github.com/nasa/openmct/pull/2621 (#2623)

* Addresses comments from PR: https://github.com/nasa/openmct/pull/2621

* Fixes import path.
---
 src/plugins/condition/ConditionSetCompositionPolicy.js | 3 +--
 src/plugins/condition/plugin.js                        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/plugins/condition/ConditionSetCompositionPolicy.js b/src/plugins/condition/ConditionSetCompositionPolicy.js
index 297f2831d8..4755656b90 100644
--- a/src/plugins/condition/ConditionSetCompositionPolicy.js
+++ b/src/plugins/condition/ConditionSetCompositionPolicy.js
@@ -23,8 +23,7 @@
 export default function ConditionSetCompositionPolicy(openmct) {
     return {
         allow: function (parent, child) {
-            let parentType = parent.type;
-            if (parentType === 'conditionSet' && !openmct.telemetry.isTelemetryObject(child)) {
+            if (parent.type === 'conditionSet' && !openmct.telemetry.isTelemetryObject(child)) {
                 return false;
             }
 
diff --git a/src/plugins/condition/plugin.js b/src/plugins/condition/plugin.js
index e0c14c3c82..5bd700f99f 100644
--- a/src/plugins/condition/plugin.js
+++ b/src/plugins/condition/plugin.js
@@ -20,7 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 import ConditionSetViewProvider from './ConditionSetViewProvider.js';
-import ConditionSetCompositionPolicy from "@/plugins/condition/ConditionSetCompositionPolicy";
+import ConditionSetCompositionPolicy from "./ConditionSetCompositionPolicy";
 
 export default function ConditionPlugin() {