1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-23 02:10:12 +01:00
Commit Graph

677 Commits

Author SHA1 Message Date
Chi Kei Chan
5a1d50cd43 Merge branch 'master' into mmn 2017-09-27 22:32:07 -07:00
kumavis
cdf41c2857 Merge pull request #2124 from MetaMask/breakout-mascara
require metamascara
2017-09-27 16:27:01 -07:00
kumavis
15b2823e54 Merge branch 'master' into new-currency-test 2017-09-27 16:04:51 -07:00
kumavis
ecf909e140 Merge pull request #2194 from MetaMask/network-controller-refactor
Network controller refactor
2017-09-27 15:56:23 -07:00
kumavis
f2d9b75e94 network controller - refactor to use _setProvider 2017-09-27 14:44:13 -07:00
kumavis
4404dfc5d3 Merge branch 'master' into direct-block-tracker 2017-09-27 13:58:54 -07:00
kumavis
5bbea78306 Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3
Transaction controller refractor pt3
2017-09-27 13:57:04 -07:00
kumavis
b41aad6d1a style - small whitespace nitpick 2017-09-27 12:33:46 -07:00
Dan Finlay
e72083f6e8 Merge branch 'master' into filter-fixes-moar 2017-09-27 10:57:02 -07:00
frankiebee
0a94ec41d3 pending-tx - move incrementing of the retryCount on the txMeta outside pending-tx-tracker 2017-09-26 22:42:59 -07:00
kumavis
1877c0766c Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOutKeyringController 2017-09-26 21:42:30 -07:00
frankiebee
b05a6f89cb fix tests 2017-09-26 18:19:44 -07:00
frankiebee
36ddaf220d Merge branch 'transactionControllerRefractorPt3' of https://github.com/MetaMask/metamask-extension into transactionControllerRefractorPt3 2017-09-26 18:16:00 -07:00
frankiebee
80c98b1653 transactions: make evnt names pretty and eaiser to read 2017-09-26 16:55:11 -07:00
frankiebee
9fd5458112 transactions: lint fixes and reveal status-update event for balance controller 2017-09-26 16:54:04 -07:00
frankiebee
8ab23c713d Merge branch 'master' into transactionControllerRefractorPt3 2017-09-26 16:24:43 -07:00
frankiebee
4f887c6a62 fix test 2017-09-26 13:44:45 -07:00
frankiebee
b654eb9b1f wrap block tracker in events proxy 2017-09-26 13:38:27 -07:00
Kevin Serrano
31e9dcf470
Modify tests for new API. 2017-09-26 10:02:49 -07:00
tmashuang
ff6f7b52e4 Clean up transactionController tests 2017-09-25 19:47:03 -07:00
Dan Finlay
feed9a5a17 Add mock random value generator 2017-09-25 14:45:28 -07:00
Dan Finlay
d9c92cdbd1 Merge branch 'AddBalanceController' of github.com:MetaMask/metamask-plugin into AddBalanceController 2017-09-25 14:37:11 -07:00
Dan Finlay
8cd7329c91 Implemented feedback 2017-09-25 14:36:49 -07:00
Dan Finlay
dfbdb99858 Merge branch 'master' into AddBalanceController 2017-09-25 11:49:38 -07:00
tmashuang
20fea3f1de Remove pending updateAndApprovedTransaction test 2017-09-25 10:47:36 -07:00
tmashuang
d4578836c9 Most of transaction controller tests 2017-09-22 16:15:18 -07:00
Dan Finlay
443b1a8eb7 Remove keyring controller from project 2017-09-22 14:38:40 -07:00
Dan Finlay
aa2abc00eb Merge branch 'AddBalanceController' into BreakOutKeyringController 2017-09-22 14:30:31 -07:00
Dan Finlay
f128240e7f Fix test references 2017-09-22 14:19:14 -07:00
Dan Finlay
f9d2f523c6 Merge branch 'master' into AddBalanceController 2017-09-22 14:12:41 -07:00
Dan Finlay
e9043f22df Allow custom encryptor to be passed to MetaMaskController and KeyringControllers. 2017-09-21 15:47:25 -07:00
frankiebee
4e57cdf8b3 stub platform 2017-09-19 11:34:19 -07:00
Chi Kei Chan
a67d3ecd46 Merge branch 'master' into NewUI-flat 2017-09-18 18:13:15 -07:00
kumavis
9f665d8eda test - integration - bump timeout 2017-09-18 13:06:35 -07:00
Chi Kei Chan
6c5865d564 Merge branch 'master' into nm 2017-09-18 11:28:10 -07:00
kumavis
5d01ca10e4 tests - mascara - increase timeout before test starts 2017-09-15 13:19:31 -07:00
kumavis
a9900be085 test - mascara - move skip reload test flag 2017-09-15 13:13:53 -07:00
kumavis
779e973b45 tests - integration - mascara - small cleanup and timeout adjustments 2017-09-15 12:19:52 -07:00
frankiebee
c5a2527c17 set time if platform is mascara 2017-09-15 11:57:25 -07:00
frankiebee
7bcca782cb remove testem files 2017-09-15 11:33:55 -07:00
frankiebee
7fb8623568 dont reload on initial download and wait before passing sw to ui 2017-09-15 11:09:19 -07:00
kumavis
b53d04c409 tests - integration - get flat and mascara tests closer to compatible 2017-09-13 20:25:27 -07:00
kumavis
610f09262d tests - refactor and rename npm scripts 2017-09-13 17:17:09 -07:00
kumavis
cbff5fd450 tests - mascara - move temp build files into dist/mascara 2017-09-13 16:52:38 -07:00
kumavis
56db3999ad tests - start migrating mascara tests to karma 2017-09-13 16:45:31 -07:00
Dan Finlay
c9585f166f Fix test 2017-09-13 15:21:18 -07:00
Dan Finlay
c17c657693 Merge branch 'master' into AddBalanceController 2017-09-13 15:11:03 -07:00
frankiebee
59909601b8 add test for pendingTxCount 2017-09-13 14:07:22 -07:00
Dan Finlay
53a467cd1e Some progress 2017-09-12 15:06:19 -07:00
tmashuang
a79b4db06a E2E testing with selenium 2017-09-12 14:14:24 -07:00
frankiebee
3ad67d1b14 match other controller patterns 2017-09-12 09:59:59 -07:00
kumavis
48d21f4fca tests - integration - fix bad cherry-pick 2017-09-11 22:34:16 -07:00
kumavis
0e70366e9c test - integration - drop testem for karma 2017-09-11 22:29:40 -07:00
kumavis
d4a41e0277 test - integration - build - manually exit from test builder + add bundle destination log 2017-09-11 22:26:36 -07:00
kumavis
19d6618c04 test - integration - build - use pump + log bundling information 2017-09-11 22:25:31 -07:00
kumavis
a6d49a49ea test - integration - use async fn for error catching 2017-09-11 15:48:50 -07:00
Dan Finlay
4738746968 Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceController 2017-09-11 15:19:17 -07:00
frankiebee
9b9df41724 more tests and craete a getPendingTransactions function 2017-09-08 14:24:40 -07:00
Kevin Serrano
13c7b28d40 Merge pull request #1987 from MetaMask/CheckFaq67
Add test for trying to reproduce faq#67
2017-09-07 15:26:29 -07:00
Dan Finlay
65c00e9fbb Improve test name 2017-09-07 12:53:30 -07:00
Dan Finlay
532a4040de Add test for computing gas price 2017-09-07 12:52:25 -07:00
Dan Finlay
c616581001 Remove logs 2017-09-07 12:47:52 -07:00
Dan Finlay
a95a3c7e4f Fix balance calc test 2017-09-07 12:47:27 -07:00
Dan Finlay
7b92268428 Fix valueFor test 2017-09-07 12:43:10 -07:00
Dan Finlay
4058574436 Add basic test for valueFor 2017-09-07 12:30:25 -07:00
Dan Finlay
b6e8791bc2 test not passing 2017-09-07 11:59:15 -07:00
Dan Finlay
f9a052deed Add first passing balance calc test 2017-09-06 14:36:15 -07:00
Dan Finlay
714df393b4 Add test template 2017-09-06 14:27:21 -07:00
frankiebee
6c83ba762e Merge branch 'master' into transactionControllerRefractorPt3 2017-09-06 13:45:03 -07:00
tmashuang
36a44ef61f Update mock-store dependency 2017-09-06 11:04:17 -07:00
frankiebee
15c12ca4bb add better comments 2017-09-05 21:50:36 -07:00
frankiebee
00bd5b143f rename tx-utils.js -> tx-gas-utils.js 2017-09-05 20:33:50 -07:00
frankiebee
4c554f32ec remove #buildEthTxFromParams 2017-09-05 20:13:43 -07:00
Dan Finlay
2117490d41 Add test for trying to reproduce faq#67
Failed to reproduce this issue with the same inputs.
2017-08-29 11:36:53 -07:00
Dan Finlay
b97a65e1d1 Add some tests to tx-state-history-helper 2017-08-28 11:40:28 -07:00
Dan Finlay
e057c37b33 Corrected test constraints 2017-08-23 21:03:29 -07:00
Dan Finlay
dae7c632d6 Add mysterious failing test 2017-08-23 21:01:42 -07:00
Dan Finlay
855f4eeacb Pass nonce tests 2017-08-23 20:43:47 -07:00
Dan Finlay
221575a191 Fix new test, break an older maybe wrong one 2017-08-23 20:04:03 -07:00
Dan Finlay
5feda43360 Add failing test for newly identified error state
Reproduces #1966
2017-08-23 19:34:44 -07:00
Dan Finlay
b3b62d97a3 Merge branch 'master' into useLocalNonce 2017-08-23 11:12:46 -07:00
Dan Finlay
38ba31bbe0 Refer to pending nonces, not just their count 2017-08-21 17:29:31 -07:00
frankiebee
e43db262d8 fix test 2017-08-21 16:44:29 -07:00
Dan Finlay
bb24f07b17 When network nonce is highest, it should be used. 2017-08-21 11:59:51 -07:00
Dan Finlay
0f36e0e6da Fix test 2017-08-21 11:57:42 -07:00
Dan Finlay
440101f2b5 Add new assertions and de-duplicate nonce tracker generation 2017-08-21 11:52:41 -07:00
frankiebee
474a4e941f fix tests 2017-08-21 11:51:34 -07:00
Dan Finlay
306249e89e Add test for no previous txs 2017-08-21 11:39:22 -07:00
Dan Finlay
f13c637b23 Confine mock strategy to describe block 2017-08-21 11:37:39 -07:00
Dan Finlay
c76194d7c3 Move mock txs to tx mocking class 2017-08-21 11:35:51 -07:00
frankiebee
fbba3a1ac8 Merge branch 'master' into transactionControllerRefractorPt3 2017-08-21 11:35:22 -07:00
frankiebee
e9712a13ec Create tests for TxStateManager 2017-08-18 14:11:18 -07:00
frankiebee
bf8a62eb39 add test for using localNonce 2017-08-18 13:53:18 -07:00
Dan Finlay
e0c35179c2 Merge pull request #1914 from MetaMask/history-diff
Move Tx State History to diff-based format
2017-08-18 13:14:17 -07:00
Dan Finlay
f684b53b69 Remove dead tests 2017-08-16 17:17:05 -07:00
kumavis
a9e5564e8d tx controller - test - fix typo from moved test 2017-08-14 19:34:22 -07:00
kumavis
1af797b1b3 tx controller - tx state history various small fixes 2017-08-14 19:15:36 -07:00
kumavis
fec0f2ca5e tx controller - test - test tx state history in updateTx 2017-08-14 19:15:09 -07:00
kumavis
fdffb6fedc introduce tx-state-history-helper and diff-based history 2017-08-14 18:46:04 -07:00
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
tmashuang
a4c7d95d0d Sinon stub infura network status 2017-07-14 13:06:42 -07:00
tmashuang
02cf65d513 Use Let instead of var 2017-07-14 11:50:41 -07:00
tmashuang
bda52f7cba Infura Network response tests 2017-07-14 10:34:03 -07:00
frankiebee
7eccf5905a make publishTransaction and signTransaction async methods 2017-07-13 15:25:43 -04:00
sdtsui
1507da139d Add tests for new dropdown component 2017-07-13 00:40:22 -07:00
frankiebee
751103d948 Merge branch 'master' into nonce-tracker 2017-07-12 15:10:58 -07:00
frankiebee
aeefcbd75b Fix test to match behavior 2017-07-12 15:10:52 -07:00
kumavis
23d44e5399 tests - disable infura test 2017-07-11 15:30:36 -07:00
frankiebee
971d25a8ab Merge branch 'master' into nonce-tracker 2017-07-11 12:41:03 -07:00
Dan Finlay
c7b9e3fb18 Improve insufficient balance checking in retry loop 2017-07-11 12:19:01 -07:00
kumavis
f5de16c911 test - tx controller - fix promise handling 2017-07-07 14:32:03 -07:00
kumavis
ab8bae421e test - tx-controller - stub block-tracker method 2017-07-07 14:26:52 -07:00
kumavis
d228f46254 Merge branch 'master' into nonce-tracker 2017-07-07 14:21:43 -07:00
Dan Finlay
07d4e4fe6f Fix failing test 2017-07-05 23:24:33 -07:00
Dan Finlay
96df7ad8d3 Add missing done 2017-07-05 23:04:51 -07:00
Dan Finlay
ef1282b556 Typo fix 2017-07-05 22:48:11 -07:00
Dan Finlay
a915dfdeaa Add failing test for retrying an over-spending tx 2017-07-05 22:36:52 -07:00
frankiebee
847a4282a2 Merge branch 'master' into nonce-tracker 2017-06-27 13:10:56 -07:00
Thomas Huang
8b5b2d8329 Merge pull request #1663 from MetaMask/infura-status
Add Infura Status Information to UI State
2017-06-26 12:06:23 -07:00
frankiebee
42a2bcb132 remove option fetch 2017-06-22 14:06:20 -07:00
frankiebee
1ddcbaad5b add done and stub fetch 2017-06-22 13:47:20 -07:00
Kevin Serrano
199663c0a4
Add test for infura controller. 2017-06-22 12:51:53 -07:00
Dan Finlay
c0c588053a Print integration build errors 2017-06-22 09:46:03 -04:00
frankiebee
abbbe1156c Merge branch 'master' into nonce-tracker 2017-06-21 19:52:28 -07:00
frankiebee
92df9965eb fix nonceTracker 2017-06-21 19:51:00 -07:00
frankiebee
fa8c74fe9b add a test for #getNonceLock 2017-06-21 17:28:19 -07:00
Thomas Huang
88844946fe Remove second linting script for tests 2017-06-17 12:14:35 -07:00
frankiebee
e672f2da0d remove irrelevant test 2017-06-16 17:04:56 -07:00
frankiebee
b67bc7043e Fix test to call done 2017-06-15 15:25:22 -07:00
kumavis
b3492d9c17 transaction controller - use nonce-tracker 2017-06-14 23:44:02 -07:00
frankiebee
a10740af7e add a check for weather a tx is included in a block when jumping blocks 2017-06-14 20:17:59 -07:00
Thomas Huang
c0f07844af Finish async when failing async test 2017-06-12 17:52:37 -07:00
Thomas Huang
dbc48c3992 Make test Async 2017-06-12 17:42:54 -07:00
Thomas Huang
13e6672028 Linting 2017-06-12 11:08:32 -07:00
Dan Finlay
8af41f1b05 Merge pull request #1574 from MetaMask/internfix
Wording fix for notice button
2017-06-12 10:37:46 -07:00
Kevin Serrano
2fcf3d8439
Modify wording to new accept. 2017-06-09 10:48:28 -07:00
Kevin Serrano
cb95129fa1
Merge branch 'master' of github.com:nihar97/metamask-plugin into internfix 2017-06-08 16:10:59 -07:00
Kevin Serrano
f7773538eb
Modify tests for new api mock.' 2017-06-05 16:24:32 -07:00
Kevin Serrano
5e19a4a833
Modfiy test to ether standards. 2017-05-24 10:51:44 -07:00
Kevin Serrano
45285a5a2f
Merge branch 'master' into i1412-decimalizethegas 2017-05-24 09:55:32 -07:00
frankiebee
e23c0f98fa clean up test 2017-05-24 11:57:31 -04:00
frankiebee
db982cf795 stop polling when switching networks 2017-05-24 11:52:18 -04:00
frankiebee
243eeff7cb Fix for tests 2017-05-23 19:49:57 -04:00
Kevin Serrano
31d17c9e25
Fix test, create new value for precision/scale 2017-05-23 14:26:37 -07:00
Kevin Serrano
717db41d0b
Modify test, replace clone package. 2017-05-17 14:18:01 -07:00
Dan Finlay
bfb1c92ded Linted test 2017-05-17 00:35:26 -07:00
Dan Finlay
6f02f5bc5d Clean up test 2017-05-17 00:33:19 -07:00
Dan Finlay
e26501aa01 Simplify test to represent realistic use case 2017-05-17 00:19:31 -07:00
Dan Finlay
c2b012ccc5 Merge branch 'master' into i1412-BrutalTests 2017-05-17 00:16:26 -07:00
Dan Finlay
c0516ddf33 Add test requiring high precision 2017-05-17 00:10:18 -07:00
Dan Finlay
6491b42266 Add test around txManager#approveTransaction 2017-05-16 18:16:18 -07:00