Merged with master branch

Author: jwngr

.travis.yml

@@ -2,7 +2,7 @@ language: node_js
 node_js:
 - '0.10'
 - '0.12'
-- stable
+# - stable
 sudo: false
 install:
 - npm install

bower.json

@@ -33,6 +33,6 @@
   ],
   "dependencies": {
     "react": "0.13.x",
-    "firebase": "2.2.x"
+    "firebase": "2.x.x"
   }
 }

changelog.txt

@@ -1 +1,2 @@
+feature - Upgraded Firebase dependency to 2.x.x.
 fixed - Fixed bug which caused `unbind()` to be called on a previously unbound reference when a component was unmounted.

package.json

@@ -11,12 +11,7 @@
   "bugs": {
     "url": "https://github.com/firebase/reactfire/issues"
   },
-  "licenses": [
-    {
-      "type": "MIT",
-      "url": "http://firebase.mit-license.org/"
-    }
-  ],
+  "license": "MIT",
   "keywords": [
     "react",
     "mixin",
@@ -32,7 +27,7 @@
     "package.json"
   ],
   "dependencies": {
-    "firebase": "2.2.x",
+    "firebase": "2.x.x",
     "react": "0.13.x"
   },
   "devDependencies": {

tests/reactfire.spec.js

@@ -17,7 +17,6 @@ var ReactFireMixin = require('../src/reactfire.js');
 // JSDom
 var jsdom = require('jsdom');
 global.document = jsdom.jsdom();  // Needed for ReactTestUtils shallow renderer
-document.createElement = null;  // Needed for Firebase
 
 // Test helpers
 var TH = require('./helpers.js');