1 files changed, 139 insertions, 31 deletions
diff --git a/ui/app/components/currency-input/tests/currency-input.container.test.js b/ui/app/components/currency-input/tests/currency-input.container.test.js
index 10f530eff..6109d29b6 100644
--- a/ui/app/components/currency-input/tests/currency-input.container.test.js
+++ b/ui/app/components/currency-input/tests/currency-input.container.test.js
@@ -15,47 +15,155 @@ proxyquire('../currency-input.container.js', {
 
 describe('CurrencyInput container', () => {
   describe('mapStateToProps()', () => {
-    it('should return the correct props', () => {
-      const mockState = {
-        metamask: {
+    const tests = [
+      // Test # 1
+      {
+        comment: 'should return correct props in mainnet',
+        mockState: {
+          metamask: {
+            conversionRate: 280.45,
+            currentCurrency: 'usd',
+            nativeCurrency: 'ETH',
+            preferences: {
+              showFiatInTestnets: false,
+            },
+            provider: {
+              type: 'mainnet',
+            },
+          },
+        },
+        expected: {
+          conversionRate: 280.45,
+          currentCurrency: 'usd',
+          nativeCurrency: 'ETH',
+          hideFiat: false,
+        },
+      },
+      // Test # 2
+      {
+        comment: 'should return correct props when not in mainnet and showFiatInTestnets is false',
+        mockState: {
+          metamask: {
+            conversionRate: 280.45,
+            currentCurrency: 'usd',
+            nativeCurrency: 'ETH',
+            preferences: {
+              showFiatInTestnets: false,
+            },
+            provider: {
+              type: 'rinkeby',
+            },
+          },
+        },
+        expected: {
           conversionRate: 280.45,
           currentCurrency: 'usd',
           nativeCurrency: 'ETH',
+          hideFiat: true,
         },
-      }
+      },
+      // Test # 3
+      {
+        comment: 'should return correct props when not in mainnet and showFiatInTestnets is true',
+        mockState: {
+          metamask: {
+            conversionRate: 280.45,
+            currentCurrency: 'usd',
+            nativeCurrency: 'ETH',
+            preferences: {
+              showFiatInTestnets: true,
+            },
+            provider: {
+              type: 'rinkeby',
+            },
+          },
+        },
+        expected: {
+          conversionRate: 280.45,
+          currentCurrency: 'usd',
+          nativeCurrency: 'ETH',
+          hideFiat: false,
+        },
+      },
+      // Test # 4
+      {
+        comment: 'should return correct props when in mainnet and showFiatInTestnets is true',
+        mockState: {
+          metamask: {
+            conversionRate: 280.45,
+            currentCurrency: 'usd',
+            nativeCurrency: 'ETH',
+            preferences: {
+              showFiatInTestnets: true,
+            },
+            provider: {
+              type: 'mainnet',
+            },
+          },
+        },
+        expected: {
+          conversionRate: 280.45,
+          currentCurrency: 'usd',
+          nativeCurrency: 'ETH',
+          hideFiat: false,
+        },
+      },
+    ]
 
-      assert.deepEqual(mapStateToProps(mockState), {
-        conversionRate: 280.45,
-        currentCurrency: 'usd',
-        nativeCurrency: 'ETH',
-      })
+    tests.forEach(({ mockState, expected, comment }) => {
+      it(comment, () => assert.deepEqual(mapStateToProps(mockState), expected))
     })
   })
 
   describe('mergeProps()', () => {
-    it('should return the correct props', () => {
-      const mockStateProps = {
-        conversionRate: 280.45,
-        currentCurrency: 'usd',
-        nativeCurrency: 'ETH',
-      }
-      const mockDispatchProps = {}
-
-      assert.deepEqual(mergeProps(mockStateProps, mockDispatchProps, { useFiat: true }), {
-        conversionRate: 280.45,
-        currentCurrency: 'usd',
-        nativeCurrency: 'ETH',
-        useFiat: true,
-        nativeSuffix: 'ETH',
-        fiatSuffix: 'USD',
-      })
+    const tests = [
+      // Test # 1
+      {
+        comment: 'should return the correct props',
+        mock: {
+          stateProps: {
+            conversionRate: 280.45,
+            currentCurrency: 'usd',
+            nativeCurrency: 'ETH',
+          },
+          dispatchProps: {},
+          ownProps: {},
+        },
+        expected: {
+          conversionRate: 280.45,
+          currentCurrency: 'usd',
+          nativeCurrency: 'ETH',
+          // useFiat: true,
+          nativeSuffix: 'ETH',
+          fiatSuffix: 'USD',
+        },
+      },
+      // Test # 1
+      {
+        comment: 'should return the correct props when useFiat is true',
+        mock: {
+          stateProps: {
+            conversionRate: 280.45,
+            currentCurrency: 'usd',
+            nativeCurrency: 'ETH',
+          },
+          dispatchProps: {},
+          ownProps: { useFiat: true },
+        },
+        expected: {
+          conversionRate: 280.45,
+          currentCurrency: 'usd',
+          nativeCurrency: 'ETH',
+          useFiat: true,
+          nativeSuffix: 'ETH',
+          fiatSuffix: 'USD',
+        },
+      },
+    ]
 
-      assert.deepEqual(mergeProps(mockStateProps, mockDispatchProps, {}), {
-        conversionRate: 280.45,
-        currentCurrency: 'usd',
-        nativeCurrency: 'ETH',
-        nativeSuffix: 'ETH',
-        fiatSuffix: 'USD',
+    tests.forEach(({ mock: { stateProps, dispatchProps, ownProps }, expected, comment }) => {
+      it(comment, () => {
+        assert.deepEqual(mergeProps(stateProps, dispatchProps, ownProps), expected)
       })
     })
   })