aboutsummaryrefslogtreecommitdiffstats
path: root/test
Commit message (Expand)AuthorAgeFilesLines
* diagnostics - rewrite bug-notifier as diagnostics-reporterkumavis2018-06-061-5/+0
* 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
* Merge pull request #4321 from MetaMask/testingkumavis2018-05-2335-1556/+690
|\
| * Merge branch 'develop' into testingtmashuang2018-05-221-30/+0
| |\
| * \ Merge branch 'develop' into testingtmashuang2018-05-227-1746/+214
| |\ \
| * \ \ Merge branch 'develop' into testingtmashuang2018-05-223-364/+81
| |\ \ \
| * | | | Moved loose some loose test files to sub folderstmashuang2018-05-2129-59/+108
| * | | | signMessage and signPersonalMessageThomas2018-05-181-13/+33
| * | | | Merge branch 'develop' into testingThomas2018-05-174-90/+134
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' into testingThomas2018-05-177-163/+670
| |\ \ \ \ \
| * | | | | | console.log -> assert.equalThomas2018-05-091-1/+1
| * | | | | | ImportAccountWithStrategies Json and KeystoreThomas2018-05-091-0/+30
| * | | | | | Remove approvePersonalMessage testThomas2018-05-081-45/+0
| * | | | | | Merge branch 'develop' into testingThomas2018-05-0812-224/+324
| |\ \ \ \ \ \
| * | | | | | | setupUntrustedCommunication and setupTrustedCommunicationThomas2018-04-251-0/+45
| * | | | | | | Merge branch 'master' into testingThomas2018-04-247-5/+129
| |\ \ \ \ \ \ \
| * | | | | | | | ConfigManager markAccountsFound, markPasswordForgotten, unMarkPasswordForgottenThomas2018-04-241-7/+70
| * | | | | | | | resetAccount and addNewAccountThomas2018-04-201-0/+45
| * | | | | | | | newUnsignedMessage and newUnsignedPersonalMessageThomas2018-04-191-0/+102
| * | | | | | | | Merge branch 'master' into testingThomas2018-04-1113-50/+519
| |\ \ \ \ \ \ \ \
| * | | | | | | | | MM-controlller testsThomas2018-04-111-2/+55
| * | | | | | | | | Update Sinon methods. sinon.sandbox.create() -> sandbox.createSandbox()Thomas2018-04-057-8/+8
| * | | | | | | | | Merge branch 'testing' of https://github.com/tmashuang/metamask-extension int...Thomas2018-04-033-7/+466
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Metamask controller methodsThomas2018-03-281-1/+146
| | * | | | | | | | | Remove console.logThomas2018-03-281-1/+0
| | * | | | | | | | | Update blacklistThomas2018-03-281-5/+320
* | | | | | | | | | | Merge pull request #4333 from MetaMask/test-e2e-check-for-errorsThomas Huang2018-05-231-1/+33
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | test - e2e - only inspect console for errors in chromekumavis2018-05-221-6/+10
| * | | | | | | | | | | test - e2e - ignore 'development build of Redux' warningkumavis2018-05-221-1/+3
| * | | | | | | | | | | test - e2e - ignore 'development build of React' warningkumavis2018-05-221-0/+2
| * | | | | | | | | | | test - e2e - ignore favicon 404skumavis2018-05-221-1/+6
| * | | | | | | | | | | test - e2e - ignore react 'unknown props dataset' warningskumavis2018-05-221-2/+5
| * | | | | | | | | | | test - e2e - check for console errors after each testkumavis2018-05-221-1/+17
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #4308 from MetaMask/i4232-addtokenkumavis2018-05-232-30/+44
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix testsAlexander Tseung2018-05-212-30/+44
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | ci - screens - continue screenshots through account creation + export accountkumavis2018-05-221-95/+130
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Reveal get filtered tx list (#4332)Frankie2018-05-221-30/+0
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge pull request #4034 from whymarrh/account-nicknameskumavis2018-05-226-50/+204
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Fix migration 026 to produce the correct shape for state.identitiesWhymarrh Whitby2018-05-181-2/+2
| * | | | | | | | Update MetaMaskController vault restoration test for new KC apiWhymarrh Whitby2018-05-171-1/+1
| * | | | | | | | Add migration to move identities from KeyringControllerWhymarrh Whitby2018-05-171-0/+41
| * | | | | | | | Add test case for PreferencesController#setAccountLabelWhymarrh Whitby2018-05-171-0/+21
| * | | | | | | | Add PreferencesController#setAddresses to update idsWhymarrh Whitby2018-05-171-0/+44
| * | | | | | | | Update AddressBookController to read from preferences storeWhymarrh Whitby2018-05-171-13/+13
| * | | | | | | | Move setAccountLabel into PreferencesControllerWhymarrh Whitby2018-05-173-36/+84
| |/ / / / / / /
* | | | | | | | Merge pull request #4278 from MetaMask/e2e-testskumavis2018-05-223-364/+81
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Adjustments for previous PRThomas2018-05-171-4/+4
| * | | | | | | Testing timeoutsThomas2018-05-171-18/+18
| * | | | | | | Merge branch 'develop' into e2e-testsThomas2018-05-153-14/+26
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge e2e tests into oneThomas2018-05-153-359/+77
* | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-...kumavis2018-05-178-188/+675
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-178-163/+700
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge pull request #4251 from whymarrh/e2e-fixesThomas Huang2018-05-152-4/+5
| | |\ \ \ \ \ \ \
| | | * | | | | | | e2e: Use the more reliable enter key for logging inWhymarrh Whitby2018-05-151-1/+1
| | | * | | | | | | e2e: Wait a bit before clicking through privacy screenWhymarrh Whitby2018-05-151-0/+1
| | | * | | | | | | e2e: Adjust the extension ID query for newer Chrome versionsWhymarrh Whitby2018-05-151-1/+1
| | | * | | | | | | e2e: Use newest window as MM tx confirm popupWhymarrh Whitby2018-05-152-2/+2
| | * | | | | | | | Add error message when passwords don't match in first time flow. Change input...Alexander Tseung2018-05-142-17/+16
| | |/ / / / / / /
| | * / / / / / / Add new unlock screen designAlexander Tseung2018-05-122-5/+18
| | |/ / / / / /
| | * | | | | | Increase timeoutThomas2018-05-111-1/+1
| | * | | | | | Fix typoThomas2018-05-111-1/+1
| | * | | | | | Job Screens with Shadow Dom Css selectorThomas2018-05-113-6/+7
| | * | | | | | Multistep Shadow Dom Query Selector for local extension idThomas2018-05-111-10/+10
| | * | | | | | Update test:screens to newest chrome extension listThomas2018-05-081-1/+1
| | * | | | | | Merge branch 'develop' into e2e-testsThomas2018-05-081-0/+30
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Update to extension Id path for new chromeThomas2018-05-081-5/+5
| | * | | | | | Remove waiting for button to be enabled TOUThomas2018-05-041-1/+0
| | * | | | | | Merge branch 'e2e-tests' of https://github.com/tmashuang/metamask-extension i...Thomas2018-05-0413-226/+258
| | |\ \ \ \ \ \
| | | * | | | | | Add a comment on the confirmation transaction metamask popup showing blank, b...Thomas2018-05-041-0/+1
| | | * | | | | | Quit chromedriver after testThomas2018-05-041-3/+3
| | | * | | | | | Merge branch 'develop' into e2e-testsThomas2018-05-0411-223/+254
| | | |\ \ \ \ \ \
| | * | | | | | | | Increase timeout for TOU scrollThomas2018-05-041-1/+1
| | |/ / / / / / /
| | * | | | | | | Reduce delay for installing firefox addonThomas2018-05-041-2/+1
| | * | | | | | | Add Timeouts for driver.waitThomas2018-05-041-9/+8
| | * | | | | | | Test wit driver.waitThomas2018-05-041-18/+21
| | * | | | | | | Delay around the addon installThomas2018-05-021-2/+3
| | * | | | | | | test increase timeoutThomas2018-05-021-1/+1
| | * | | | | | | Async/await installing extensionThomas2018-05-021-4/+4
| | * | | | | | | FirefoxThomas2018-05-024-147/+638
| * | | | | | | | test - network controller - remove tests for deprecated APIs + update testskumavis2018-05-031-25/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | add time stamps to transaction history log entriesCsaba Solya2018-05-103-65/+129
| |_|/ / / / / |/| | | | | |
* | | | | | | transactions - add a nonce check utility for ui usefrankiebee2018-05-021-0/+30
|/ / / / / /
* | | | | | Merge pull request #4116 from MetaMask/test-unit-ganacheThomas Huang2018-05-013-16/+32
|\ \ \ \ \ \
| * | | | | | test - unit - send from test accounts to avoid not-enough-balance error from ...kumavis2018-04-282-12/+12
| * | | | | | test - unit - use ganache instead of deprecated block-tracker test utilkumavis2018-04-281-4/+20
* | | | | | | Verify identities state after restoring new accounts (#4091)Paul Bouchon2018-04-301-8/+25
|/ / / / / /
* | | | | | Merge pull request #4110 from MetaMask/masterkumavis2018-04-288-173/+164
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3kumavis2018-04-268-173/+164
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'master' into tx-controller-rewrite-v3frankiebee2018-04-209-20/+165
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | meta - transactions - code clean up and jsDocfrankiebee2018-04-141-2/+2
| | * | | | | meta - transactions - create a transactions dir in controller and move releva...frankiebee2018-04-118-171/+162
* | | | | | | Allow transactions with 0-gwei gas price (#4073)Paul Bouchon2018-04-271-26/+33
|/ / / / / /
* | / / / / Clean up network configAlexander Tseung2018-04-241-1/+41
| |/ / / / |/| | | |
* | | | | Merge pull request #3998 from MetaMask/i3988-checksummed-addressDan Finlay2018-04-191-1/+1
|\ \ \ \ \
| * | | | | Show checksummed addresses throughout the UIbitpshr2018-04-181-1/+1
* | | | | | Merge branch 'master' into i3580-InternationalizeCurrencyDan Finlay2018-04-183-0/+69
|\| | | | |
| * | | | | Disable token price polling when no client is activebitpshr2018-04-171-0/+1
| * | | | | Maintain token prices using a background servicebitpshr2018-04-161-0/+28
| * | | | | Add tests for ComposableObservableStorebitpshr2018-04-141-0/+35
| * | | | | Add ComposableObservableStore for subscription managementbitpshr2018-04-131-0/+5
| | |_|_|/ | |/| | |
* | | | | Add basic currency localization test.Dan2018-04-101-0/+28
* | | | | Fix integration tests so that they check for localize currency.Dan2018-04-101-4/+4
* | | | | Merge branch 'master' into i3580-InternationalizeCurrencyDan2018-04-1010-72/+261
|\| | | |
| * | | | Merge pull request #3921 from MetaMask/gh-3736-react-routerkumavis2018-04-103-15/+36
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix integration testsAlexander Tseung2018-04-072-15/+33
| | * | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-065-11/+109
| | |\ \ \
| | * | | | Revert "commit"Alexander Tseung2018-04-063-17/+5
| | * | | | commitAlexander Tseung2018-04-063-5/+17
| | * | | | Fix confirm-sig-requests integration testAlexander Tseung2018-04-051-3/+3
| | * | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-053-53/+115
| | |\ \ \ \
| | * | | | | Fix integration testsAlexander Tseung2018-04-051-0/+3
| * | | | | | migrations - back fixesfrankiebee2018-04-061-1/+9
| | |_|/ / / | |/| | | |
| * | | | | create migration 25frankiebee2018-04-062-3/+50
| * | | | | test - run live migrations over first time statefrankiebee2018-04-061-4/+25
| * | | | | meta - create a migration templatefrankiebee2018-04-061-0/+17
| * | | | | Merge pull request #3887 from MetaMask/i#3886kumavis2018-04-061-8/+9
| |\ \ \ \ \
| | * | | | | transactions - _normalizeTxParams will now return a new object for txParamsfrankiebee2018-04-061-9/+9
| | * | | | | transactions - remove unnecessary keys on txParamsfrankiebee2018-04-051-1/+2
| | | |/ / / | | |/| | |
| * / | | | make migration-24 compat with first-time-statefrankiebee2018-04-061-0/+12
| |/ / / /
| * | | | transactions - make #_validateTxParams not async and "linting" wink wink nudg...frankiebee2018-04-051-11/+8
| * | | | hot-fix - migrate unaproved txParams so that the from is lowercasefrankiebee2018-04-051-0/+37
| * | | | transactions - normalize txParamsfrankiebee2018-04-052-44/+72
| |/ / /
| * | | Merge pull request #3834 from MetaMask/3734kumavis2018-04-041-1/+1
| |\ \ \
| | * | | Fix testsDavid Yoo2018-04-031-1/+1
| | |/ /
* | | | Fix and improve testDan Finlay2018-04-041-2/+12
* | | | Internationalize currencyDan Finlay2018-04-041-0/+17
|/ / /
* | | Merge pull request #3831 from MetaMask/i#3770Frankie2018-04-032-2/+28
|\ \ \
| * | | tests - fix txController tests so that txMetas have a from feildfrankiebee2018-04-031-2/+4
| * | | transactions validationt - valdate from field on txParamsfrankiebee2018-04-031-0/+24
| |/ /
* | | ci:screens - turn on repeat in walkthrough gifkumavis2018-04-031-1/+1
* | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screenskumavis2018-04-031-0/+61
|\| |
| * | Merge pull request #3801 from danjm/i3684-txlistitemstestkumavis2018-03-311-0/+61
| |\ \
| | * | Adds integration tests for rendering of tx list items.Dan2018-03-301-0/+61
* | | | ci - screens - increase delay before setting provider typekumavis2018-03-311-1/+1
* | | | ci - screens - add delay after setting networkkumavis2018-03-311-0/+1
* | | | development - ci-screens - remove mocha wrapper that was losing exit codekumavis2018-03-312-116/+11
* | | | development - screens - fix screenshot on failurekumavis2018-03-311-3/+4
* | | | development - screens - screenshot on failurekumavis2018-03-311-4/+25
* | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screenskumavis2018-03-311-1/+1
|\| | |
| * | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artif...kumavis2018-03-302-23/+76
| |\| |
| * | | ui - change window title 'MetaMask Plugin' to 'MetaMask'kumavis2018-03-291-1/+1
* | | | test - e2e - set network to localhostkumavis2018-03-311-0/+6
* | | | development - screens - use localhost for networkkumavis2018-03-311-3/+12
* | | | development - screenshotter - capture en locale and build gif from only enkumavis2018-03-301-7/+8
* | | | development - screenshotter - capture screens across all localeskumavis2018-03-301-13/+30
* | | | development - create selenium screen shotterkumavis2018-03-301-45/+77
* | | | test - add auto screen shotterkumavis2018-03-303-0/+271
| |/ / |/| |
* | | Merge branch 'master' into e2e-selectorkumavis2018-03-302-2/+41
|\ \ \
| * \ \ Merge pull request #3794 from MetaMask/e2e-selectorThomas Huang2018-03-301-17/+16
| |\ \ \
| | * | | Better delays and fix logout css selectorThomas2018-03-301-3/+6
| * | | | Merge pull request #3782 from MetaMask/i3670-FixNonceBugFrankie2018-03-291-0/+36
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Rename variable to be more understandableDan Finlay2018-03-291-2/+19
| | * | | Add test to reproduce issue behaviorDan Finlay2018-03-291-0/+19
* | | | | test - e2e - fix selector with extra div (?)kumavis2018-03-301-1/+1
* | | | | test - e2e - generate artifacts on test failurekumavis2018-03-301-6/+24
| |_|/ / |/| | |
* | | | test - e2e - prefer css selectors over xpathkumavis2018-03-301-15/+11
|/ / /
* | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-282-3/+102
|\| |
| * | Merge pull request #3758 from MetaMask/i#3731kumavis2018-03-282-3/+102
| |\ \
| | * | migration for removing unnecessary transactions from statefrankiebee2018-03-282-3/+102
| | |/
* | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-282-0/+140
|\| |
| * | Merge branch 'master' into selenium-e2eThomas Huang2018-03-285-27/+64
| |\|
| * | Merge branch 'master' into selenium-e2eThomas2018-03-226-13/+217
| |\ \
| * \ \ Merge branch 'master' into selenium-e2eThomas2018-03-159-285/+198
| |\ \ \
| * | | | Update selenium testsThomas2018-03-101-9/+7
| * | | | Merge branch 'master' into selenium-e2eThomas2018-03-1030-323/+3489
| |\ \ \ \
| * | | | | chromedriver, changed extension id(might need zip/crx file)Thomas2018-01-192-1/+2
| * | | | | UpdateThomas2018-01-182-0/+141
| |\ \ \ \ \
| | * | | | | E2E testing with seleniumtmashuang2017-09-132-0/+141
* | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-274-11/+45
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #3680 from danjm/i3517-popup-newui-onboardingThomas Huang2018-03-271-3/+3
| |\ \ \ \ \ \
| | * | | | | | Fix tests.Dan2018-03-271-3/+3
| * | | | | | | Merge pull request #3710 from danjm/i3326-addtokenscreendesignupdateThomas Huang2018-03-271-7/+10
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into i3326-addtokenscreendesignupdateDan2018-03-273-17/+20
| | |\ \ \ \ \ \ \
| | * | | | | | | | Update add token integration tests.Dan2018-03-261-9/+11
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #3729 from MetaMask/test-timeout-fixThomas Huang2018-03-271-1/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | test - remove timeout causing mocha disconnect issueskumavis2018-03-271-1/+0
| | | |/ / / / / / | | |/| | | | | |
| * / | | | | | | migration for adding submittedTime to the txMeta (#3727)Frankie2018-03-271-0/+32
| |/ / / / / / /
* | | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-273-17/+19
|\| | | | | | |
| * | | | | | | Merge pull request #3721 from alextsg/cb-944Dan Finlay2018-03-273-17/+17
| |\ \ \ \ \ \ \
| | * | | | | | | Update button stylesAlexander Tseung2018-03-263-17/+17
| | |/ / / / / /
| * / / / / / / Use ens-input component in send-v2 to allow sending to ens names.Dan2018-03-261-0/+2
| |/ / / / / /
* / / / / / / Include locales in served test files.Dan2018-03-241-0/+2
|/ / / / / /
* | | | | / test - flat - add extra timeout, idk maybekumavis2018-03-221-0/+1
| |_|_|_|/ |/| | | |
* | | | | Update confirm transaction screenAlexander Tseung2018-03-211-3/+3
* | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-205-5/+166
|\ \ \ \ \
| * \ \ \ \ Merge pull request #3594 from danjm/i3344-improve-currency-inputThomas Huang2018-03-202-1/+162
| |\ \ \ \ \
| | * | | | | Use customized react-trigger-change in send-new-ui integration tests..Dan2018-03-192-1/+162
| | | |_|_|/ | | |/| | |
| * | | | | Remove unused files from ui folder. (#3577)anticlimactic2018-03-193-3/+3
| * | | | | Fix styling on confirm-send-ether and confirm-send-token (#3600)Alexander Tseung2018-03-171-1/+1
| |/ / / /
* | | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-151-3/+1
|\| | | |
| * | | | deps - use pify instead of util.promisifykumavis2018-03-151-3/+1
* | | | | Fix tests.Dan2018-03-141-4/+4
* | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-149-286/+203
|\| | | |
| * | | | test - mascara - fix async wrapkumavis2018-03-121-1/+1
| * | | | test - use new async selectors for faster testingkumavis2018-03-122-89/+49
| * | | | test - add comment about test behavior odditykumavis2018-03-122-4/+2
| * | | | test - poll for element instead of manual timeoutskumavis2018-03-124-189/+144
| * | | | ci - split integration tests into parallel firefox and chrome runskumavis2018-03-111-1/+3
| | |_|/ | |/| |
| * | | Merge pull request #3497 from MetaMask/testingkumavis2018-03-101-4/+6
| |\ \ \
| | * | | Persist rinkeby.infura.io and clean nock afterThomas2018-03-101-4/+6
* | | | | tests - add tests for transactions#retryTransaction and transactions#_markNon...frankiebee2018-03-141-1/+44
|/ / / /
* | | | Merge pull request #3409 from scsaba/seed-phrase-verificationDan Finlay2018-03-081-0/+133
|\ \ \ \ | |/ / / |/| | |
| * | | move more test code to beforeEachCsaba Solya2018-03-041-23/+8
| * | | verify seedwords on log inCsaba Solya2018-03-041-40/+8
| * | | verify addresses regardless caseCsaba Solya2018-03-031-0/+44
| * | | seed phrase verifierCsaba Solya2018-03-031-0/+136
* | | | fix typo in tests and tx-state-managerJeffrey Tong2018-03-082-4/+4
* | | | Merge pull request #3259 from MetaMask/controllerStubskumavis2018-03-074-126/+1470
|\ \ \ \
| * | | | Using noop to not lose itThomas2018-02-281-1/+1
| * | | | Revert initializing first-time-stateThomas2018-02-282-17/+3
| * | | | Network controller nockThomas Huang2018-02-161-24/+16
| * | | | Offline testingThomas Huang2018-02-165-103/+1469
* | | | | Merge pull request #3309 from scsaba/edge-supportDan Finlay2018-03-071-0/+101
|\ \ \ \ \
| * | | | | fix testCsaba Solya2018-02-231-1/+2
| * | | | | add negative decrypt testCsaba Solya2018-02-231-0/+20
| * | | | | fix testsCsaba Solya2018-02-231-6/+20
| * | | | | adding testsCsaba Solya2018-02-231-0/+66
| | |/ / / | |/| | |
* | | | | Remove logsDan Finlay2018-03-031-1/+0
* | | | | Add version bumping scriptDan Finlay2018-03-033-0/+1031
|/ / / /
* | | | [NewUI] Adds the mascara first time flow to betaUI extension (#3257)Dan J Miller2018-02-161-2/+1
* | | | Merge branch 'uat' into uat-nextDan2018-02-085-5/+112
|\ \ \ \
| * | | | Point add-token unit test to old-ui component.Dan2018-02-081-1/+1
| * | | | Merge branch 'master' into uatDan2018-02-085-5/+112
| |\| | |
| | * | | Merge pull request #3146 from MetaMask/i3082-AddTokenValidateInputsFrankie2018-02-013-0/+67
| | |\ \ \
| | | * | | Clean up test, remove react & mountWithStoreThomas2018-01-311-3/+2
| | | * | | Set address to default with empty string, add test validation.Thomas2018-01-313-0/+68
| | * | | | Merge branch 'master' into localStorage-clean-upFrankie2018-02-011-0/+43
| | |\ \ \ \
| | | * | | | clean upBruno Barbieri2018-02-011-19/+13
| | | * | | | add test for wipeTransactionsBruno Barbieri2018-02-011-0/+49
| | | |/ / /
| | * | | | remove RecentBlocks from diskfrankiebee2018-02-011-0/+1
| | * | | | test for migration 021frankiebee2018-01-312-0/+16
| | |/ / /
* | | | | Update modal header design on send screen (#3196)Alexander Tseung2018-02-071-12/+8
* | | | | Integration tests for signature requests confirmations. (#3194)Dan J Miller2018-02-071-0/+67
* | | | | Add functional integration testing to Add Token flow (#3189)Alexander Tseung2018-02-062-0/+160
* | | | | Functional Integration Tests for send ether flow. (#3119)Dan J Miller2018-01-301-0/+229
|/ / / /
* | | | Revert integration to oldUiThomas2018-01-231-18/+23
* | | | Merge branch 'uat' into newmasterChi Kei Chan2018-01-2010-168/+172
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'uat' into uat-master-011618Alexander Tseung2018-01-1710-168/+172
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'NewUI-flat' into NewUI-flat-4.0.5cAlexander Tseung2018-01-0410-168/+172
| | |\ \
| | | * | [NewUI] Fixes tests and sends user to NewUI after registering. (#2788)Dan J Miller2017-12-222-3/+4
| | | * | Merge branch 'master' into NewUI-flatDan2017-12-211-0/+48
| | | |\ \
| | | * \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-12-071-20/+67
| | | |\ \ \
| | | * | | | Merge branch 'master' into NewUI-flat-merge-with-masterDan2017-12-072-35/+57