From 37726cf724668f4ab362d6fcd8e3e2b761fd9be9 Mon Sep 17 00:00:00 2001 From: Ankeet Maini Date: Tue, 21 Jan 2020 17:29:12 +0530 Subject: [PATCH] Pass all tests except saga --- example/components/OfflineQueue.tsx | 4 ++-- src/components/NetworkConnectivity.tsx | 5 +++-- test/ReduxNetworkProvider.test.tsx | 16 ++++++++-------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/example/components/OfflineQueue.tsx b/example/components/OfflineQueue.tsx index e4fdc9ff..8b4aba4d 100644 --- a/example/components/OfflineQueue.tsx +++ b/example/components/OfflineQueue.tsx @@ -3,10 +3,10 @@ import { View, StyleSheet, Text, ScrollView } from 'react-native'; import { connect } from 'react-redux'; import { AppState } from '../redux/createStore'; -type Props = { +interface Props { queue: string[]; title: string; -}; +} const OfflineQueue: FunctionComponent = ({ queue, title }) => { return ( diff --git a/src/components/NetworkConnectivity.tsx b/src/components/NetworkConnectivity.tsx index f933ec1f..a3d6365f 100644 --- a/src/components/NetworkConnectivity.tsx +++ b/src/components/NetworkConnectivity.tsx @@ -70,8 +70,9 @@ class NetworkConnectivity extends React.PureComponent< const netConnected = await NetInfo.isConnected.fetch(); handler(netConnected); } - - connectivityInterval.setup(this.intervalHandler, pingInterval); + if (pingInterval > 0) { + connectivityInterval.setup(this.intervalHandler, pingInterval); + } } componentDidUpdate(prevProps: RequiredProps, prevState: ConnectivityState) { diff --git a/test/ReduxNetworkProvider.test.tsx b/test/ReduxNetworkProvider.test.tsx index 2ed5edbf..bd61c696 100644 --- a/test/ReduxNetworkProvider.test.tsx +++ b/test/ReduxNetworkProvider.test.tsx @@ -10,7 +10,6 @@ import { mapStateToProps, } from '../src/components/ReduxNetworkProvider'; import { connectionChange } from '../src/redux/actionCreators'; -import { NetworkState } from '../src/types'; const dispatch = jest.fn(); const props = { @@ -70,14 +69,15 @@ describe('ReduxNetworkProvider', () => { describe('mapStateToProps', () => { it('maps isConnected and actionQueue state to props', () => { - const networkState: NetworkState = { - isConnected: false, - actionQueue: [], - isQueuePaused: false, - }; + const expected = { isConnected: false }; const state = { - network: networkState, + network: { + actionQueue: [], + isQueuePaused: false, + ...expected, + }, }; - expect(mapStateToProps(state)).toEqual(networkState); + + expect(mapStateToProps(state)).toEqual(expected); }); });