14 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	28c509914b	Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into i#3896	2018-07-10 11:32:05 -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	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
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	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	5be154ea20	controllers - transactions - merge @frankiebee's work with mine	2018-05-28 14:29:31 -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
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