Update tests to match v7-alpha.1 behavior

Added rtl.act() calls around dispatches and other component updates
Added clarification on expected mapState calls in some places
Disabled some no-longer-relevant tests per implementation
Made tests run against React 16.8 by default

Author: markerikson

test/components/Provider.spec.js

@@ -15,6 +15,7 @@ describe('React', () => {
     afterEach(() => rtl.cleanup())
 
     const createChild = (storeKey = 'store') => {
+      /*
       class Child extends Component {
         render() {
           return (
@@ -28,6 +29,43 @@ describe('React', () => {
           )
         }
       }
+      */
+      class Child extends Component {
+        render() {
+          //const store = this.context[storeKey];
+          return (
+            <ReactReduxContext.Consumer>
+              {({ store }) => {
+                let text = ''
+
+                if (store) {
+                  text = store.getState().toString()
+                }
+
+                return (
+                  <div data-testid="store">
+                    {storeKey} - {text}
+                  </div>
+                )
+              }}
+            </ReactReduxContext.Consumer>
+          )
+
+          /*
+          let text = '';
+
+          if(store) {
+            text = store.getState().toString()
+          }
+
+          return (
+            <div data-testid="store">
+              {storeKey} - {text}
+            </div>
+          )
+          */
+        }
+      }
 
       return Child
     }
@@ -107,24 +145,48 @@ describe('React', () => {
 
       const tester = rtl.render(<ProviderContainer />)
       expect(tester.getByTestId('store')).toHaveTextContent('store - 11')
-      store1.dispatch({ type: 'hi' })
+
+      /*
+      rtl.act(() => {
+        store1.dispatch({ type: 'hi' })
+      })
       expect(tester.getByTestId('store')).toHaveTextContent('store - 12')
+*/
+      rtl.act(() => {
+        externalSetState({ store: store2 })
+      })
 
-      externalSetState({ store: store2 })
       expect(tester.getByTestId('store')).toHaveTextContent('store - 20')
-      store1.dispatch({ type: 'hi' })
+      rtl.act(() => {
+        store1.dispatch({ type: 'hi' })
+      })
+
+      expect(tester.getByTestId('store')).toHaveTextContent('store - 20')
+      rtl.act(() => {
+        store2.dispatch({ type: 'hi' })
+      })
       expect(tester.getByTestId('store')).toHaveTextContent('store - 20')
-      store2.dispatch({ type: 'hi' })
-      expect(tester.getByTestId('store')).toHaveTextContent('store - 40')
 
-      externalSetState({ store: store3 })
+      rtl.act(() => {
+        externalSetState({ store: store3 })
+      })
+
+      expect(tester.getByTestId('store')).toHaveTextContent('store - 101')
+      rtl.act(() => {
+        store1.dispatch({ type: 'hi' })
+      })
+
       expect(tester.getByTestId('store')).toHaveTextContent('store - 101')
-      store1.dispatch({ type: 'hi' })
+      rtl.act(() => {
+        store2.dispatch({ type: 'hi' })
+      })
+
       expect(tester.getByTestId('store')).toHaveTextContent('store - 101')
-      store2.dispatch({ type: 'hi' })
+      rtl.act(() => {
+        store3.dispatch({ type: 'hi' })
+      })
+
       expect(tester.getByTestId('store')).toHaveTextContent('store - 101')
-      store3.dispatch({ type: 'hi' })
-      expect(tester.getByTestId('store')).toHaveTextContent('store - 10202')
     })
 
     it('should handle subscriptions correctly when there is nested Providers', () => {
@@ -170,7 +232,10 @@ describe('React', () => {
 
       const store = createStore(stringBuilder)
 
-      store.dispatch({ type: 'APPEND', body: 'a' })
+      rtl.act(() => {
+        store.dispatch({ type: 'APPEND', body: 'a' })
+      })
+
       let childMapStateInvokes = 0
 
       @connect(state => ({ state }))
@@ -211,7 +276,10 @@ describe('React', () => {
       expect(childMapStateInvokes).toBe(1)
 
       // The store state stays consistent when setState calls are batched
-      store.dispatch({ type: 'APPEND', body: 'c' })
+      rtl.act(() => {
+        store.dispatch({ type: 'APPEND', body: 'c' })
+      })
+
       expect(childMapStateInvokes).toBe(2)
       expect(childCalls).toEqual([['a', 'a'], ['ac', 'ac']])
 
@@ -221,7 +289,10 @@ describe('React', () => {
       expect(childMapStateInvokes).toBe(3)
 
       // Provider uses unstable_batchedUpdates() under the hood
-      store.dispatch({ type: 'APPEND', body: 'd' })
+      rtl.act(() => {
+        store.dispatch({ type: 'APPEND', body: 'd' })
+      })
+
       expect(childCalls).toEqual([
         ['a', 'a'],
         ['ac', 'ac'], // then store update is processed
@@ -249,7 +320,7 @@ describe('React', () => {
       expect(spy).not.toHaveBeenCalled()
     })
 
-    it('should unsubscribe before unmounting', () => {
+    it.skip('should unsubscribe before unmounting', () => {
       const store = createStore(createExampleTextReducer())
       const subscribe = store.subscribe