From 2ff0c7b06ae1d3c7964d387979d259906d9e2522 Mon Sep 17 00:00:00 2001
From: Pete Richards <peter.l.richards@nasa.gov>
Date: Wed, 25 May 2016 10:11:34 -0700
Subject: [PATCH] [Test] Add spy method for addClass

Add spy method, fix a merge conflict that was improperly resolved
in https://github.com/nasa/openmct/pull/922
---
 .../commonUI/general/test/directives/MCTPopupSpec.js   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/platform/commonUI/general/test/directives/MCTPopupSpec.js b/platform/commonUI/general/test/directives/MCTPopupSpec.js
index 372dd4b042..fa26b6f6f7 100644
--- a/platform/commonUI/general/test/directives/MCTPopupSpec.js
+++ b/platform/commonUI/general/test/directives/MCTPopupSpec.js
@@ -24,7 +24,15 @@ define(
     ["../../src/directives/MCTPopup"],
     function (MCTPopup) {
 
-        var JQLITE_METHODS = ["on", "off", "find", "parent", "css", "append"];
+        var JQLITE_METHODS = [
+            "on",
+            "off",
+            "find",
+            "parent",
+            "css",
+            "addClass",
+            "append"
+        ];
 
         describe("The mct-popup directive", function () {
             var mockCompile,