Merge pull request #2561 from ahumphreys87/update-dependencies

Update dependencies

Author: paulfalgout

.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

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",

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"

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",

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();
 });