Un-nested the new rendering tests. Updated the fiber test passing/not passing lists.

Author: aickin

scripts/fiber/tests-passing-except-dev.txt

@@ -144,3 +144,7 @@ src/renderers/dom/shared/__tests__/ReactMountDestruction-test.js
 
 src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
 * should have the correct mounting behavior
+* should render a blank div with client render on top of bad server markup
+* should render a div with inline styles with client render on top of bad server markup
+* should render a self-closing tag with client render on top of bad server markup
+* should render a self-closing tag as a child with client render on top of bad server markup

scripts/fiber/tests-passing.txt

@@ -1161,6 +1161,18 @@ src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
 * warns with a no-op when an async replaceState is triggered
 * warns with a no-op when an async forceUpdate is triggered
 * should warn when children are mutated during render
+* should render a blank div with server string render
+* should render a blank div with clean client render
+* should render a blank div with client render on top of good server markup
+* should render a div with inline styles with server string render
+* should render a div with inline styles with clean client render
+* should render a div with inline styles with client render on top of good server markup
+* should render a self-closing tag with server string render
+* should render a self-closing tag with clean client render
+* should render a self-closing tag with client render on top of good server markup
+* should render a self-closing tag as a child with server string render
+* should render a self-closing tag as a child with clean client render
+* should render a self-closing tag as a child with client render on top of good server markup
 
 src/renderers/dom/shared/__tests__/escapeTextContentForBrowser-test.js
 * should escape boolean to string

src/renderers/dom/shared/__tests__/ReactServerRendering-test.js

@@ -42,7 +42,7 @@ function expectErrors(fn, count) {
         }
       }
     }
-    expect(console.error.calls.count()).toBe(count);
+    expectDev(console.error.calls.count()).toBe(count);
     return result;
   });
 }
@@ -391,28 +391,6 @@ describe('ReactDOMServer', () => {
       expect(numClicks).toEqual(2);
     });
 
-    describe('basic rendering', function() {
-      itRenders('should render a blank div', render =>
-        render(<div/>).then(e => expect(e.tagName.toLowerCase()).toBe('div')));
-
-      itRenders('should render a div with inline styles', render =>
-        render(<div style={{color:'red', width:'30px'}}/>).then(e => {
-          expect(e.style.color).toBe('red');
-          expect(e.style.width).toBe('30px');
-        })
-      );
-
-      itRenders('should render a self-closing tag', render =>
-        render(<br/>).then(e => expect(e.tagName.toLowerCase()).toBe('br')));
-
-      itRenders('should render a self-closing tag as a child', render =>
-        render(<div><br/></div>).then(e => {
-          expect(e.childNodes.length).toBe(1);
-          expect(e.firstChild.tagName.toLowerCase()).toBe('br');
-        })
-      );
-    });
-
     it('should throw with silly args', () => {
       expect(
         ReactDOMServer.renderToString.bind(
@@ -683,4 +661,27 @@ describe('ReactDOMServer', () => {
       );
     }).toThrowError(/Cannot assign to read only property.*/);
   });
+
+  describe('basic rendering', function() {
+    itRenders('should render a blank div', render =>
+      render(<div/>).then(e => expect(e.tagName.toLowerCase()).toBe('div')));
+
+    itRenders('should render a div with inline styles', render =>
+      render(<div style={{color:'red', width:'30px'}}/>).then(e => {
+        expect(e.style.color).toBe('red');
+        expect(e.style.width).toBe('30px');
+      })
+    );
+
+    itRenders('should render a self-closing tag', render =>
+      render(<br/>).then(e => expect(e.tagName.toLowerCase()).toBe('br')));
+
+    itRenders('should render a self-closing tag as a child', render =>
+      render(<div><br/></div>).then(e => {
+        expect(e.childNodes.length).toBe(1);
+        expect(e.firstChild.tagName.toLowerCase()).toBe('br');
+      })
+    );
+  });
+
 });