Merge pull request #15065 from emberjs/guard-jquery-access

[BUGFIX beta] Guard jQuery access in `setupForTesting`.
emberjs · Mar 24, 2017 · 5506aba · 5506aba
2 parents ef6cb33 + 88c5bab
commit 5506aba
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/packages/ember-testing/lib/setup_for_testing.js b/packages/ember-testing/lib/setup_for_testing.js
@@ -35,11 +35,13 @@ export default function setupForTesting() {
     setAdapter((typeof self.QUnit === 'undefined') ? new Adapter() : new QUnitAdapter());
   }
 
-  jQuery(document).off('ajaxSend', incrementPendingRequests);
-  jQuery(document).off('ajaxComplete', decrementPendingRequests);
+  if (jQuery) {
+    jQuery(document).off('ajaxSend', incrementPendingRequests);
+    jQuery(document).off('ajaxComplete', decrementPendingRequests);
 
-  clearPendingRequests();
+    clearPendingRequests();
 
-  jQuery(document).on('ajaxSend', incrementPendingRequests);
-  jQuery(document).on('ajaxComplete', decrementPendingRequests);
+    jQuery(document).on('ajaxSend', incrementPendingRequests);
+    jQuery(document).on('ajaxComplete', decrementPendingRequests);
+  }
 }