From b481497246316c90ab95cf14a393d1f8ae7eeafc Mon Sep 17 00:00:00 2001
From: Dan Miller <danjm.com@gmail.com>
Date: Tue, 7 May 2019 15:22:02 -0230
Subject: Fix fetch and ethquery mocks in integration tests
---
test/integration/lib/send-new-ui.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'test/integration/lib/send-new-ui.js')
diff --git a/test/integration/lib/send-new-ui.js b/test/integration/lib/send-new-ui.js
index 6a58611d1..85487a59f 100644
--- a/test/integration/lib/send-new-ui.js
+++ b/test/integration/lib/send-new-ui.js
@@ -25,6 +25,7 @@ global.ethereumProvider = {}
async function runSendFlowTest (assert, done) {
const tempFetch = global.fetch
+ const realFetch = window.fetch.bind(window)
global.fetch = (...args) => {
if (args[0] === 'https://ethgasstation.info/json/ethgasAPI.json') {
return Promise.resolve({ json: () => Promise.resolve(JSON.parse(fetchMockResponses.ethGasBasic)) })
@@ -35,7 +36,7 @@ async function runSendFlowTest (assert, done) {
} else if (args[0].match(/chromeextensionmm/)) {
return Promise.resolve({ json: () => Promise.resolve(JSON.parse(fetchMockResponses.metametrics)) })
}
- return window.fetch(...args)
+ return realFetch.fetch(...args)
}
console.log('*** start runSendFlowTest')
--
cgit
ss='form'><form method='get'>
<input type='hidden' name='id' value='2185bb9f8744125e81a4da38210ec83e8f4f8bbf'/><select name='h' onchange='this.form.submit();'>
<option value='2014Q1'>2014Q1</option>
<option value='2014Q2'>2014Q2</option>
<option value='2014Q3'>2014Q3</option>
<option value='2014Q4'>2014Q4</option>
<option value='2015Q1'>2015Q1</option>
<option value='2015Q2'>2015Q2</option>
<option value='2015Q3'>2015Q3</option>
<option value='2015Q4'>2015Q4</option>
<option value='2016Q1'>2016Q1</option>
<option value='2016Q2'>2016Q2</option>
<option value='2016Q3'>2016Q3</option>
<option value='2016Q4'>2016Q4</option>
<option value='2017Q1'>2017Q1</option>
<option value='2017Q2'>2017Q2</option>
<option value='2017Q3'>2017Q3</option>
<option value='2017Q4'>2017Q4</option>
<option value='2018Q1'>2018Q1</option>
<option value='2018Q2'>2018Q2</option>
<option value='2018Q3'>2018Q3</option>
<option value='2018Q4'>2018Q4</option>
<option value='2019Q1'>2019Q1</option>
<option value='2019Q2'>2019Q2</option>
<option value='2019Q3'>2019Q3</option>
<option value='2019Q4'>2019Q4</option>
<option value='2020Q1'>2020Q1</option>
<option value='2020Q2'>2020Q2</option>
<option value='2020Q3'>2020Q3</option>
<option value='2020Q4'>2020Q4</option>
<option value='2021Q1'>2021Q1</option>
<option value='2021Q2'>2021Q2</option>
<option value='2021Q3'>2021Q3</option>
<option value='2021Q4'>2021Q4</option>
<option value='2022Q1'>2022Q1</option>
<option value='2022Q2'>2022Q2</option>
<option value='2022Q3'>2022Q3</option>
<option value='2022Q4'>2022Q4</option>
<option value='2023Q1'>2023Q1</option>
<option value='2023Q2'>2023Q2</option>
<option value='2023Q3'>2023Q3</option>
<option value='2023Q4'>2023Q4</option>
<option value='2024Q1'>2024Q1</option>
<option value='2024Q2'>2024Q2</option>
<option value='2024Q3'>2024Q3</option>
<option value='2024Q4'>2024Q4</option>
<option value='2025Q1'>2025Q1</option>
<option value='2025Q2'>2025Q2</option>
<option value='2025Q3'>2025Q3</option>
<option value='branches/2014Q1'>branches/2014Q1</option>
<option value='branches/2014Q2'>branches/2014Q2</option>
<option value='branches/2014Q3'>branches/2014Q3</option>
<option value='branches/2014Q4'>branches/2014Q4</option>
<option value='branches/2015Q1'>branches/2015Q1</option>
<option value='branches/2015Q2'>branches/2015Q2</option>
<option value='branches/2015Q3'>branches/2015Q3</option>
<option value='branches/2015Q4'>branches/2015Q4</option>
<option value='branches/2016Q1'>branches/2016Q1</option>
<option value='branches/2016Q2'>branches/2016Q2</option>
<option value='branches/2016Q3'>branches/2016Q3</option>
<option value='branches/2016Q4'>branches/2016Q4</option>
<option value='branches/2017Q1'>branches/2017Q1</option>
<option value='branches/2017Q2'>branches/2017Q2</option>
<option value='branches/2017Q3'>branches/2017Q3</option>
<option value='branches/2017Q4'>branches/2017Q4</option>
<option value='branches/2018Q1'>branches/2018Q1</option>
<option value='branches/2018Q2'>branches/2018Q2</option>
<option value='branches/2018Q3'>branches/2018Q3</option>
<option value='branches/2018Q4'>branches/2018Q4</option>
<option value='branches/2019Q1'>branches/2019Q1</option>
<option value='branches/2019Q2'>branches/2019Q2</option>
<option value='branches/2019Q3'>branches/2019Q3</option>
<option value='branches/2019Q4'>branches/2019Q4</option>
<option value='branches/2020Q1'>branches/2020Q1</option>
<option value='branches/2020Q2'>branches/2020Q2</option>
<option value='branches/2020Q3'>branches/2020Q3</option>
<option value='branches/2020Q4'>branches/2020Q4</option>
<option value='branches/2021Q1'>branches/2021Q1</option>
<option value='branches/RELEASE_8_4_0'>branches/RELEASE_8_4_0</option>
<option value='branches/RELENG_2_1_0'>branches/RELENG_2_1_0</option>
<option value='branches/RELENG_2_2'>branches/RELENG_2_2</option>
<option value='branches/RELENG_9_1_0'>branches/RELENG_9_1_0</option>
<option value='branches/RELENG_9_2_0'>branches/RELENG_9_2_0</option>
<option value='dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3' selected='selected'>dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3</option>
<option value='dependabot/npm_and_yarn/devel/electron4/files/lodash-4.17.15'>dependabot/npm_and_yarn/devel/electron4/files/lodash-4.17.15</option>
<option value='dependabot/npm_and_yarn/devel/electron4/files/lodash.merge-4.6.2'>dependabot/npm_and_yarn/devel/electron4/files/lodash.merge-4.6.2</option>
<option value='dependabot/npm_and_yarn/devel/electron4/files/lodash.template-4.5.0'>dependabot/npm_and_yarn/devel/electron4/files/lodash.template-4.5.0</option>
<option value='dependabot/npm_and_yarn/devel/electron4/files/minimist-1.2.2'>dependabot/npm_and_yarn/devel/electron4/files/minimist-1.2.2</option>
<option value='dependabot/npm_and_yarn/devel/electron4/files/mixin-deep-1.3.2'>dependabot/npm_and_yarn/devel/electron4/files/mixin-deep-1.3.2</option>
<option value='main'>main</option>
<option value='master'>master</option>
<option value='svn_head'>svn_head</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>FreeBSD Ports (https://github.com/freebsd/freebsd-ports)</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/about/?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3'>about</a><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3'>summary</a><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/refs/?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3&id=2185bb9f8744125e81a4da38210ec83e8f4f8bbf'>refs</a><a class='active' href='/~lantw44/cgit/cgit.cgi/freebsd-ports/log/databases/postgresql96-client?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3'>log</a><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/tree/databases/postgresql96-client?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3&id=2185bb9f8744125e81a4da38210ec83e8f4f8bbf'>tree</a><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/commit/databases/postgresql96-client?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3&id=2185bb9f8744125e81a4da38210ec83e8f4f8bbf'>commit</a><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/diff/databases/postgresql96-client?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3&id=2185bb9f8744125e81a4da38210ec83e8f4f8bbf'>diff</a><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/stats/databases/postgresql96-client?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3'>stats</a></td><td class='form'><form class='right' method='get' action='/~lantw44/cgit/cgit.cgi/freebsd-ports/log/databases/postgresql96-client'>
<input type='hidden' name='h' value='dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3'/><input type='hidden' name='id' value='2185bb9f8744125e81a4da38210ec83e8f4f8bbf'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/log/?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3&id=2185bb9f8744125e81a4da38210ec83e8f4f8bbf'>root</a>/<a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/log/databases?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3&id=2185bb9f8744125e81a4da38210ec83e8f4f8bbf'>databases</a>/<a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/log/databases/postgresql96-client?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3&id=2185bb9f8744125e81a4da38210ec83e8f4f8bbf'>postgresql96-client</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/log/databases/postgresql96-client?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3&id=2185bb9f8744125e81a4da38210ec83e8f4f8bbf&showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Age</th><th class='left'>Files</th><th class='left'>Lines</th></tr>
<tr><td class='commitgraph'>* </td><td><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/commit/databases/postgresql96-client?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3&id=a6517efcecc95441476d29871059ade91e2bff0a'>The PostgreSQL Global Development Group has released an update to all</a></td><td>girgen</td><td><span title='2017-09-05 17:27:11 +0800'>2017-09-05</span></td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+1</span></td></tr>
<tr><td class='commitgraph'>* </td><td><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/commit/databases/postgresql96-client?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3&id=7278f12dd1d934250f50a0021925fe9bb22538c3'>- Include pg_regress to postgresql96-client, to allow running regression test...</a></td><td>amdmi3</td><td><span title='2017-06-29 20:04:18 +0800'>2017-06-29</span></td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+2</span></td></tr>
<tr><td class='commitgraph'>* </td><td><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/commit/databases/postgresql96-client?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3&id=387370d5525f9919e2e92b48b59f1f01da8941e5'>Bump PORTREVISION for devel/readline shlib change</a></td><td>sunpoet</td><td><span title='2017-06-28 22:51:22 +0800'>2017-06-28</span>