575 Commits

Author	SHA1	Message	Date
kumavis	cdf41c2857	Merge pull request #2124 from MetaMask/breakout-mascara ... require metamascara	2017-09-27 16:27:01 -07:00
kumavis	15b2823e54	Merge branch 'master' into new-currency-test	2017-09-27 16:04:51 -07:00
kumavis	ecf909e140	Merge pull request #2194 from MetaMask/network-controller-refactor ... Network controller refactor	2017-09-27 15:56:23 -07:00
kumavis	f2d9b75e94	network controller - refactor to use _setProvider	2017-09-27 14:44:13 -07:00
kumavis	4404dfc5d3	Merge branch 'master' into direct-block-tracker	2017-09-27 13:58:54 -07:00
kumavis	5bbea78306	Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3 ... Transaction controller refractor pt3	2017-09-27 13:57:04 -07:00
kumavis	b41aad6d1a	style - small whitespace nitpick	2017-09-27 12:33:46 -07:00
Dan Finlay	e72083f6e8	Merge branch 'master' into filter-fixes-moar	2017-09-27 10:57:02 -07:00
frankiebee	0a94ec41d3	pending-tx - move incrementing of the retryCount on the txMeta outside pending-tx-tracker	2017-09-26 22:42:59 -07:00
kumavis	1877c0766c	Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOutKeyringController	2017-09-26 21:42:30 -07:00
frankiebee	b05a6f89cb	fix tests	2017-09-26 18:19:44 -07:00
frankiebee	36ddaf220d	Merge branch 'transactionControllerRefractorPt3' of https://github.com/MetaMask/metamask-extension into transactionControllerRefractorPt3	2017-09-26 18:16:00 -07:00
frankiebee	80c98b1653	transactions: make evnt names pretty and eaiser to read	2017-09-26 16:55:11 -07:00
frankiebee	9fd5458112	transactions: lint fixes and reveal status-update event for balance controller	2017-09-26 16:54:04 -07:00
frankiebee	8ab23c713d	Merge branch 'master' into transactionControllerRefractorPt3	2017-09-26 16:24:43 -07:00
frankiebee	4f887c6a62	fix test	2017-09-26 13:44:45 -07:00
frankiebee	b654eb9b1f	wrap block tracker in events proxy	2017-09-26 13:38:27 -07:00
Kevin Serrano	31e9dcf470	Modify tests for new API.	2017-09-26 10:02:49 -07:00
tmashuang	ff6f7b52e4	Clean up transactionController tests	2017-09-25 19:47:03 -07:00
Dan Finlay	feed9a5a17	Add mock random value generator	2017-09-25 14:45:28 -07:00
Dan Finlay	d9c92cdbd1	Merge branch 'AddBalanceController' of github.com:MetaMask/metamask-plugin into AddBalanceController	2017-09-25 14:37:11 -07:00
Dan Finlay	8cd7329c91	Implemented feedback	2017-09-25 14:36:49 -07:00
Dan Finlay	dfbdb99858	Merge branch 'master' into AddBalanceController	2017-09-25 11:49:38 -07:00
tmashuang	20fea3f1de	Remove pending updateAndApprovedTransaction test	2017-09-25 10:47:36 -07:00
tmashuang	d4578836c9	Most of transaction controller tests	2017-09-22 16:15:18 -07:00
Dan Finlay	443b1a8eb7	Remove keyring controller from project	2017-09-22 14:38:40 -07:00
Dan Finlay	aa2abc00eb	Merge branch 'AddBalanceController' into BreakOutKeyringController	2017-09-22 14:30:31 -07:00
Dan Finlay	f128240e7f	Fix test references	2017-09-22 14:19:14 -07:00
Dan Finlay	f9d2f523c6	Merge branch 'master' into AddBalanceController	2017-09-22 14:12:41 -07:00
Dan Finlay	e9043f22df	Allow custom encryptor to be passed to MetaMaskController and KeyringControllers.	2017-09-21 15:47:25 -07:00
frankiebee	4e57cdf8b3	stub platform	2017-09-19 11:34:19 -07:00
Chi Kei Chan	a67d3ecd46	Merge branch 'master' into NewUI-flat	2017-09-18 18:13:15 -07:00
kumavis	9f665d8eda	test - integration - bump timeout	2017-09-18 13:06:35 -07:00
Chi Kei Chan	6c5865d564	Merge branch 'master' into nm	2017-09-18 11:28:10 -07:00
kumavis	5d01ca10e4	tests - mascara - increase timeout before test starts	2017-09-15 13:19:31 -07:00
kumavis	a9900be085	test - mascara - move skip reload test flag	2017-09-15 13:13:53 -07:00
kumavis	779e973b45	tests - integration - mascara - small cleanup and timeout adjustments	2017-09-15 12:19:52 -07:00
frankiebee	c5a2527c17	set time if platform is mascara	2017-09-15 11:57:25 -07:00
frankiebee	7bcca782cb	remove testem files	2017-09-15 11:33:55 -07:00
frankiebee	7fb8623568	dont reload on initial download and wait before passing sw to ui	2017-09-15 11:09:19 -07:00
kumavis	b53d04c409	tests - integration - get flat and mascara tests closer to compatible	2017-09-13 20:25:27 -07:00
kumavis	610f09262d	tests - refactor and rename npm scripts	2017-09-13 17:17:09 -07:00
kumavis	cbff5fd450	tests - mascara - move temp build files into dist/mascara	2017-09-13 16:52:38 -07:00
kumavis	56db3999ad	tests - start migrating mascara tests to karma	2017-09-13 16:45:31 -07:00
Dan Finlay	c9585f166f	Fix test	2017-09-13 15:21:18 -07:00
Dan Finlay	c17c657693	Merge branch 'master' into AddBalanceController	2017-09-13 15:11:03 -07:00
frankiebee	59909601b8	add test for pendingTxCount	2017-09-13 14:07:22 -07:00
Dan Finlay	53a467cd1e	Some progress	2017-09-12 15:06:19 -07:00
frankiebee	3ad67d1b14	match other controller patterns	2017-09-12 09:59:59 -07:00
kumavis	48d21f4fca	tests - integration - fix bad cherry-pick	2017-09-11 22:34:16 -07:00
kumavis	0e70366e9c	test - integration - drop testem for karma	2017-09-11 22:29:40 -07:00
kumavis	d4a41e0277	test - integration - build - manually exit from test builder + add bundle destination log	2017-09-11 22:26:36 -07:00
kumavis	19d6618c04	test - integration - build - use pump + log bundling information	2017-09-11 22:25:31 -07:00
kumavis	a6d49a49ea	test - integration - use async fn for error catching	2017-09-11 15:48:50 -07:00
Dan Finlay	4738746968	Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceController	2017-09-11 15:19:17 -07:00
frankiebee	9b9df41724	more tests and craete a getPendingTransactions function	2017-09-08 14:24:40 -07:00
Kevin Serrano	13c7b28d40	Merge pull request #1987 from MetaMask/CheckFaq67 ... Add test for trying to reproduce faq#67	2017-09-07 15:26:29 -07:00
Dan Finlay	65c00e9fbb	Improve test name	2017-09-07 12:53:30 -07:00
Dan Finlay	532a4040de	Add test for computing gas price	2017-09-07 12:52:25 -07:00
Dan Finlay	c616581001	Remove logs	2017-09-07 12:47:52 -07:00
Dan Finlay	a95a3c7e4f	Fix balance calc test	2017-09-07 12:47:27 -07:00
Dan Finlay	7b92268428	Fix valueFor test	2017-09-07 12:43:10 -07:00
Dan Finlay	4058574436	Add basic test for valueFor	2017-09-07 12:30:25 -07:00
Dan Finlay	b6e8791bc2	test not passing	2017-09-07 11:59:15 -07:00
Dan Finlay	f9a052deed	Add first passing balance calc test	2017-09-06 14:36:15 -07:00
Dan Finlay	714df393b4	Add test template	2017-09-06 14:27:21 -07:00
frankiebee	6c83ba762e	Merge branch 'master' into transactionControllerRefractorPt3	2017-09-06 13:45:03 -07:00
tmashuang	36a44ef61f	Update mock-store dependency	2017-09-06 11:04:17 -07:00
frankiebee	15c12ca4bb	add better comments	2017-09-05 21:50:36 -07:00
frankiebee	00bd5b143f	rename tx-utils.js -> tx-gas-utils.js	2017-09-05 20:33:50 -07:00
frankiebee	4c554f32ec	remove #buildEthTxFromParams	2017-09-05 20:13:43 -07:00
Dan Finlay	2117490d41	Add test for trying to reproduce faq#67 ... Failed to reproduce this issue with the same inputs.	2017-08-29 11:36:53 -07:00
Dan Finlay	b97a65e1d1	Add some tests to tx-state-history-helper	2017-08-28 11:40:28 -07:00
Dan Finlay	e057c37b33	Corrected test constraints	2017-08-23 21:03:29 -07:00
Dan Finlay	dae7c632d6	Add mysterious failing test	2017-08-23 21:01:42 -07:00
Dan Finlay	855f4eeacb	Pass nonce tests	2017-08-23 20:43:47 -07:00
Dan Finlay	221575a191	Fix new test, break an older maybe wrong one	2017-08-23 20:04:03 -07:00
Dan Finlay	5feda43360	Add failing test for newly identified error state ... Reproduces #1966	2017-08-23 19:34:44 -07:00
Dan Finlay	b3b62d97a3	Merge branch 'master' into useLocalNonce	2017-08-23 11:12:46 -07:00
Dan Finlay	38ba31bbe0	Refer to pending nonces, not just their count	2017-08-21 17:29:31 -07:00
frankiebee	e43db262d8	fix test	2017-08-21 16:44:29 -07:00
Dan Finlay	bb24f07b17	When network nonce is highest, it should be used.	2017-08-21 11:59:51 -07:00
Dan Finlay	0f36e0e6da	Fix test	2017-08-21 11:57:42 -07:00
Dan Finlay	440101f2b5	Add new assertions and de-duplicate nonce tracker generation	2017-08-21 11:52:41 -07:00
frankiebee	474a4e941f	fix tests	2017-08-21 11:51:34 -07:00
Dan Finlay	306249e89e	Add test for no previous txs	2017-08-21 11:39:22 -07:00
Dan Finlay	f13c637b23	Confine mock strategy to describe block	2017-08-21 11:37:39 -07:00
Dan Finlay	c76194d7c3	Move mock txs to tx mocking class	2017-08-21 11:35:51 -07:00
frankiebee	fbba3a1ac8	Merge branch 'master' into transactionControllerRefractorPt3	2017-08-21 11:35:22 -07:00
frankiebee	e9712a13ec	Create tests for TxStateManager	2017-08-18 14:11:18 -07:00
frankiebee	bf8a62eb39	add test for using localNonce	2017-08-18 13:53:18 -07:00
Dan Finlay	e0c35179c2	Merge pull request #1914 from MetaMask/history-diff ... Move Tx State History to diff-based format	2017-08-18 13:14:17 -07:00
Dan Finlay	f684b53b69	Remove dead tests	2017-08-16 17:17:05 -07:00
kumavis	a9e5564e8d	tx controller - test - fix typo from moved test	2017-08-14 19:34:22 -07:00
kumavis	1af797b1b3	tx controller - tx state history various small fixes	2017-08-14 19:15:36 -07:00
kumavis	fec0f2ca5e	tx controller - test - test tx state history in updateTx	2017-08-14 19:15:09 -07:00
kumavis	fdffb6fedc	introduce tx-state-history-helper and diff-based history	2017-08-14 18:46:04 -07:00
kumavis	0188e7b94d	Merge branch 'master' into NewUI-flat	2017-08-08 23:30:58 -07:00
kumavis	922ecb9149	Merge branch 'master' into greenkeeper/initial	2017-08-08 16:23:14 -07:00
frankiebee	e761fb0ef7	use provider stub	2017-08-08 18:30:22 -04:00