Merge pull request #4025 from nextcloud/downstream-27292

Update karma

build/package.json

@@ -11,14 +11,20 @@
   "contributors": [],
   "dependencies": {},
   "devDependencies": {
-    "karma": "~1.3.0",
-    "karma-jasmine": "~1.0.2",
-    "karma-junit-reporter": "*",
+    "bower": "~1.8.0",
+    "handlebars": "^4.0.5",
+    "jasmine-core": "^2.5.2",
+    "jasmine-sinon": "^0.4.0",
+    "jsdoc": "~3.4.0",
+    "karma": "^1.5.0",
     "karma-coverage": "*",
+    "karma-jasmine": "^1.1.0",
+    "karma-jasmine-sinon": "^1.0.4",
+    "karma-junit-reporter": "*",
     "karma-phantomjs-launcher": "*",
     "phantomjs-prebuilt": "*",
-    "jasmine-core": "~2.5.2",
-    "node-sass": "~4.1.1"
+    "node-sass": "~4.1.1",
+    "sinon": "*"
   },
-  "engine": "node >= 0.8"
+  "engine": "node >= 6.9"
 }

core/js/js.js

@@ -1351,7 +1351,7 @@ function initCore() {
 		var url = OC.generateUrl('/heartbeat');
 		var heartBeatTimeout = null;
 		var heartBeat = function() {
-			clearTimeout(heartBeatTimeout);
+			clearInterval(heartBeatTimeout);
 			heartBeatTimeout = setInterval(function() {
 				$.post(url);
 			}, interval * 1000);

tests/karma.config.js

@@ -158,9 +158,6 @@ module.exports = function(config) {
 		testCore = true;
 	}
 
-	// extra test libs
-	files.push(corePath + 'tests/lib/sinon-1.15.4.js');
-
 	// core mocks
 	files.push(corePath + 'tests/specHelper.js');
 
@@ -237,7 +234,7 @@ module.exports = function(config) {
 		basePath: '..',
 
 		// frameworks to use
-		frameworks: ['jasmine'],
+		frameworks: ['jasmine', 'jasmine-sinon'],
 
 		// list of files / patterns to load in the browser
 		files: files,