Fixed CardTransaction test

luniehq · Dec 1, 2017 · 9f9bcb9 · 9f9bcb9
1 parent 9105bf4
commit 9f9bcb9
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 38 deletions.
diff --git a/app/src/renderer/components/wallet/CardTransaction.vue b/app/src/renderer/components/wallet/CardTransaction.vue
@@ -1,23 +1,18 @@
 <template lang='pug'>
 .card-transaction
   .key-value(v-for='coin in coins')
-    .value(:class='sign(coin.amount * (sent ? -1 : 1))') {{ coin.amount }}
+    .value(:class='sent ? "negative" : "positive"') {{ coin.amount }}
     .key {{ coin.denom.toUpperCase() }}
   .date {{ date }}
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
 import dateUnixAgo from 'scripts/dateUnixAgo'
 export default {
   computed: {
-    ...mapGetters([ 'wallet' ]),
     // TODO: sum relevant inputs/outputs
     sent () {
-      return this.transactionValue.tx.inputs[0].sender === this.wallet.key.address
-    },
-    received () {
-      return this.transactionValue.tx.outputs[0].receiver === this.wallet.key.address
+      return this.transactionValue.tx.inputs[0].sender === this.address
     },
     coins () {
       return this.transactionValue.tx.inputs[0].coins
@@ -26,16 +21,7 @@ export default {
       return dateUnixAgo(this.transactionValue.time)
     }
   },
-  methods: {
-    sign (num) {
-      if (num > 0) {
-        return 'positive'
-      } else if (num < 0) {
-        return 'negative'
-      }
-    }
-  },
-  props: ['transaction-value']
+  props: ['transaction-value', 'address']
 }
 </script>
 

diff --git a/app/src/renderer/components/wallet/PageTransactions.vue b/app/src/renderer/components/wallet/PageTransactions.vue
@@ -9,7 +9,8 @@ page(title='Transactions')
 
   card-transaction(
     v-for="i in filteredTransactions"
-    :transaction-value="i")
+    :transaction-value="i"
+    :address="wallet.key.address")
   data-empty-tx(v-if='filteredTransactions.length === 0')
 </template>
 
@@ -40,7 +41,7 @@ export default {
     ToolBar
   },
   computed: {
-    ...mapGetters(['filters', 'transactions']),
+    ...mapGetters(['filters', 'transactions', 'wallet']),
     filteredTransactions () {
       return this.transactions
       // TODO: restore searchability? (what part of the tx are we searching?)

diff --git a/test/unit/specs/CardTransaction.spec.js b/test/unit/specs/CardTransaction.spec.js
@@ -2,21 +2,32 @@ import { shallow } from 'vue-test-utils'
 import CardTransaction from 'renderer/components/wallet/CardTransaction'
 
 describe('CardTransaction', () => {
-  let wrapper, num, result
+  let wrapper
   let propsData = {
     transactionValue: {
       tx: {
         inputs: [
           {
-            coins: {
+            coins: [{
               denom: 'jbcoins',
               amount: 1234
-            }
+            }],
+            sender: 'otherAddress'
+          }
+        ],
+        outputs: [
+          {
+            coins: [{
+              denom: 'jbcoins',
+              amount: 1234
+            }],
+            recipient: 'myAddress'
           }
         ]
       },
-      time: new Date()
-    }
+      time: Date.now()
+    },
+    address: 'myAddress'
   }
 
   beforeEach(() => {
@@ -28,18 +39,4 @@ describe('CardTransaction', () => {
   it('has the expected html structure', () => {
     expect(wrapper.vm.$el).toMatchSnapshot()
   })
-
-  it('returns negative as a string for numbers below zero', () => {
-    num = -1
-    result = wrapper.vm.sign(num)
-
-    expect(result).toEqual('negative')
-  })
-
-  it('returns positive as a string for numbers above zero', () => {
-    num = 1
-    result = wrapper.vm.sign(num)
-
-    expect(result).toEqual('positive')
-  })
 })