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

686 Commits

Author SHA1 Message Date
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
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 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