aboutsummaryrefslogtreecommitdiffstats
path: root/test/unit/app/controllers/transactions/tx-controller-test.js
Commit message (Expand)AuthorAgeFilesLines
* Set metamask controller network provider to localhostThomas Huang2018-07-311-1/+2
* Merge branch 'develop' into network-remove-provider-engineThomas2018-07-261-3/+10
|\
| * Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into...frankiebee2018-07-111-6/+2
| |\
| * | tests - fix cancle transaction test to better fit new behaviorfrankiebee2018-06-271-3/+10
* | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-07-041-6/+2
|\ \ \ | | |/ | |/|
| * | fix warning for unit testsbrunobar792018-07-031-5/+1
| * | eslint --fix .brunobar792018-07-031-1/+1
| |/
* | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-071-0/+17
|\|
| * adding transaction controller testsCsaba Solya2018-05-301-0/+17
* | test - unit - tx-controller - fix blockTracker stubkumavis2018-05-291-0/+1
* | controllers - transactions - merge @frankiebee's work with minekumavis2018-05-291-2/+4
* | test - unit - tx-controller-test - add history object to txMeta when using in...kumavis2018-05-251-31/+29
|/
* Merge branch 'develop' into testingtmashuang2018-05-221-30/+0
* Moved loose some loose test files to sub folderstmashuang2018-05-211-0/+463