aboutsummaryrefslogtreecommitdiffstats
path: root/test
Commit message (Expand)AuthorAgeFilesLines
* fix conflictsEsteban MIno2018-08-298-101/+238
|\
| * Revert changes to tx-list-items.json, and to mock getTransactionCount method ...Dan Miller2018-08-281-1/+1
| * Fix testsAlexander Tseung2018-08-245-13/+13
| * Reduce large timeoutsAlexander Tseung2018-08-241-6/+6
| * Increase e2e timeouts for firefoxAlexander Tseung2018-08-241-7/+7
| * Change "Outgoing" to "Sent Ether" or "Sent Token"Alexander Tseung2018-08-241-4/+4
| * Fix Firefox e2e testsAlexander Tseung2018-08-241-2/+2
| * Fix integration testsAlexander Tseung2018-08-241-1/+1
| * Fix e2e testsAlexander Tseung2018-08-242-14/+6
| * Fix integration testsAlexander Tseung2018-08-241-1/+1
| * Fix e2e testsAlexander Tseung2018-08-241-58/+78
| * Fix integration testsAlexander Tseung2018-08-245-21/+18
| * Fix e2e testsAlexander Tseung2018-08-241-7/+7
| * Fix testsAlexander Tseung2018-08-241-10/+7
| * implemented improvements to RPC historyEvgeniy Filatov2018-08-231-0/+60
| * Add tabs support for PageContainerAlexander Tseung2018-08-231-1/+1
| * Merge pull request #5066 from whymarrh/fix-key-exportWhymarrh Whitby2018-08-231-0/+71
| |\
| | * Add test cases for MetaMaskController#_onKeyringControllerUpdateWhymarrh Whitby2018-08-231-0/+71
| * | Add new variant for SenderToRecipient componentAlexander Tseung2018-08-231-2/+2
| |/
* | watchAsset small changesEsteban MIno2018-08-281-1/+1
* | typo watchAsset imageUrl to imageEsteban MIno2018-08-241-7/+7
* | Merge branch 'develop' into WatchTokenFeatureEsteban MIno2018-08-223-16/+3
|\|
| * Merge pull request #5108 from MetaMask/run-ganache-with-blocktime-flagDan J Miller2018-08-222-15/+2
| |\
| | * Remove unnecessary checks and user actions in metamask-beta-ui.specDan Miller2018-08-222-15/+2
| | * Run ganache with a blocktime flag for npm:run:ganache:start.Dan Miller2018-08-221-2/+2
| * | fix unit testsbrunobar792018-08-211-1/+1
| |/
* / unit tests for watchAssetEsteban MIno2018-08-221-0/+110
|/
* Merge branch 'develop' into ledger-supportBruno Barbieri2018-08-181-0/+62
|\
| * Restores accounts until one with a zero balance is foundDan Matthews2018-08-171-0/+62
| * Merge pull request #4279 from MetaMask/network-remove-provider-engineDan Finlay2018-08-1615-223/+266
| |\
| | * Remove commented out code for detect-token-testThomas2018-08-151-10/+0
| | * E2E - Dont error on browser errorsThomas2018-08-151-1/+2
| | * Merge branch 'develop' into network-remove-provider-engineThomas2018-08-154-16/+228
| | |\
| | * | Confirms new contract token in the popupThomas2018-08-141-6/+6
| | * | DelayThomas2018-08-091-0/+1
| | * | confirms a deplay contract tx in the popupThomas2018-08-091-0/+9
| | * | Use develop e2e beta testsThomas2018-08-081-109/+34
| | * | lint fixesfrankiebee2018-08-081-2/+2
| | * | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into...frankiebee2018-08-075-66/+48
| | |\ \
| | * \ \ Merge branch 'develop' into network-remove-provider-engine-testsThomas Huang2018-08-024-66/+140
| | |\ \ \
| | * | | | LintThomas Huang2018-07-311-2/+2
| | * | | | Set metamask controller network provider to localhostThomas Huang2018-07-313-2/+24
| | * | | | Disallow netConnections other than localhostsThomas2018-07-301-0/+4
| | * | | | Detect Tokens are weirdThomas2018-07-301-26/+31
| | * | | | Merge branch 'develop' into network-remove-provider-engineThomas2018-07-2619-301/+993
| | |\ \ \ \
| | * | | | | test - unit - remove tests for obsolete methodskumavis2018-07-041-52/+0
| | * | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-07-0445-345/+367
| | |\ \ \ \ \
| | * | | | | | test - e2e - contract test - add logskumavis2018-07-041-7/+9
| | * | | | | | test - e2e - fix missing importkumavis2018-07-031-1/+1
| | * | | | | | test - e2e - move timingskumavis2018-07-031-1/+1
| | * | | | | | test - e2e-beta - update some api callskumavis2018-07-031-6/+4
| | * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-07-0312-207/+666
| | |\ \ \ \ \ \
| | * | | | | | | test - e2e - beta - from import - fix missing startup phasekumavis2018-06-121-0/+3
| | * | | | | | | test - e2e - beta - dont select localhost as it is already setkumavis2018-06-122-20/+1
| | * | | | | | | test - e2e - extensionUri should point to home.htmlkumavis2018-06-121-2/+2
| | * | | | | | | test - e2e - remove usage of extensionId from testskumavis2018-06-124-28/+12
| | * | | | | | | test - e2e - fix incomplete setup phasekumavis2018-06-122-2/+5
| | * | | | | | | test - e2e - properly export setupBrowserAndExtensionkumavis2018-06-121-0/+1
| | * | | | | | | test - e2e - more factoring of test setupkumavis2018-06-125-64/+27
| | * | | | | | | test - e2e - use fs-extra instead of fskumavis2018-06-121-1/+1
| | * | | | | | | test - e2e - factor out setup phase + rename METAMASK_CONFIG to METAMASK_TEST...kumavis2018-06-123-46/+49
| | * | | | | | | test - e2e - inject metamask config to point at localhostkumavis2018-06-121-11/+10
| | * | | | | | | test - e2e - reduce browser-specific codekumavis2018-06-121-20/+13
| | * | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-084-123/+154
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-073-0/+97
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-076-19/+49
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | test - unit - tx-controller - fix blockTracker stubkumavis2018-05-291-0/+1
| | * | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-295-2/+971
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | test - unit - pending-tx-tracker - update method namekumavis2018-05-291-2/+2
| | * | | | | | | | | | | test - unit - nonce-tracker - fix blockTracker stubkumavis2018-05-291-0/+1
| | * | | | | | | | | | | controllers - transactions - merge @frankiebee's work with minekumavis2018-05-292-56/+7
| | * | | | | | | | | | | test - unit - metamask-controller - remove logkumavis2018-05-261-1/+0
| | * | | | | | | | | | | test - unit - code style nitpickkumavis2018-05-251-1/+2
| | * | | | | | | | | | | test - unit - metamask-controller - fix many bugs in testskumavis2018-05-252-33/+61
| | * | | | | | | | | | | test - unit - run ganache-server in backgroundkumavis2018-05-251-0/+7
| | * | | | | | | | | | | test - unit - tx-controller-test - add history object to txMeta when using in...kumavis2018-05-251-31/+29
| | * | | | | | | | | | | test - unit - move fetch polyfill to helperkumavis2018-05-253-6/+3
| | * | | | | | | | | | | test - unit - metamask-controller - polyfill global.fetchkumavis2018-05-251-2/+4
| | * | | | | | | | | | | test - remove .only from unit testskumavis2018-05-251-1/+1
| | * | | | | | | | | | | Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/...frankiebee2018-05-2345-2170/+1226
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-2345-2170/+1226
| | | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | transactions - update pending-tx-tracker to use the new block trackerfrankiebee2018-05-231-1/+1
| | * | | | | | | | | | | | | test pending-tx-tracker - update tests to reflect new block tracker behavior ...frankiebee2018-05-231-32/+21
| | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | test - unit - network - get providerProxy via public methodkumavis2018-05-171-4/+5
| | * | | | | | | | | | | | network - create provider and block-tracker via json-rpc-enginekumavis2018-05-171-4/+4
| * | | | | | | | | | | | | Remove unnecessary else in test/e2e/beta/contract-test/contract.jsDan Miller2018-08-151-1/+2
| * | | | | | | | | | | | | Add explicit waits for submitted status for some txs initiated from test dapp.Dan Miller2018-08-151-0/+7
| * | | | | | | | | | | | | Reload e2e beta test browser if initial screen doesn't load.Dan Miller2018-08-152-2/+16
| * | | | | | | | | | | | | Increase timeout on wait for contract status update in metamask-beta-ui-specDan Miller2018-08-151-1/+1
| * | | | | | | | | | | | | Add missing awaits and/or missing wait timeouts in test/e2e/beta/metamask-bet...Dan Miller2018-08-141-9/+9
| * | | | | | | | | | | | | Make deployment states in test/e2e/beta/contract-test/contract.js more explicitDan Miller2018-08-142-5/+6
| * | | | | | | | | | | | | Improve error handling in assertElementNotPresent of test/e2e/beta/helpers.jsDan Miller2018-08-141-5/+7
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | fix merge conflictsbrunobar792018-08-1818-243/+311
* | | | | | | | | | | | | fix e2e testsbrunobar792018-08-171-1/+4
* | | | | | | | | | | | | fixed unit testsbrunobar792018-08-151-5/+9
* | | | | | | | | | | | | fix tx testsbrunobar792018-08-141-8/+18
|/ / / / / / / / / / / /
* | | | | | | | | | | | tests for migration 28Esteban MIno2018-08-101-0/+46
* | | | | | | | | | | | Get nonce for showing retry button using ethQuery transaction count.Dan Miller2018-08-091-0/+5
* | | | | | | | | | | | Merge branch 'develop' into TokensPerAccountBasisEsteban MIno2018-08-087-122/+147
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Switch superstatic for static-server pkgWhymarrh Whitby2018-08-071-2/+2
| * | | | | | | | | | | Fix seed word confirmation step of e2e beta tests.Dan Miller2018-08-061-60/+28
| * | | | | | | | | | | Use unmodified constant for test delay in from-import-beta-spec.Dan Miller2018-08-061-1/+1
| * | | | | | | | | | | Improve waits for new tx-list-items after first contract method call in e2e b...Dan Miller2018-08-063-3/+17
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Don't show an additional beta UI notificationWhymarrh Whitby2018-07-282-9/+1
| * | | | | | | | | | New ui e2e tests switch to localhost provider (needed after new ui selection ...Dan Miller2018-07-282-0/+20
| * | | | | | | | | | Fix integration tests to accomodate new ui suggestion screen changes.Dan Miller2018-07-281-0/+5
| * | | | | | | | | | Fix e2e tests to accomodate new ui suggestion screen changes.Dan Miller2018-07-283-57/+83
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | create tokens storage when setadressesEsteban MIno2018-07-311-0/+25
* | | | | | | | | | unit tests for tokens per account and networkEsteban MIno2018-07-281-0/+128
* | | | | | | | | | modify tests according to tokens by networkEsteban MIno2018-07-272-18/+8
|/ / / / / / / / /
* | | | | | | | | Updates e2e beta tests to ensure that popup window closes after confirming a ...Dan Miller2018-07-241-1/+1
* | | | | | | | | Merge branch 'develop' into detectTokenFeatureEsteban Miño2018-07-2118-299/+816
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Auto-detect tokens #3034 (#4683)Esteban Miño2018-07-211-0/+120
| * | | | | | | | | Merge pull request #4625 from MetaMask/initial-trezor-supportBruno Barbieri2018-07-203-0/+228
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | fix browser not supported screenbrunobar792018-07-181-1/+1
| | * | | | | | | | | added some e2e testsbrunobar792018-07-181-0/+47
| | * | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-181-2/+2
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | added tests for removeAccountbrunobar792018-07-171-0/+33
| | * | | | | | | | | | added more unit testsbrunobar792018-07-171-2/+55
| | * | | | | | | | | | added unit tests for metamaskcontrollerbrunobar792018-07-171-0/+70
| | * | | | | | | | | | added test for preferences controllerbrunobar792018-07-171-0/+25
| * | | | | | | | | | | Fix testsAlexander Tseung2018-07-182-75/+8
| | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Increase clickable area and padding of Retry Transaction barAlexander Tseung2018-07-171-2/+2
| |/ / / / / / / / /
| * | | | | | | | | fix tos link;Bobby Dresser2018-07-131-1/+1
| * | | | | | | | | Merge pull request #4691 from MetaMask/i4404-confirm-refactorAlexander Tseung2018-07-129-207/+501
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Wait for an element with a .tx-list-pending-item-container to be rendered bef...Dan2018-07-121-0/+2
| | * | | | | | | | | Reattempt to find network selector; wait for network selector dropdown to con...Dan2018-07-121-3/+6
| | * | | | | | | | | Wait for submitted tx list item amounts to match the expected before clicking...Dan2018-07-121-5/+6
| | * | | | | | | | | Fix bug in test mock signature request methods.Dan2018-07-122-0/+3
| | * | | | | | | | | Fix send integration tests for compatability with confirm refactor.Dan2018-07-111-7/+7
| | * | | | | | | | | Fix signature request tests for compatability with confirm refactor.Dan2018-07-111-7/+5
| | * | | | | | | | | Update e2e beta tests to cover confirm refactor changes.Dan2018-07-113-4/+155
| | * | | | | | | | | Fix existing e2e testsDan2018-07-111-11/+26
| | * | | | | | | | | Handles window indeterminancy issues for external dapps in e2e beta tests.Dan2018-07-114-114/+255
| | * | | | | | | | | Fix existing unit testsAlexander Tseung2018-07-081-61/+41
| * | | | | | | | | | test - check that #setTxStatusRejected removes transaction from historyfrankiebee2018-07-111-0/+9
| * | | | | | | | | | test - fix for lintfrankiebee2018-07-111-5/+5
| * | | | | | | | | | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into...frankiebee2018-07-1146-555/+837
| |\| | | | | | | | |
| | * | | | | | | | | Merge pull request #4648 from MetaMask/update-import-from-seed-screenDan J Miller2018-07-061-3/+6
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Update import from seed screen on new ui.Dan2018-07-051-3/+6
| | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | Merge pull request #4685 from MetaMask/estimate-gasprice-background-newuiDan J Miller2018-07-051-12/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Update new-ui-send integration tests to always explicitly set gas price. (e2e...Dan2018-07-051-12/+1
| * | | | | | | | | | tests - fix cancle transaction test to better fit new behaviorfrankiebee2018-06-272-13/+10
| * | | | | | | | | | woops - remove .onlyfrankiebee2018-06-261-1/+1
| * | | | | | | | | | trandsactions - remove rejected transactions from historyfrankiebee2018-06-261-0/+14
| * | | | | | | | | | migration 27 - remove rejected transactions from statefrankiebee2018-06-261-0/+50
* | | | | | | | | | | fix detection on submit passwordEsteban MIno2018-07-211-6/+27
* | | | | | | | | | | keyring unlocked detect and unit testsEsteban MIno2018-07-201-6/+32
* | | | | | | | | | | detect tokens when submit password and new account selectedEsteban MIno2018-07-201-4/+4
* | | | | | | | | | | detect tokens through infuraEsteban MIno2018-07-131-9/+17
* | | | | | | | | | | improve testsEsteban MIno2018-07-121-56/+49
* | | | | | | | | | | fix lintEsteban MIno2018-07-041-54/+46
* | | | | | | | | | | Merge branch 'develop' into detectTokenFeatureEsteban MIno2018-07-0446-542/+832
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | fix contract-testbrunobar792018-07-031-3/+7
| * | | | | | | | | | fix unit testsbrunobar792018-07-031-4/+3
| * | | | | | | | | | fix testsbrunobar792018-07-032-6/+12
| * | | | | | | | | | fix warning for new-ui screen testsbrunobar792018-07-031-4/+2
| * | | | | | | | | | fix warning for unit testsbrunobar792018-07-0314-68/+35
| * | | | | | | | | | fix test/mascara.conf.js warningsbrunobar792018-07-031-1/+1
| * | | | | | | | | | fix warnings for integration testsbrunobar792018-07-033-7/+1
| * | | | | | | | | | fix warnings for e2e testsbrunobar792018-07-033-10/+8
| * | | | | | | | | | eslint --fix .brunobar792018-07-0339-273/+271
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Improve checks for closing info page on app installation in e2e beta tests.Dan2018-06-291-5/+11
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Use supersonic instead of httpserver to serve local dapp (e2e beta tests)Dan2018-06-281-2/+2
| * | | | | | | | Turn off failing e2e beta assertion in firefox until bugs in webdriver/geckod...Dan2018-06-281-2/+6
| * | | | | | | | Update condition for backspace in customize gas step of token factory send te...Dan2018-06-281-1/+4
| * | | | | | | | Fix add existing token test (e2e beta tests).Dan2018-06-271-3/+1
| * | | | | | | | Switch to eth and back before asserting on token balance (e2e beta token tests).Dan2018-06-271-1/+2
| * | | | | | | | await all clicks in e2e beta tests.Dan2018-06-271-9/+11
| * | | | | | | | Close popup window for e2e beta token factory send test.Dan2018-06-271-2/+3
| * | | | | | | | Fix retype seed phrase button.Dan2018-06-271-35/+46
| * | | | | | | | Disable e2e beta assertion after first token addition because of firefox / we...Dan2018-06-271-1/+8
| * | | | | | | | Pass correct params to verboseReportOnFailure in beta e2e tests.Dan2018-06-271-1/+1
| * | | | | | | | Add timeouts to certain beta e2e driver.waits.Dan2018-06-271-2/+2
| * | | | | | | | Add try catch to deal with false negative timeouts in beta e2e tests.Dan2018-06-271-7/+22
| * | | | | | | | Wait for element text match in metamask-beta-ui e2e send token testDan2018-06-271-4/+2
| * | | | | | | | Use locally served dapp to test contract calls in e2e beta testsDan2018-06-275-174/+130
| * | | | | | | | Add extra delay to e2e tests after remix page load.Dan2018-06-271-0/+1
| * | | | | | | | Fix send token tests in beta ui e2e tests.Dan2018-06-271-5/+18
| * | | | | | | | Speed up page opening and fix timeout errors on remix page opening in beta e2...Dan2018-06-272-13/+26
| * | | | | | | | Add delay before regularly failing test.Dan2018-06-271-0/+1
| * | | | | | | | Fix element located bug in beta e2e contract method call test.Dan2018-06-271-1/+1
| * | | | | | | | Improve wait for buy modal render after first time flow in beta e2e tests.Dan2018-06-271-1/+2
| * | | | | | | | Update metamask-beta-ui e2e spec to fail on insufficient gas estimation.Dan2018-06-271-7/+31
| * | | | | | | | Wait for locating of submit buttons before attempting to click in metamask.sp...Dan2018-06-271-3/+8
| * | | | | | | | Update tests to accomodate token list menu additions.Dan2018-06-271-1/+2
| * | | | | | | | Disable onbeforeunload alert on remix for contract integration tests.Dan2018-06-271-0/+1
| * | | | | | | | Adds test for hiding tokens.Dan2018-06-271-0/+19
| * | | | | | | | e2e beta tests for contract deployment and calling a contract method.Dan2018-06-272-2/+135
| * | | | | | | | Improve reliability of beta e2e tests by using webdriver apis to wait for cer...Dan2018-06-272-5/+12
| * | | | | | | | Add test for importing from private key to from-import-beta-ui.spec.js, and r...Dan2018-06-272-125/+19
| * | | | | | | | metamask-beta-ui.spec.js tests custom token send before searched token.Dan2018-06-271-38/+43
| * | | | | | | | Adds e2e tests for sending tokens from token factory.Dan2018-06-271-3/+61
| * | | | | | | | Adds e2e tests for sending tokens within metamask.Dan2018-06-271-0/+44
| * | | | | | | | Adds e2e tests for sending tokens from token factory.Dan2018-06-271-3/+61
| * | | | | | | | Adds e2e tests for sending tokens within metamask.Dan2018-06-271-2/+48
| |/ / / / / / /
* / / / / / / / tests for specEsteban MIno2018-06-281-0/+101
|/ / / / / / /
* | | | | | | Accept whitespace when matching token balances in e2e testsWhymarrh Whitby2018-06-212-7/+8
* | | | | | | Add explicit timeout for add token testWhymarrh Whitby2018-06-211-1/+1
* | | | | | | Update integration tests for newui gas estimation fixes.Dan2018-06-191-2/+2
* | | | | | | Merge pull request #4566 from MetaMask/notice-phishingDan Finlay2018-06-154-67/+62
|\ \ \ \ \ \ \
| * | | | | | | test - e2e-beta - from import - handle phishing warningkumavis2018-06-141-8/+21
| * | | | | | | test - e2e-beta - separate notice tests into individual testskumavis2018-06-141-1/+5
| * | | | | | | test - e2e - clear phishing warningkumavis2018-06-142-1/+7
| * | | | | | | test - e2e - check for phishing warningkumavis2018-06-142-13/+27
| * | | | | | | notices - replace getLatestNotice with getNextNoticekumavis2018-06-141-46/+4
* | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into Validat...kumavis2018-06-148-129/+252
|\| | | | | | |
| * | | | | | | Fix e2e test Chrome profile pathsWhymarrh Whitby2018-06-131-1/+1
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Bump beta e2e timeouts on faucet page.Dan2018-06-072-4/+4
| * | | | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-073-119/+150
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #4385 from MetaMask/ci-test-e2e-betakumavis2018-06-073-119/+150
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Improve e2e beta tests by adding appropriate waits.Dan2018-06-072-47/+56
| | | * | | | | Conditionally close info page in beta e2e tests.Dan2018-06-062-4/+14
| | | * | | | | Merge remote-tracking branch 'whymarrh/ci-test-e2e-beta' into ci-test-e2e-betaDan2018-06-062-63/+79
| | | * | | | | Fix e2e beta tests to account for add-token updates and actual behaviour of t...Dan2018-06-062-14/+10
| | | * | | | | Merge branch 'develop' into ci-test-e2e-betaDan2018-06-061-3/+28
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | Adjust delays in new beta e2e testsWhymarrh Whitby2018-06-021-2/+2
| * | | | | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-073-5/+97
| |\| | | | | |
| | * | | | | | Merge pull request #4512 from MetaMask/test-metamask-no-diagnosticsThomas Huang2018-06-071-0/+3
| | |\ \ \ \ \ \
| | | * | | | | | test - metamask-controller - disable diagnosticskumavis2018-06-061-0/+3
| | | | |/ / / / | | | |/| | | |
| | * | | | | | Merge pull request #4414 from scsaba/recipient-blacklistkumavis2018-06-072-0/+94
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | remove generating blocked accounts and use a config file insteadCsaba Solya2018-05-311-11/+10
| | | * | | | | adding tests for recipient blacklist checkerCsaba Solya2018-05-301-0/+78
| | | * | | | | adding transaction controller testsCsaba Solya2018-05-301-0/+17
| | * | | | | | diagnostics - rewrite bug-notifier as diagnostics-reporterkumavis2018-06-061-5/+0
| * | | | | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-051-3/+33
| |\| | | | | |
| * | | | | | | Merge branch 'i3725-refactor-send-component-' into i3914-fix-newui-send-gas-e...Dan2018-06-0110-23/+997
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'i3725-refactor-send-component-' of github.com:MetaMask/metamask...Dan2018-06-011-3/+3
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | Fix send amount field select in send-new-ui integration test.Dan2018-06-011-1/+1
| | | * | | | | | Fix send-new-ui gas fee display expectation.Dan2018-06-011-1/+1
| | | * | | | | | Fix currency display send integration tests.Dan2018-05-311-1/+1
| * | | | | | | | Fix test to account for greater precision currency display.Dan2018-05-311-1/+1
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Clean up for send refactor PR.Dan2018-05-251-2/+1
| * | | | | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-2447-2266/+1366
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-154-21/+21
| * | | | | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-1418-377/+945
| * | | | | | | Further refactors; includes refactor of send-v2.js and associated containerDan2018-04-301-1/+2
* | | | | | | | test - unit - add assertRejects to test asyncFnskumavis2018-06-142-5/+23
* | | | | | | | test - unit - import strategies - properly await async methodskumavis2018-06-141-8/+8
* | | | | | | | Make account import tests much more specificDan Finlay2018-06-121-10/+10
* | | | | | | | Improve private key import testsDan Finlay2018-06-081-1/+25
* | | | | | | | Improve test formattingDan Finlay2018-06-081-16/+19
| |_|_|/ / / / |/| | | | | |
* | | | | | | Mock notifier in testDan Finlay2018-06-051-0/+5
* | | | | | | Add failing test for unknown identity entryDan Finlay2018-06-051-3/+28
| |_|/ / / / |/| | | | |
* | | | | | Add new alert modalsAlexander Tseung2018-06-014-12/+12
* | | | | | Delay before getting address textThomas2018-05-301-0/+1
* | | | | | Merge branch 'develop' into e2e-testThomas2018-05-301-6/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | ci - job-screens - use e2e funcskumavis2018-05-301-6/+4
| | |_|_|/ | |/| | |
* / | | | Add accountThomas2018-05-301-0/+6
|/ / / /
* | / / Add basic e2e tests for the new UIWhymarrh Whitby2018-05-255-2/+971
| |/ / |/| |