qunit - Move from packages.git to bower.json

diff --git a/CRM/Core/Page/QUnit.php b/CRM/Core/Page/QUnit.php
index b0688609032dc025f7ea3663553745618d07d68a..5b2ba6b60efa90e36e0ea7309c57730204543998 100644 (file)
--- a/CRM/Core/Page/QUnit.php
+++ b/CRM/Core/Page/QUnit.php
@@ -40,8 +40,8 @@ class CRM_Core_Page_QUnit extends CRM_Core_Page {
 
     CRM_Utils_System::setTitle(ts('QUnit: %2 (%1)', array(1 => $ext, 2 => $suite)));
     CRM_Core_Resources::singleton()
-      ->addScriptFile('civicrm', 'packages/qunit/qunit.js', 1, 'html-header')
-      ->addStyleFile('civicrm', 'packages/qunit/qunit.css', 1, 'html-header');
+      ->addScriptFile('civicrm', 'bower_components/qunit/qunit/qunit.js', 1, 'html-header')
+      ->addStyleFile('civicrm', 'bower_components/qunit/qunit/qunit.css', 1, 'html-header');
     parent::run();
   }
 

diff --git a/bower.json b/bower.json
index 3ebee2fc3ca5ddd57f5f0a35dca3a1a2e6d818bf..f892460b040f40bac3a3b11ee98edd38e189788b 100644 (file)
--- a/bower.json
+++ b/bower.json
@@ -12,7 +12,8 @@
     "angular-route": "~1.3.8",
     "angular-ui-sortable": "0.12.x",
     "angular-ui-utils": "0.1.x",
-    "angular-unsavedChanges": "~0.1.1"
+    "angular-unsavedChanges": "~0.1.1",
+    "qunit": "1.10.0"
   },
   "resolutions": {
     "angular": "~1.3.8"