From 34b5c045771a5d7db62ce84c65b6072bf589e220 Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Tue, 2 Jun 2015 22:39:41 -0700 Subject: [PATCH 1/2] Resolves #280 stricter version of backbone --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2af25e75..d0216de9 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "react-tools": "^0.13.1" }, "dependencies": { - "backbone": "^1.1.2", + "backbone": "~1.1.2", "events": "^1.0.2", "flux": "^2.0.1", "jquery": "~1.7.3", From 32b8b2c8bf583a4b96c175aa69b38704ac63b9e0 Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Tue, 2 Jun 2015 22:46:44 -0700 Subject: [PATCH 2/2] wait for longer --- src/js/__tests__/base.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/__tests__/base.js b/src/js/__tests__/base.js index f408991e..5c8547c8 100644 --- a/src/js/__tests__/base.js +++ b/src/js/__tests__/base.js @@ -84,7 +84,7 @@ var expectTreeAsync = function(command, expectedJSON, startJSON) { console.log(JSON.stringify(getHeadlessSummary(headless))); } return compareAnswer(headless, expectedJSON); - }, 'trees should be equal', 100); + }, 'trees should be equal', 400); }; var expectLevelSolved = function(levelBlob) {