diff --git a/package.json b/package.json index bcbe458..6b266f0 100644 --- a/package.json +++ b/package.json @@ -6,11 +6,11 @@ "bugs": "https://github.com/adobe/aio-cli-plugin-telemetry/issues", "dependencies": { "@adobe/aio-lib-core-config": "^5", + "@adobe/aio-lib-core-networking": "^5.0.4", "@oclif/core": "^1.3.4", "ci-info": "^4.0.0", "debug": "^4.1.1", "inquirer": "^8.2.1", - "node-fetch": "^2.6.7", "os-name": "^4.0.1", "splunk-logging": "^0.11.1" }, diff --git a/src/telemetry-lib.js b/src/telemetry-lib.js index e17c1b5..f40bfac 100644 --- a/src/telemetry-lib.js +++ b/src/telemetry-lib.js @@ -9,8 +9,10 @@ OF ANY KIND, either express or implied. See the License for the specific languag governing permissions and limitations under the License. */ -const fetch = require('node-fetch') +const { createFetch } = require('@adobe/aio-lib-core-networking') const config = require('@adobe/aio-lib-core-config') + +const fetch = createFetch() const osName = require('os-name') const inquirer = require('inquirer') const debug = require('debug')('aio-telemetry:telemetry-lib') diff --git a/test/hooks.test.js b/test/hooks.test.js index 8ab83f8..ff23cd6 100644 --- a/test/hooks.test.js +++ b/test/hooks.test.js @@ -10,13 +10,15 @@ * governing permissions and limitations under the License. */ -const fetch = require('node-fetch') +const { createFetch } = require('@adobe/aio-lib-core-networking') const inquirer = require('inquirer') const config = require('@adobe/aio-lib-core-config') jest.mock('inquirer') jest.mock('@adobe/aio-lib-core-config') +const fetch = createFetch() + const mockPackageJson = { bin: { aio: '' }, name: 'name', diff --git a/test/index.test.js b/test/index.test.js index 2f14f73..b2e384b 100644 --- a/test/index.test.js +++ b/test/index.test.js @@ -10,12 +10,13 @@ * governing permissions and limitations under the License. */ -const fetch = require('node-fetch') +const { createFetch } = require('@adobe/aio-lib-core-networking') const TheCommand = require('../src/commands/telemetry') const { stdout } = require('stdout-stderr') jest.mock('inquirer') +const fetch = createFetch() let command beforeEach(() => { diff --git a/test/jest.setup.js b/test/jest.setup.js index ce4de83..1bd20ca 100644 --- a/test/jest.setup.js +++ b/test/jest.setup.js @@ -16,8 +16,10 @@ const { vol } = require('memfs') jest.setTimeout(3000) jest.useFakeTimers() -const fetch = require('jest-fetch-mock') -jest.setMock('node-fetch', fetch) +const mockFetch = require('jest-fetch-mock') +jest.mock('@adobe/aio-lib-core-networking', () => ({ + createFetch: jest.fn(() => mockFetch) +})) vol.reset() diff --git a/test/telemetry-lib.test.js b/test/telemetry-lib.test.js index a249c5b..45f4255 100644 --- a/test/telemetry-lib.test.js +++ b/test/telemetry-lib.test.js @@ -10,12 +10,14 @@ * governing permissions and limitations under the License. */ -const fetch = require('node-fetch') +const { createFetch } = require('@adobe/aio-lib-core-networking') const telemetryLib = require('../src/telemetry-lib') const config = require('@adobe/aio-lib-core-config') jest.mock('@adobe/aio-lib-core-config') +const fetch = createFetch() + describe('telemetry-lib', () => { beforeEach(() => { jest.resetModules()