Commit Graph

428 Commits

Author SHA1 Message Date
kumavis 0188e7b94d Merge branch 'master' into NewUI-flat 2017-08-08 23:30:58 -07:00
kumavis 922ecb9149 Merge branch 'master' into greenkeeper/initial 2017-08-08 16:23:14 -07:00
frankiebee e761fb0ef7 use provider stub 2017-08-08 18:30:22 -04:00
frankiebee be4011c310 create a provider stub 2017-08-08 18:30:03 -04:00
Simon Liang 0db627d979 refactored and added unit test 2017-08-08 20:15:30 +08:00
frankiebee 28fbdca830 remove .only 2017-08-07 16:41:54 -04:00
frankiebee f3b42f1e33 Merge branch 'master' into transactionControllerRefractor 2017-08-07 16:24:58 -04:00
frankiebee e7f838e626 fix test 2017-08-07 14:56:17 -04:00
kumavis 78aa957e5a Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-07 10:52:08 -07:00
sdtsui f37f405d52 Fix integration test failures: ensure qr code is accessible 2017-08-04 23:34:54 -07:00
frankiebee 89a4fef1e4 Merge branch 'master' into transactionControllerRefractor 2017-08-04 14:45:22 -04:00
frankiebee 54739cb798 test for pending tx watcher 2017-08-04 14:40:22 -04:00
frankiebee 4ac0b97202 test for SufficientBalance 2017-08-04 14:36:27 -04:00
frankiebee 3dcc199845 rename the test description Transaction Manger -> Message Manger 2017-08-04 13:27:08 -04:00
kumavis 0a5a46b8f4 test - integration - better error handling 2017-08-03 22:24:22 -07:00
kumavis f804567d24 test - integration - syntax - prefer const 2017-08-03 21:50:41 -07:00
kumavis 925edd5f7d test - integration - remove unused code 2017-08-03 21:50:17 -07:00
kumavis 44616483e0 test - integration - throw error on failure 2017-08-03 21:40:32 -07:00
kumavis 5a9257208c Merge branch 'master' into NewUI 2017-08-03 21:02:01 -07:00
kumavis d526f68c8e test - actions - tx - fix async test 2017-08-03 20:56:53 -07:00
kumavis efb7543c6d test - actions - remove commented code 2017-08-03 20:53:47 -07:00
kumavis 500e7d1f04 nodeify - test - syntax nitpick 2017-08-03 20:52:09 -07:00
frankiebee b955b5a89a add test for no callback error 2017-08-03 22:10:33 -04:00
frankiebee a8966c4a4f fix test 2017-08-03 22:02:31 -04:00
kumavis e223b0c789 test - dont mix callback and promise 2017-08-03 16:34:38 -07:00
kumavis da16f39626 Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-03 15:05:32 -07:00
Kevin Serrano 81982d01c0
Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUI 2017-08-03 13:10:46 -07:00
kumavis 8a9d0073b1 Merge pull request #1848 from MetaMask/transactionControllerRefractor
Transaction controller refractor part 1: promises for everyone and more tests!
2017-08-02 19:57:16 -07:00
frankiebee 5ac4c2de6f remove unused sinon 2017-08-02 19:11:51 -04:00
frankiebee 0808eb2256 fix test 2017-08-02 19:07:18 -04:00
frankiebee b80c7e417b move newUnapprovedTransaction to transactions.js 2017-08-02 18:59:34 -04:00
kumavis 8c6f01b910 blacklist controller - breakout from metamask and infura controllers 2017-08-02 15:54:59 -07:00
kumavis ecaa235b5e phishing detection - move phishing detection into contentscript and metamask controller 2017-08-02 14:26:10 -07:00
frankiebee 25cffd21f8 Merge branch 'master' into transactionControllerRefractor 2017-08-02 11:41:29 -04:00
frankiebee 21e76484d6 add test for addTxDefaults 2017-08-02 11:34:45 -04:00
frankiebee 432f516ab0 make addUnapprovedTransaction async function and use promise based ethQuery 2017-08-02 10:26:25 -04:00
kumavis 9eb13aee00 blacklist - add tests for metamask subdomains 2017-08-01 17:05:36 -07:00
kumavis 9d345e744d blacklist - clearer test format 2017-08-01 16:58:40 -07:00
Dan Finlay d932524eaf Merge branch 'master' into NewUI 2017-07-27 15:24:10 -07:00
Dan Finlay f8cadbcb32 Merge branch 'master' into NewUI 2017-07-27 15:10:02 -07:00
Dan Finlay 6675241fa9 Merge branch 'master' into i1805-LiveBlacklistUpdating 2017-07-26 16:46:59 -07:00
Kevin Serrano 6a9d40c558
Add test for blacklister. 2017-07-26 15:24:57 -07:00
kumavis 55a55141d0 nonce-tracker - fix test 2017-07-26 11:43:37 -07:00
kumavis 5ec73c0e65 tx cont - fix test to use async api 2017-07-25 14:39:17 -07:00
kumavis 4445ba1569 tx cont - add argument for provider constructor 2017-07-25 14:36:19 -07:00
Dan Finlay a22adec66f Replace ui with responsive-ui 2017-07-24 17:05:07 -07:00
Dan Finlay a41e5788cf Merge branch 'master' into NewUI 2017-07-20 12:39:06 -07:00
Dan Finlay 86d367957f Move responsive ui into its own folder for easier merges 2017-07-20 12:38:38 -07:00
sdtsui 2adfce772c Add new tests for dropdown component 2017-07-18 05:31:52 -07:00
Dan Finlay 614501e743 Fix transaction confirmation ordering
Newest tx or message will now always appear last, and a new tx proposed after the user has a confirmation box open will never change the confirmation to a different tx proposed.

Fixes #1637
2017-07-17 14:18:00 -07:00