Fix tests and keywords

.travis.yml

@@ -1,7 +1,8 @@
 language: node_js
 node_js:
-  - 0.8
+  - 0.12
 branches:
   only:
     - master
+sudo: false
 

chai-backbone.coffee

@@ -87,10 +87,12 @@
       consideredRouter._bindRoutes() for consideredRouter in options.considering
 
     # manually set the root option to prevent calling Backbone.history.start() which is global
-    Backbone.history.options =
-      root: '/'
-
+    Backbone.history.root = '/'
     route = flag(this, 'object')
+
+    Backbone.history.location =
+      pathname: '/'
+
     # fire our route to test
     Backbone.history.loadUrl route
 

package.json

@@ -2,8 +2,8 @@
   "author": "Matthijs Groen <matthijs.groen@gmail.com>",
   "name": "chai-backbone",
   "description": "Backbone assertions for the Chai assertion library",
-  "keywords": [ "test", "assertion", "assert", "testing", "backbone" ],
-  "version": "0.9.2",
+  "keywords": [ "test", "assertion", "assert", "testing", "backbone", "chai-plugin", "browser", "vendor", "dom" ],
+  "version": "0.9.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/matthijsgroen/chai-backbone"

test.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
-coffee -c -o . . && coffee -c -o test/ test/ && xdg-open test/browser/index.html
+coffee -c -o . . && coffee -c -o test/ test/ && open test/browser/index.html
 

test/browser/index.html

@@ -10,7 +10,6 @@
     <script>mocha.setup('bdd')</script>
     <script src="../../node_modules/chai/chai.js"></script>
     <script src="http://sinonjs.org/releases/sinon-1.5.2.js"></script>
-    <script src="https://raw.github.com/cujojs/when/master/when.js"></script>
     <script src="../../node_modules/chai-changes/chai-changes.js"></script>
     <script src="../../chai-backbone.js"></script>
     <script src="setup.js"></script>

test/chai-backbone_spec.coffee

@@ -60,7 +60,7 @@ describe 'Chai-Backbone matchers', ->
       "route2/argVal".should.route.to router, 'routeWithArg', arguments: ['argVal']
       expect(->
         "route2/ere".should.route.to router, 'routeWithArg', arguments: ['argVal']
-      ).to.throw 'expected `routeWithArg` to be called with [ \'argVal\' ], but was called with [ \'ere\' ] instead'
+      ).to.throw 'expected `routeWithArg` to be called with [ \'argVal\' ], but was called with [ \'ere\', null ] instead'
 
     it 'leaves the `to` keyword working properly', ->
       expect('1').to.be.equal '1'

test/mocha.opts

@@ -1,3 +1,3 @@
 --reporter spec
 --require test/setup
---compilers coffee:coffee-script
+--compilers coffee:coffee-script/register