27 Commits

Author	SHA1	Message	Date
Thomas Huang	2392e77cd8	Set metamask controller network provider to localhost	2018-07-30 20:18:01 -07:00
Thomas	138858647e	Merge branch 'develop' into network-remove-provider-engine	2018-07-25 22:38:44 -07:00
frankiebee	b30499886f	test - check that #setTxStatusRejected removes transaction from history	2018-07-10 15:35:27 -07:00
frankiebee	28c509914b	Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into i#3896	2018-07-10 11:32:05 -07:00
kumavis	fa02a6c7c6	test - unit - remove tests for obsolete methods	2018-07-03 13:56:18 -07:00
kumavis	77daed5c74	Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine	2018-07-03 12:42:14 -07:00
brunobar79	4b398701c1	fix unit tests	2018-07-02 21:03:34 -04:00
brunobar79	c734e486a0	fix tests	2018-07-02 20:21:27 -04:00
brunobar79	0da41263ac	fix warning for unit tests	2018-07-02 20:12:50 -04:00
brunobar79	a8f745f9fe	eslint --fix .	2018-07-02 18:49:33 -04:00
frankiebee	94a4f99115	tests - fix cancle transaction test to better fit new behavior	2018-06-26 12:21:50 -07:00
frankiebee	7b1f57e05d	woops - remove .only ... Co-authored-by: @jennypollack	2018-06-25 15:18:01 -07:00
frankiebee	9b92ba4c47	trandsactions - remove rejected transactions from history	2018-06-25 15:07:54 -07:00
kumavis	2198276bd5	Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine	2018-06-06 12:05:38 -07:00
Csaba Solya	1dda0c6469	remove generating blocked accounts and use a config file instead	2018-05-30 21:15:59 +02:00
Csaba Solya	cf73581c0e	adding tests for recipient blacklist checker	2018-05-30 17:38:27 +02:00
Csaba Solya	6affd8f949	adding transaction controller tests	2018-05-30 16:24:40 +02:00
kumavis	32293a959c	test - unit - tx-controller - fix blockTracker stub	2018-05-29 01:08:55 -07:00
kumavis	31f47a7a42	test - unit - pending-tx-tracker - update method name	2018-05-28 16:00:35 -07:00
kumavis	686d5cf825	test - unit - nonce-tracker - fix blockTracker stub	2018-05-28 15:59:34 -07:00
kumavis	5be154ea20	controllers - transactions - merge @frankiebee's work with mine	2018-05-28 14:29:31 -07:00
kumavis	deab195772	test - unit - code style nitpick	2018-05-24 23:19:54 -07:00
kumavis	afdefc58e9	test - unit - tx-controller-test - add history object to txMeta when using internal calls	2018-05-24 22:41:09 -07:00
frankiebee	61caee9d94	Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/metamask-extension into transactions-use-new-block-tracker	2018-05-22 16:45:20 -07:00
kumavis	3a80f3dd83	Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine	2018-05-22 13:20:04 -07:00
tmashuang	238f2eb179	Merge branch 'develop' into testing	2018-05-21 16:36:48 -07:00
tmashuang	13ebb0b455	Moved loose some loose test files to sub folders	2018-05-21 05:59:26 -07:00