aboutsummaryrefslogtreecommitdiffstats
path: root/test
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* deps - use pify instead of util.promisifykumavis2018-03-151-3/+1
* 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
* | 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
| | | * | | Update to Enzyme 3.2.0Thomas Huang2017-11-265-10/+19
| | | * | | Merge branch 'master' into merge-masterChi Kei Chan2017-11-161-4/+4
| | | |\ \ \
| | | * | | | Update classnames for integration tests and add output/index.css to integrati...Dan2017-11-032-37/+24
| | | * | | | Get current NewUI-flat tests working.Dan2017-11-035-137/+112
| | | * | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-254-5/+174
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'NewUI-flat' into mergeChi Kei Chan2017-10-191-0/+32
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-043-56/+36
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge branch 'master' into mmnChi Kei Chan2017-09-2811-417/+592
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-09-194-17/+94
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch 'master' into nmChi Kei Chan2017-09-1911-236/+3482
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch 'master' into NewUI-flatkumavis2017-08-097-123/+345
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | refactored and added unit testSimon Liang2017-08-081-0/+32
* | | | | | | | | | | | | | test - createTestProviderTools includes block tracker layerkumavis2018-01-184-21/+25
* | | | | | | | | | | | | | test - tx controller - fix txGasUtil referencekumavis2018-01-181-2/+2
* | | | | | | | | | | | | | test - typo - fix spelling of word stubbedkumavis2018-01-184-8/+8
* | | | | | | | | | | | | | test - remove createEthJsQueryStubkumavis2018-01-182-18/+3
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | test - fix to match expected behaviorfrankiebee2018-01-151-14/+28
* | | | | | | | | | | | | test - create ethJsQuery stubfrankiebee2018-01-151-1/+14
* | | | | | | | | | | | | Add test for gas estimate defaultDan Finlay2018-01-091-0/+19
* | | | | | | | | | | | | Merge pull request #2891 from MetaMask/i2621-0xRecipientAddressThomas Huang2018-01-091-0/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into i2621-0xRecipientAddressDan Finlay2018-01-091-0/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Account for 0x/empty string address and contract creationThomas2018-01-081-0/+32
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #2851 from MetaMask/i2812-seedworderrorfixKevin Serrano2018-01-091-2/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Test for failure of the async methods.Kevin Serrano2018-01-041-2/+20
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Fix feature to workDan Finlay2018-01-061-3/+5
* | | | | | | | | | | | | Add test for better gas estimationDan Finlay2018-01-061-0/+25
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #2817 from MetaMask/i#2810Frankie2017-12-291-2/+61
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | tests - be more verbose in test messagesfrankiebee2017-12-291-2/+2
| * | | | | | | | | | | | add tests for #_checkIfNonceIsTakenfrankiebee2017-12-281-2/+61
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Add additional test to ui utils to account for exact wei values.Kevin Serrano2017-12-281-0/+6
* | | | | | | | | | | | Add test for edge case.Kevin Serrano2017-12-281-0/+6
|/ / / / / / / / / / /
* | | | | | | | | | / Add failing test for updating token detailsDan Finlay2017-12-191-0/+48
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Add tests for exponential backoff code in _resubmitTxDan2017-12-071-17/+63
* | | | | | | | | | Update resubmitPendingTxs tests.Dan2017-12-071-3/+4
* | | | | | | | | | Remove debuggerDan Finlay2017-11-301-1/+0
* | | | | | | | | | Add markdown class to mascara ui markdown fieldDan Finlay2017-11-301-3/+4
* | | | | | | | | | Fix test referenceDan Finlay2017-11-301-3/+3
* | | | | | | | | | Make notice skipping asyncDan Finlay2017-11-301-3/+3
* | | | | | | | | | Redundantly skip noticesDan Finlay2017-11-301-25/+22
* | | | | | | | | | Make test more resilientDan Finlay2017-11-301-3/+3
* | | | | | | | | | Remove duplicate button declarationDan Finlay2017-11-301-2/+2
* | | | | | | | | | Fix test selectorDan Finlay2017-11-301-0/+1
* | | | | | | | | | Accept all notices in integration testsDan Finlay2017-11-301-18/+3
* | | | | | | | | | Fix test to skip screens before privacy noticeDan Finlay2017-11-291-1/+7
* | | | | | | | | | Remove logsDan Finlay2017-11-211-6/+0
* | | | | | | | | | Get test passingDan Finlay2017-11-211-4/+25
* | | | | | | | | | Add failing test for #2577 Seed Phrase BugDan Finlay2017-11-211-0/+18
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | newUnaprovedTx => newUnapprovedTxDora E. Mondrian2017-11-061-4/+4
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Add Integration TestsChi Kei Chan2017-10-211-9/+50
* | | | | | | | Fixing integraiton testChi Kei Chan2017-10-212-3/+130
* | | | | | | | Fix unit testChi Kei Chan2017-10-212-2/+3
|/ / / / / / /
* | | | | | | Revert "NetworkController refactor for new EthClient interface"kumavis2017-10-193-12/+23
* | | | | | | Move etherscan link logic into moduleDan Finlay2017-10-142-30/+0
* | | | | | | nonce-tracker - use blockTracker directlykumavis2017-10-121-3/+4
* | | | | | | test - integration - intercept reload attemptskumavis2017-10-111-0/+3
* | | | | | | network-controller - use obj-proxy for providerProxykumavis2017-10-111-20/+5
* | | | | | | Make modificationKevin Serrano2017-10-101-1/+1
* | | | | | | Fix to actually fail in earlier versions.Kevin Serrano2017-10-101-5/+7
* | | | | | | Add test to look for wei precision.Kevin Serrano2017-10-101-0/+36
* | | | | | | Merge pull request #2305 from MetaMask/nodeifyFrankie2017-10-071-4/+3
|\ \ \ \ \ \ \
| * | | | | | | nodeify - fix testkumavis2017-10-071-4/+3
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Provide method for tx tracker to refer to all txsDan Finlay2017-10-071-2/+3
* | | | | | | Add failing test for issue #2294Dan Finlay2017-10-071-1/+52
|/ / / / / /
* | | | | | pending tx tracker - test - expect warning event on resubmit failurekumavis2017-10-031-2/+9
* | | | | | pending tx tracker - test - rename tests to match event namekumavis2017-10-031-4/+4
* | | | | | Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into h...kumavis2017-10-031-3/+0
|\ \ \ \ \ \
| * | | | | | tx state history - fix bug where initial snapshot was mutated on updateTxkumavis2017-10-031-0/+22
* | | | | | | tx state history - test - fix format of history entrieskumavis2017-10-031-0/+26
|/ / / / / /
* | | | | / pending-tx - dont check the balance to rebrodcastfrankiebee2017-09-302-51/+1
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #2124 from MetaMask/breakout-mascarakumavis2017-09-281-0/+1
|\ \ \ \ \
| * | | | | stub platformfrankiebee2017-09-201-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into new-currency-testkumavis2017-09-289-404/+581
|\ \ \ \ \
| * \ \ \ \ Merge pull request #2194 from MetaMask/network-controller-refactorkumavis2017-09-281-3/+3
| |\ \ \ \ \
| | * | | | | network controller - refactor to use _setProviderkumavis2017-09-281-3/+3
| * | | | | | Merge branch 'master' into direct-block-trackerkumavis2017-09-285-233/+471
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3kumavis2017-09-285-233/+471
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | pending-tx - move incrementing of the retryCount on the txMeta outside pendin...frankiebee2017-09-271-1/+1
| | | * | | | | fix testsfrankiebee2017-09-271-2/+2
| | | * | | | | Merge branch 'transactionControllerRefractorPt3' of https://github.com/MetaMa...frankiebee2017-09-271-14/+153
| | | |\ \ \ \ \
| | | | * | | | | Clean up transactionController teststmashuang2017-09-261-71/+53
| | | | * | | | | Remove pending updateAndApprovedTransaction testtmashuang2017-09-261-10/+0
| | | | * | | | | Most of transaction controller teststmashuang2017-09-231-12/+180
| | | * | | | | | transactions: make evnt names pretty and eaiser to readfrankiebee2017-09-271-9/+9
| | | * | | | | | transactions: lint fixes and reveal status-update event for balance controllerfrankiebee2017-09-271-1/+1
| | | * | | | | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-09-2712-113/+320
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | add test for pendingTxCountfrankiebee2017-09-141-0/+13
| | | * | | | | | match other controller patternsfrankiebee2017-09-131-1/+1
| | | * | | | | | more tests and craete a getPendingTransactions functionfrankiebee2017-09-092-1/+24
| | | * | | | | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-09-074-34/+243
| | | |\ \ \ \ \ \
| | | * | | | | | | add better commentsfrankiebee2017-09-061-2/+2
| | | * | | | | | | rename tx-utils.js -> tx-gas-utils.jsfrankiebee2017-09-061-1/+1
| | | * | | | | | | remove #buildEthTxFromParamsfrankiebee2017-09-061-1/+3
| | | * | | | | | | fix testsfrankiebee2017-08-221-4/+7
| | | * | | | | | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-08-225-92/+3099
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Create tests for TxStateManagerfrankiebee2017-08-192-196/+253
| | | | |_|_|_|_|/ / | | | |/| | | | | |
| * | / | | | | | | style - small whitespace nitpickkumavis2017-09-281-3/+3
| |/ / / / / / / /
| * | | | | | | | Merge branch 'master' into filter-fixes-moarDan Finlay2017-09-285-169/+104
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOut...kumavis2017-09-272-13/+11
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | * | | | | | | Add mock random value generatorDan Finlay2017-09-261-0/+4
| | | * | | | | | | Merge branch 'AddBalanceController' of github.com:MetaMask/metamask-plugin in...Dan Finlay2017-09-261-4/+1
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-261-4/+1
| | | | |\ \ \ \ \ \ \
| | | * | | | | | | | | Implemented feedbackDan Finlay2017-09-261-13/+7
| | | |/ / / / / / / /
| | * | | | | | | | | Remove keyring controller from projectDan Finlay2017-09-231-164/+0
| | * | | | | | | | | Merge branch 'AddBalanceController' into BreakOutKeyringControllerDan Finlay2017-09-234-3/+107
| | |\| | | | | | | | | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Fix test referencesDan Finlay2017-09-232-3/+3
| | | * | | | | | | Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-234-17/+94
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |
| | | * | | | | | | Fix testDan Finlay2017-09-141-0/+5
| | | * | | | | | | Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-143-106/+118
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | |
| | | * | | | | | | Some progressDan Finlay2017-09-131-0/+1
| | | * | | | | | | Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceControllerDan Finlay2017-09-121-0/+98
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Improve test nameDan Finlay2017-09-081-1/+1
| | | | * | | | | | | Add test for computing gas priceDan Finlay2017-09-081-0/+16
| | | | * | | | | | | Remove logsDan Finlay2017-09-081-5/+0
| | | | * | | | | | | Fix balance calc testDan Finlay2017-09-081-1/+1
| | | | * | | | | | | Fix valueFor testDan Finlay2017-09-081-4/+5
| | | | * | | | | | | Add basic test for valueForDan Finlay2017-09-081-3/+22
| | | | * | | | | | | test not passingDan Finlay2017-09-081-3/+32
| | | | * | | | | | | Add first passing balance calc testDan Finlay2017-09-071-7/+8
| | | | * | | | | | | Add test templateDan Finlay2017-09-071-0/+37
| | | | | |_|_|_|/ / | | | | |/| | | | |
| * | | | | | | | | fix testfrankiebee2017-09-271-1/+1
| * | | | | | | | | wrap block tracker in events proxyfrankiebee2017-09-271-0/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Modify tests for new API.Kevin Serrano2017-09-271-10/+10
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Allow custom encryptor to be passed to MetaMaskController and KeyringControll...Dan Finlay2017-09-221-4/+1
|/ / / / / / /
* | | | | | | test - integration - bump timeoutkumavis2017-09-191-1/+1
* | | | | | | tests - mascara - increase timeout before test startskumavis2017-09-161-1/+1
* | | | | | | test - mascara - move skip reload test flagkumavis2017-09-161-1/+0
* | | | | | | tests - integration - mascara - small cleanup and timeout adjustmentskumavis2017-09-161-5/+3
* | | | | | | set time if platform is mascarafrankiebee2017-09-161-2/+4
* | | | | | | remove testem filesfrankiebee2017-09-161-1/+1
* | | | | | | dont reload on initial download and wait before passing sw to uifrankiebee2017-09-161-2/+2
* | | | | | | tests - integration - get flat and mascara tests closer to compatiblekumavis2017-09-142-9/+6
* | | | | | | tests - refactor and rename npm scriptskumavis2017-09-141-0/+0
* | | | | | | tests - mascara - move temp build files into dist/mascarakumavis2017-09-141-6/+6
* | | | | | | tests - start migrating mascara tests to karmakumavis2017-09-143-0/+81
| |_|/ / / / |/| | | | |
* | | | | | tests - integration - fix bad cherry-pickkumavis2017-09-121-16/+7
* | | | | | test - integration - drop testem for karmakumavis2017-09-122-22/+43
* | | | | | test - integration - build - manually exit from test builder + add bundle des...kumavis2017-09-121-1/+2
* | | | | | test - integration - build - use pump + log bundling informationkumavis2017-09-121-6/+12
* | | | | | test - integration - use async fn for error catchingkumavis2017-09-121-94/+87
|/ / / / /
* | | | | Merge pull request #1987 from MetaMask/CheckFaq67Kevin Serrano2017-09-081-0/+19
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add test for trying to reproduce faq#67Dan Finlay2017-08-301-0/+19
* | | | | Update mock-store dependencytmashuang2017-09-071-2/+2
|/ / / /
* | | | Add some tests to tx-state-history-helperDan Finlay2017-08-291-0/+26
* | | | Corrected test constraintsDan Finlay2017-08-241-2/+2
* | | | Add mysterious failing testDan Finlay2017-08-241-0/+20
* | | | Pass nonce testsDan Finlay2017-08-241-4/+4
* | | | Fix new test, break an older maybe wrong oneDan Finlay2017-08-241-3/+3
* | | | Add failing test for newly identified error stateDan Finlay2017-08-241-0/+17
* | | | Merge branch 'master' into useLocalNonceDan Finlay2017-08-243-10/+3101
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #1914 from MetaMask/history-diffDan Finlay2017-08-193-10/+3101
| |\ \ \
| | * | | tx controller - test - fix typo from moved testkumavis2017-08-151-3/+3
| | * | | tx controller - tx state history various small fixeskumavis2017-08-151-1/+1
| | * | | tx controller - test - test tx state history in updateTxkumavis2017-08-151-6/+18
| | * | | introduce tx-state-history-helper and diff-based historykumavis2017-08-153-5/+3084
| | |/ /
* | | | Refer to pending nonces, not just their countDan Finlay2017-08-221-0/+15
* | | | fix testfrankiebee2017-08-221-9/+9
* | | | When network nonce is highest, it should be used.Dan Finlay2017-08-221-4/+15
* | | | Fix testDan Finlay2017-08-221-5/+5
* | | | Add new assertions and de-duplicate nonce tracker generationDan Finlay2017-08-221-29/+73
* | | | Add test for no previous txsDan Finlay2017-08-221-4/+25
* | | | Confine mock strategy to describe blockDan Finlay2017-08-221-35/+39
* | | | Move mock txs to tx mocking classDan Finlay2017-08-222-35/+48
* | | | add test for using localNoncefrankiebee2017-08-191-4/+42
|/ / /
* / / Remove dead testsDan Finlay2017-08-171-86/+1
|/ /
* | Merge branch 'master' into greenkeeper/initialkumavis2017-08-096-121/+344
|\ \
| * | use provider stubfrankiebee2017-08-092-88/+65
| * | create a provider stubfrankiebee2017-08-091-0/+25
| * | remove .onlyfrankiebee2017-08-081-1/+1
| * | Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-083-20/+137
| |\|
| * | fix testfrankiebee2017-08-081-3/+3
| * | Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-054-28/+58
| |\ \
| * | | test for pending tx watcherfrankiebee2017-08-054-100/+280
| * | | test for SufficientBalancefrankiebee2017-08-051-0/+41
| * | | rename the test description Transaction Manger -> Message Mangerfrankiebee2017-08-051-1/+1
* | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee...kumavis2017-08-085-24/+154
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix integration test failures: ensure qr code is accessiblesdtsui2017-08-051-1/+7
| * | | test - integration - better error handlingkumavis2017-08-041-10/+9
| * | | test - integration - syntax - prefer constkumavis2017-08-041-12/+7
| * | | test - integration - remove unused codekumavis2017-08-041-1/+3
| * | | test - integration - throw error on failurekumavis2017-08-041-2/+2
| * | | Merge branch 'master' into NewUIkumavis2017-08-042-4/+17
| |\ \ \ | | | |/ | | |/|
| | * | test - actions - tx - fix async testkumavis2017-08-041-5/+4
| | * | test - actions - remove commented codekumavis2017-08-041-2/+0
| | * | nodeify - test - syntax nitpickkumavis2017-08-041-3/+3
| | * | add test for no callback errorfrankiebee2017-08-041-0/+11
| | * | fix testfrankiebee2017-08-041-2/+7
| * | | Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUIKevin Serrano2017-08-041-0/+115
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'master' into NewUIDan Finlay2017-07-281-6/+6
| | |\ \
| | * \ \ Merge branch 'master' into NewUIDan Finlay2017-07-284-20/+56
| | |\ \ \
| | * | | | Replace ui with responsive-uiDan Finlay2017-07-251-2/+2
| | * | | | Merge branch 'master' into NewUIDan Finlay2017-07-216-44/+198
| | |\ \ \ \
| | * | | | | Move responsive ui into its own folder for easier mergesDan Finlay2017-07-211-3/+3
| | * | | | | Add new tests for dropdown componentsdtsui2017-07-181-22/+86
| | * | | | | Add tests for new dropdown componentsdtsui2017-07-131-0/+51
| * | | | | | Merge pull request #1848 from MetaMask/transactionControllerRefractorkumavis2017-08-031-25/+139
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | remove unused sinonfrankiebee2017-08-031-1/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 19:16:56 +0800