Upgrade karma to 1.1.0

CHANGELOG.md

@@ -1,5 +1,12 @@
+<a name="1.8.0"></a>
+# 1.8.0 (2016-06-30)
+
+### Features
+
+* **Unit Test**: Upgrade karma to 1.1.0 [#110](https://github.com/lathonez/clicker/issues/110) ([](https://github.com/lathonez/clicker/commit/))
+
 <a name="1.7.1"></a>
-# 1.7.0 (2016-06-29)
+# 1.7.1 (2016-06-29)
 
 ### Bug Fixes
 

package.json

@@ -31,7 +31,7 @@
     "isparta": "4.0.0",
     "jasmine-core": "2.4.1",
     "jasmine-spec-reporter": "2.5.0",
-    "karma": "0.13.22",
+    "karma": "1.1.0",
     "karma-browserify": "5.0.5",
     "karma-chrome-launcher": "1.0.1",
     "karma-coverage": "1.0.0",
@@ -48,7 +48,7 @@
     "typings": "1.3.1"
   },
   "name": "clicker",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "description": "clicker: An Ionic project",
   "cordovaPlugins": [
     "cordova-plugin-device",

test/karma-static/context.html

@@ -16,14 +16,11 @@
        to have already been created so they can insert their magic into it. For example, if loaded
        before body, Angular Scenario test framework fails to find the body and crashes and burns in
        an epic manner. -->
+  <script src="context.js"></script>
   <script type="text/javascript">
-    // sets window.__karma__ and overrides console and error handling
-    // Use window.opener if this was opened by someone else - in a new window
-    if (window.opener) {
-      window.opener.karma.setupContext(window);
-    } else {
-      window.parent.karma.setupContext(window);
-    }
+    // Configure our Karma and set up bindings
+    %CLIENT_CONFIG%
+    window.__karma__.setupContext(window);
 
     // All served files with the latest timestamps
     %MAPPINGS%

test/karma-static/debug.html

@@ -18,33 +18,10 @@
    (Angular Scenario, for example) need the body to be loaded so that it can insert its magic
    into it. If it is before body, then it fails to find the body and crashes and burns in an epic
    manner. -->
+  <script src="context.js"></script>
+  <script src="debug.js"></script>
   <script type="text/javascript">
-    window.__karma__ = {
-      info: function(info) {
-        if (info.dump && window.console) window.console.log(info.dump);
-      },
-      complete: function() {
-        if (window.console) window.console.log('Skipped ' + this.skipped + ' tests');
-      },
-      store: function() {},
-      skipped: 0,
-      result: window.console ? function(result) {
-        if (result.skipped) {
-          this.skipped++;
-          return;
-        }
-        var msg = result.success ? 'SUCCESS ' : 'FAILED ';
-        window.console.log(msg + result.suite.join(' ') + ' ' + result.description);
-
-        for (var i = 0; i < result.log.length; i++) {
-          window.console.error(result.log[i]);
-        }
-      } : function() {},
-      loaded: function() {
-        this.start();
-      }
-    };
-
+    // Configure our Karma
     %CLIENT_CONFIG%
 
     // All served files with the latest timestamps