diff --git a/.travis.yml b/.travis.yml index f93b490d55..38205bc60c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,8 @@ env: - UNDERSCORE=1.6 BACKBONE=1.0 - UNDERSCORE=1.4.4 BACKBONE=1.1.0 - UNDERSCORE=1.5 BACKBONE=1.1 + - UNDERSCORE=1.7 BACKBONE=1.2 + - UNDERSCORE=1.8 BACKBONE=1.2 - LODASH=2.4 BACKBONE=1.1 - LODASH=3.0 BACKBONE=1.1 - LODASH=3.1 BACKBONE=1.0 diff --git a/bower.json b/bower.json index c3670f5ccc..fee2761dff 100644 --- a/bower.json +++ b/bower.json @@ -34,8 +34,8 @@ "upgradeGuide.md" ], "dependencies": { - "backbone": "1.0.0 - 1.1.2", - "underscore": "1.4.4 - 1.6.0", + "backbone": "1.0.0 - 1.2.1", + "underscore": "1.4.4 - 1.8.3", "backbone.babysitter": "^0.1.0", "backbone.radio": "^0.9.0", "backbone-metal": "^0.5.0", diff --git a/component.json b/component.json index 3ceaa6db6b..de311207b5 100644 --- a/component.json +++ b/component.json @@ -32,8 +32,8 @@ "marionettejs/backbone.babysitter": "*", "marionettejs/backbone.radio": "*", "marionettejs/backbone-metal": "*", - "jashkenas/backbone": "*", - "jashkenas/underscore": "*" + "jashkenas/backbone": "1.0.0 - 1.2.1", + "jashkenas/underscore": "1.4.4 - 1.8.3" }, "scripts": [ "lib/core/backbone.marionette.js" diff --git a/package.json b/package.json index 770ee5a8eb..fefde8b1a0 100644 --- a/package.json +++ b/package.json @@ -42,9 +42,9 @@ "dependencies": { "backbone.babysitter": "^0.1.0", "backbone.radio": "^0.9.0", - "backbone": "1.0.0 - 1.1.2", + "backbone": "1.0.0 - 1.2.1", "backbone-metal": "^0.5.0", - "underscore": "1.4.4 - 1.6.0" + "underscore": "1.4.4 - 1.8.3" }, "devDependencies": { "chai": "1.9.1", diff --git a/test/unit/setup/helpers.js b/test/unit/setup/helpers.js index 997c8ec615..aca85ccbc3 100644 --- a/test/unit/setup/helpers.js +++ b/test/unit/setup/helpers.js @@ -29,8 +29,8 @@ beforeEach(function() { afterEach(function() { this.sinon.restore(); - clearFixtures(); window.location.hash = ''; Backbone.history.stop(); Backbone.history.handlers.length = 0; + clearFixtures(); });