Merge pull request #88 from yahoo/react15.0

react 15 support
yahoo · Apr 12, 2016 · 9dad5e8 · 9dad5e8
2 parents 9f7aa20 + ab98cb4
commit 9dad5e8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -42,8 +42,8 @@
     "object-assign": "^4.0.0",
     "pre-commit": "^1.0.0",
     "promise": "^7.0.1",
-    "react": "^15.0.0-rc.1",
-    "react-dom": "^15.0.0-rc.1",
+    "react": "^15.0.0",
+    "react-dom": "^15.0.0",
     "xunit-file": "^0.0.7"
   },
   "keywords": [
@@ -53,8 +53,8 @@
     "instrumentation"
   ],
   "peerDependencies": {
-    "react": "^0.14.0 || ^15.0.0-rc.1",
-    "react-dom": "^0.14.0 || ^15.0.0-rc.1"
+    "react": "^0.14.0 || ^15.0.0",
+    "react-dom": "^0.14.0 || ^15.0.0"
   },
   "precommit": [
     "lint",

diff --git a/tests/unit/utils/createI13nNode.js b/tests/unit/utils/createI13nNode.js
@@ -379,7 +379,14 @@ describe('createI13nNode', function () {
         }, 1000);
     });
 
-    it('should not cause error if we pass a undefined to createI13nNode', function () {
+    it('should not cause error if we pass a undefined to createI13nNode', function (done) {
+        console.warn = function (msg) {
+            expect(msg).to.equal('You are passing a null component into createI13nNode');
+            done();
+        };
+        console.trace = function () {
+            // no-op
+        };
         var I13nTestComponent = createI13nNode(undefined);
         expect(I13nTestComponent).to.eql(undefined);
     });

diff --git a/tests/unit/utils/setupI13n.js b/tests/unit/utils/setupI13n.js
@@ -57,9 +57,6 @@ describe('setupI13n', function () {
     });
 
     afterEach(function () {
-        delete global.window;
-        delete global.document;
-        delete global.navigator;
         mockery.disable();
     });