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

833 Commits

Author SHA1 Message Date
Alexander Tseung
4c15c0d3ba Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-05 23:17:22 -07:00
frankiebee
d4e30040a2 migrations - back fixes 2018-04-05 19:33:10 -07:00
frankiebee
7d243aacf9 create migration 25 2018-04-05 18:05:03 -07:00
frankiebee
1ba74c1566 test - run live migrations over first time state 2018-04-05 17:49:50 -07:00
frankiebee
b9243cd8b9 meta - create a migration template 2018-04-05 16:25:13 -07:00
kumavis
741c6097a2
Merge pull request #3887 from MetaMask/i#3886
transactions - remove unnecessary keys on txParams
2018-04-05 15:06:29 -07:00
frankiebee
c02da0f27c transactions - _normalizeTxParams will now return a new object for txParams 2018-04-05 12:12:02 -07:00
frankiebee
4efc718074 make migration-24 compat with first-time-state 2018-04-05 11:28:25 -07:00
Alexander Tseung
82af778e62 Revert "commit"
This reverts commit fa8500e09a.
2018-04-05 10:11:09 -07:00
Alexander Tseung
fa8500e09a commit 2018-04-05 09:53:24 -07:00
frankiebee
343f0e9e80 transactions - remove unnecessary keys on txParams 2018-04-04 22:29:43 -07:00
Alexander Tseung
254cf975a6 Fix confirm-sig-requests integration test 2018-04-04 18:46:22 -07:00
Alexander Tseung
5b2ace3b80 Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-04 18:21:35 -07:00
Alexander Tseung
037d6e6624 Fix integration tests 2018-04-04 18:21:30 -07:00
frankiebee
245c01bc0f transactions - make #_validateTxParams not async and "linting" wink wink nudge nudge 2018-04-04 14:57:27 -07:00
frankiebee
8243824c6a hot-fix - migrate unaproved txParams so that the from is lowercase 2018-04-04 14:27:28 -07:00
frankiebee
457a47bf62 transactions - normalize txParams 2018-04-04 14:27:20 -07:00
Thomas
7aa54916d8 Update Sinon methods. sinon.sandbox.create() -> sandbox.createSandbox() 2018-04-04 14:26:18 -07:00
kumavis
ca780075a8
Merge pull request #3834 from MetaMask/3734
Address Add Token design feedback
2018-04-03 17:00:12 -07:00
Dan Finlay
c75918493d Fix and improve test 2018-04-03 14:03:56 -07:00
Dan Finlay
74049c19fc Internationalize currency
Fixes #3580
2018-04-03 13:58:26 -07:00
David Yoo
3d2b32167b Fix tests 2018-04-02 17:21:30 -07:00
Frankie
c14ec41917
Merge pull request #3831 from MetaMask/i#3770
some more transaction validation bug fixes
2018-04-02 16:18:35 -07:00
kumavis
d5a88cdc00 ci:screens - turn on repeat in walkthrough gif 2018-04-02 15:51:00 -07:00
frankiebee
b58ca99b61 tests - fix txController tests so that txMetas have a from feild 2018-04-02 15:44:03 -07:00
kumavis
98e0fc1ab9 Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens 2018-04-02 14:13:45 -07:00
frankiebee
e8a480aac4 transactions validationt - valdate from field on txParams 2018-04-02 13:17:54 -07:00
Thomas
68808c8e24 Merge branch 'testing' of https://github.com/tmashuang/metamask-extension into testing 2018-04-02 10:04:53 -07:00
kumavis
d699c9b8b4
Merge pull request #3801 from danjm/i3684-txlistitemstest
Adds integration tests for different tx list items
2018-03-30 21:36:45 -07:00
kumavis
8db097d8d9 ci - screens - increase delay before setting provider type 2018-03-30 18:14:26 -07:00
kumavis
69ff600c74 ci - screens - add delay after setting network 2018-03-30 17:36:43 -07:00
kumavis
a3f7cd1cfc development - ci-screens - remove mocha wrapper that was losing exit code 2018-03-30 15:03:49 -07:00
kumavis
7a406d51c3 development - screens - fix screenshot on failure 2018-03-30 14:48:41 -07:00
kumavis
d05a2ca968 development - screens - screenshot on failure 2018-03-30 14:39:43 -07:00
kumavis
7dde948c45 Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens 2018-03-30 13:57:50 -07:00
kumavis
32bb09bcb9 test - e2e - set network to localhost 2018-03-30 13:52:42 -07:00
kumavis
b014133fdc development - screens - use localhost for network 2018-03-30 11:16:08 -07:00
kumavis
0d27d27efa development - screenshotter - capture en locale and build gif from only en 2018-03-30 00:59:16 -07:00
kumavis
fcdfd48057 development - screenshotter - capture screens across all locales 2018-03-30 00:48:37 -07:00
kumavis
5945c8cf67 development - create selenium screen shotter 2018-03-30 00:09:39 -07:00
Dan
2979de2e6b Adds integration tests for rendering of tx list items. 2018-03-30 02:08:29 -02:30
kumavis
592c2e5948 test - add auto screen shotter 2018-03-29 17:02:40 -07:00
kumavis
b49ad750dd Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts 2018-03-29 16:54:00 -07:00
kumavis
971204eb06
Merge branch 'master' into e2e-selector 2018-03-29 13:57:43 -07:00
kumavis
552fb1fabe test - e2e - fix selector with extra div (?) 2018-03-29 13:54:01 -07:00
kumavis
2328b120da test - e2e - generate artifacts on test failure 2018-03-29 13:49:54 -07:00
Thomas Huang
49d27815f3
Merge pull request #3794 from MetaMask/e2e-selector
test - e2e - prefer css selectors over xpath
2018-03-29 12:14:33 -07:00
Thomas
53172f1b55 Better delays and fix logout css selector 2018-03-29 12:06:23 -07:00
kumavis
830b232cb9 test - e2e - prefer css selectors over xpath 2018-03-29 11:59:13 -07:00
Frankie
650b716f55
Merge pull request #3782 from MetaMask/i3670-FixNonceBug
Add test for suspected nonce bug
2018-03-28 14:38:40 -07:00
Dan Finlay
f50a7a8fe8 Rename variable to be more understandable 2018-03-28 14:18:03 -07:00
Dan Finlay
47039cc3a9 Add test to reproduce issue behavior 2018-03-28 14:07:56 -07:00
kumavis
5834c13769 ui - change window title 'MetaMask Plugin' to 'MetaMask' 2018-03-28 13:37:02 -07:00
kumavis
5290570c8f Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux 2018-03-27 17:17:04 -07:00
kumavis
b6b18339e2
Merge pull request #3758 from MetaMask/i#3731
I#3731
2018-03-27 17:01:01 -07:00
frankiebee
f0f45e6fe1 migration for removing unnecessary transactions from state 2018-03-27 16:49:13 -07:00
kumavis
914a098c8a Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux 2018-03-27 14:28:37 -07:00
Thomas
f66dbec0a4 Metamask controller methods 2018-03-27 14:02:00 -07:00
Thomas
ecbb59495a Remove console.log 2018-03-27 13:59:54 -07:00
Thomas
25eb917c60 Update blacklist 2018-03-27 13:59:37 -07:00
Thomas Huang
8648aee907
Merge branch 'master' into selenium-e2e 2018-03-27 13:28:58 -07:00
Dan
d2bd5687e8 Merge branch 'master' into i18n-translator-redux 2018-03-27 10:17:48 -02:30
Thomas Huang
e001c0900b
Merge pull request #3680 from danjm/i3517-popup-newui-onboarding
Popup uses new ui onboarding when in beta.
2018-03-26 14:55:50 -07:00
Thomas Huang
b0fae2ca39
Merge pull request #3710 from danjm/i3326-addtokenscreendesignupdate
Updates Add token screen to latest design.
2018-03-26 14:55:30 -07:00
Thomas Huang
8b719a418a
Merge pull request #3729 from MetaMask/test-timeout-fix
test - remove timeout causing mocha disconnect issues
2018-03-26 14:53:21 -07:00
Frankie
5a61a6d57a migration for adding submittedTime to the txMeta (#3727)
* test for migration 022

* write migration 022 adding submittedTime to txMetas whove been submitted
2018-03-26 14:24:12 -07:00
kumavis
15952816c1 test - remove timeout causing mocha disconnect issues
Revert "test - flat - add extra timeout"

This reverts commit 4c2cf15d2a.
2018-03-26 13:58:21 -07:00
Dan
1779cff65b Merge branch 'master' into i3326-addtokenscreendesignupdate 2018-03-26 16:51:02 -02:30
Dan
07dd064247 Fix tests. 2018-03-26 16:27:19 -02:30
Dan
4f0881e41b Merge branch 'master' into i18n-translator-redux 2018-03-26 16:13:49 -02:30
Dan Finlay
fe6f22ee69
Merge pull request #3721 from alextsg/cb-944
Update button styles
2018-03-26 11:29:04 -07:00
Dan
a30b5ccd95 Update add token integration tests. 2018-03-26 12:15:40 -02:30
Dan
a109a774a5 Use ens-input component in send-v2 to allow sending to ens names. 2018-03-26 11:40:11 -02:30
Alexander Tseung
cfa2592d78 Update button styles 2018-03-25 22:58:04 -07:00
Dan
3ed9933adb Include locales in served test files. 2018-03-23 14:28:34 -02:30
kumavis
4c2cf15d2a test - flat - add extra timeout, idk maybe 2018-03-21 13:31:43 -07:00
Thomas
d646f37741 Merge branch 'master' into selenium-e2e 2018-03-21 12:25:41 -07:00
Alexander Tseung
3c1248c816 Update confirm transaction screen 2018-03-20 11:56:12 -07:00
Dan
d8788af9b8 Merge branch 'master' into retry-tx-refractor 2018-03-19 15:30:47 -02:30
Thomas Huang
424e98f6a8
Merge pull request #3594 from danjm/i3344-improve-currency-input
Currency input defaults to empty string
2018-03-19 09:20:04 -07:00
Dan
62a95139e6 Use customized react-trigger-change in send-new-ui integration tests.. 2018-03-19 12:57:58 -02:30
anticlimactic
a1db40047c Remove unused files from ui folder. (#3577)
* Removed unused UI files. Fixes #3434.

* Reverted the deletion of "feature-toggle-utils.js". Reverted the deletion of the test files and modified the paths so they referred to the old-ui.
2018-03-19 12:41:24 -02:30
Alexander Tseung
4512243290
Fix styling on confirm-send-ether and confirm-send-token (#3600) 2018-03-16 16:39:00 -07:00
frankiebee
cd721f52cb Merge branch 'master' into retry-tx-refractor 2018-03-15 08:07:16 -07:00
Thomas
6306c7b190 Merge branch 'master' into selenium-e2e 2018-03-14 13:29:47 -07:00
kumavis
39a831e2a0 deps - use pify instead of util.promisify 2018-03-14 10:32:55 -07:00
Dan
f8e13fd793 Fix tests. 2018-03-14 12:28:26 -02:30
Dan
798988597b Merge branch 'master' into retry-tx-refractor 2018-03-14 00:02:27 -02:30
frankiebee
c6dff98ee1 tests - add tests for transactions#retryTransaction and transactions#_markNonceDuplicatesDropped 2018-03-13 14:30:59 -07:00
kumavis
4bc69f72c3 test - mascara - fix async wrap 2018-03-11 21:39:46 -07:00
kumavis
3537c391db test - use new async selectors for faster testing 2018-03-11 19:29:35 -07:00
kumavis
07fa26d1f0 test - add comment about test behavior oddity 2018-03-11 18:52:27 -07:00
kumavis
0419276958 test - poll for element instead of manual timeouts 2018-03-11 14:52:29 -07:00
kumavis
74502296ed ci - split integration tests into parallel firefox and chrome runs 2018-03-10 11:09:45 -08:00
Thomas
a62fe4f7ea Update selenium tests 2018-03-09 23:57:44 -08:00
Thomas
d5b1d6182b Merge branch 'master' into selenium-e2e 2018-03-09 15:01:48 -08:00
kumavis
7d0363e950
Merge pull request #3497 from MetaMask/testing
Persist rinkeby.infura.io and clean nock after
2018-03-09 11:49:48 -08:00
Thomas
ae795c9770 Persist rinkeby.infura.io and clean nock after 2018-03-09 11:20:18 -08:00
Dan Finlay
f4e5dd37b1
Merge pull request #3409 from scsaba/seed-phrase-verification
Add seed phrase verification script into background process
2018-03-07 16:47:13 -08:00
Jeffrey Tong
cad5f5f000 fix typo in tests and tx-state-manager 2018-03-07 10:24:36 -08:00
kumavis
8a444ec96f
Merge pull request #3259 from MetaMask/controllerStubs
Offline testing
2018-03-06 17:21:36 -08:00
Dan Finlay
dd9cac69ae
Merge pull request #3309 from scsaba/edge-support
Add Edge Support
2018-03-06 09:39:57 -08:00
Csaba Solya
8fde208f0b move more test code to beforeEach 2018-03-04 08:57:55 +01:00
Csaba Solya
2b86d65d0c verify seedwords on log in 2018-03-03 22:08:10 +01:00
Csaba Solya
3e05b693db verify addresses regardless case 2018-03-03 14:11:02 +01:00
Csaba Solya
92453f8715 seed phrase verifier 2018-03-03 00:32:57 +01:00
Dan Finlay
3a9b3794eb Remove logs 2018-03-02 14:01:53 -08:00
Dan Finlay
bf17d7e115 Add version bumping script
One step towards automating our deploy process is automating our version
bumping scheme. This PR does that.
2018-03-02 13:55:56 -08:00
Thomas
f9de87af51 Using noop to not lose it 2018-02-27 15:51:14 -08:00
Thomas
b2f53fa354 Revert initializing first-time-state 2018-02-27 15:50:49 -08:00
Csaba Solya
1b367bc215 fix test 2018-02-23 11:11:14 +01:00
Csaba Solya
8292dabed5 add negative decrypt test 2018-02-23 11:03:53 +01:00
Csaba Solya
cd05d77c3f fix tests 2018-02-23 10:49:56 +01:00
Csaba Solya
c1aa59f6ed adding tests 2018-02-23 10:08:23 +01:00
Dan J Miller
170c7602b7
[NewUI] Adds the mascara first time flow to betaUI extension (#3257)
* Adds the mascara first time flow to the extension when opened in browser.

* Fix tests after addition of mascara first time flow to new ui.
2018-02-16 06:15:09 -03:30
Thomas Huang
8f7094a73d Network controller nock 2018-02-15 09:54:22 -08:00
Thomas Huang
33182efb13 Offline testing 2018-02-15 08:34:31 -08:00
Dan
b0db68a281 Merge branch 'uat' into uat-next 2018-02-07 21:19:14 -03:30
Dan
6f14dc4702 Point add-token unit test to old-ui component. 2018-02-07 20:55:21 -03:30
Dan
d8896a8c31 Merge branch 'master' into uat 2018-02-07 16:32:47 -03:30
Alexander Tseung
9db0a32dac
Update modal header design on send screen (#3196) 2018-02-06 21:07:00 -08:00
Dan J Miller
a7bfea51e5 Integration tests for signature requests confirmations. (#3194) 2018-02-06 10:20:37 -08:00
Alexander Tseung
d452403322
Add functional integration testing to Add Token flow (#3189) 2018-02-05 18:47:46 -08:00
Frankie
1a93b1ade2
Merge pull request #3146 from MetaMask/i3082-AddTokenValidateInputs
Set address to default with empty string, add test validation.
2018-01-31 14:18:47 -08:00
Frankie
201e0579a5
Merge branch 'master' into localStorage-clean-up 2018-01-31 11:57:38 -08:00
frankiebee
c3adbda5f5 remove RecentBlocks from disk 2018-01-31 10:49:58 -08:00
Bruno Barbieri
94dd77d194 clean up 2018-01-31 13:34:14 -05:00
Bruno Barbieri
a70eda3651 add test for wipeTransactions 2018-01-31 13:29:30 -05:00
frankiebee
e0caeae06d test for migration 021 2018-01-30 15:03:42 -08:00
Thomas
0f10aa3729 Clean up test, remove react & mountWithStore 2018-01-30 13:29:05 -08:00
Thomas
c2cef0f815 Set address to default with empty string, add test validation. 2018-01-30 13:26:37 -08:00
Dan J Miller
b63f0f3de2 Functional Integration Tests for send ether flow. (#3119) 2018-01-29 17:24:53 -08:00
Thomas
b62ec394f5 Revert integration to oldUi 2018-01-22 16:10:07 -08:00
Chi Kei Chan
77c545336b Merge branch 'uat' into newmaster 2018-01-19 15:29:36 -08:00
Thomas
0db4ba1086 chromedriver, changed extension id(might need zip/crx file) 2018-01-18 08:10:53 -08:00
Thomas
d317f7aaab Update 2018-01-18 07:43:42 -08:00
kumavis
899e839e7c test - createTestProviderTools includes block tracker layer 2018-01-17 21:43:34 -08:00
kumavis
d7c8ec22a4 test - tx controller - fix txGasUtil reference 2018-01-17 20:09:13 -08:00
kumavis
d1d745eef4 test - typo - fix spelling of word stubbed 2018-01-17 19:47:35 -08:00
kumavis
3cbf2b7e3e test - remove createEthJsQueryStub 2018-01-17 19:44:11 -08:00
Alexander Tseung
81f86cfab6 Merge branch 'uat' into uat-master-011618 2018-01-16 18:17:28 -08:00
frankiebee
7a30950e4d test - fix to match expected behavior 2018-01-14 14:10:16 -08:00
frankiebee
409b49b411 test - create ethJsQuery stub 2018-01-14 14:00:59 -08:00
Dan Finlay
943befef91 Add test for gas estimate default 2018-01-08 15:16:08 -08:00
Thomas Huang
0fbecb9f7c
Merge pull request #2891 from MetaMask/i2621-0xRecipientAddress
Account for 0x/empty string recipient
2018-01-08 11:47:47 -08:00
Kevin Serrano
0cf5c22178
Merge pull request #2851 from MetaMask/i2812-seedworderrorfix
Fix condition where failing seed word checks would infinite-spin future attempts.
2018-01-08 11:43:43 -08:00
Dan Finlay
d11ec81f49
Merge branch 'master' into i2621-0xRecipientAddress 2018-01-08 11:21:41 -08:00
Thomas
39b700bf87 Account for 0x/empty string address and contract creation 2018-01-08 03:16:20 -08:00
Dan Finlay
aec24ec81e Fix feature to work 2018-01-05 22:08:03 -08:00
Dan Finlay
571f6723a6 Add test for better gas estimation 2018-01-05 21:24:10 -08:00