diff --git a/__tests__/installer.test.ts b/__tests__/installer.test.ts index 5d03c408..bf2b7bf2 100644 --- a/__tests__/installer.test.ts +++ b/__tests__/installer.test.ts @@ -920,10 +920,6 @@ describe('setup-node', () => { os.platform = 'darwin'; os.arch = 'x64'; - const expectedVersion = nodeTestDist[0]; - - let expectedUrl = `https://nodejs.org/dist/${expectedVersion.version}/node-${expectedVersion.version}-${os.platform}-${os.arch}.tar.gz`; - findSpy.mockImplementation(() => ''); getManifestSpy.mockImplementation(() => { throw new Error('Unable to download manifest'); @@ -932,21 +928,10 @@ describe('setup-node', () => { // Act await main.run(); - // Assert - expect(logSpy).toHaveBeenCalledWith( - `Attempting to download ${inputVersion}...` - ); - + // assert expect(logSpy).toHaveBeenCalledWith('Unable to download manifest'); expect(logSpy).toHaveBeenCalledWith('getting latest node version...'); - - expect(logSpy).toHaveBeenCalledWith( - `Acquiring ${expectedVersion.version.substring( - 1, - expectedVersion.version.length - )} - ${os.arch} from ${expectedUrl}` - ); } ); }); diff --git a/package-lock.json b/package-lock.json index 87480e4a..bfaaf9b5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "semver": "^6.1.1" }, "devDependencies": { - "@types/jest": "^27.0.2", + "@types/jest": "^27.5.0", "@types/node": "^16.11.25", "@types/semver": "^6.0.0", "@zeit/ncc": "^0.21.0", @@ -1471,12 +1471,12 @@ } }, "node_modules/@types/jest": { - "version": "27.0.2", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.0.2.tgz", - "integrity": "sha512-4dRxkS/AFX0c5XW6IPMNOydLn2tEhNhJV7DnYK+0bjoJZ+QTmfucBlihX7aoEsh/ocYtkLC73UbnBXBXIxsULA==", + "version": "27.5.0", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.5.0.tgz", + "integrity": "sha512-9RBFx7r4k+msyj/arpfaa0WOOEcaAZNmN+j80KFbFCoSqCJGHTz7YMAMGQW9Xmqm5w6l5c25vbSjMwlikJi5+g==", "dev": true, "dependencies": { - "jest-diff": "^27.0.0", + "jest-matcher-utils": "^27.0.0", "pretty-format": "^27.0.0" } }, @@ -6283,12 +6283,12 @@ } }, "@types/jest": { - "version": "27.0.2", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.0.2.tgz", - "integrity": "sha512-4dRxkS/AFX0c5XW6IPMNOydLn2tEhNhJV7DnYK+0bjoJZ+QTmfucBlihX7aoEsh/ocYtkLC73UbnBXBXIxsULA==", + "version": "27.5.0", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.5.0.tgz", + "integrity": "sha512-9RBFx7r4k+msyj/arpfaa0WOOEcaAZNmN+j80KFbFCoSqCJGHTz7YMAMGQW9Xmqm5w6l5c25vbSjMwlikJi5+g==", "dev": true, "requires": { - "jest-diff": "^27.0.0", + "jest-matcher-utils": "^27.0.0", "pretty-format": "^27.0.0" } }, diff --git a/package.json b/package.json index 63b36edd..1d2de724 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "semver": "^6.1.1" }, "devDependencies": { - "@types/jest": "^27.0.2", + "@types/jest": "^27.5.0", "@types/node": "^16.11.25", "@types/semver": "^6.0.0", "@zeit/ncc": "^0.21.0", diff --git a/src/installer.ts b/src/installer.ts index 0a6b1f10..5b87d29a 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -7,7 +7,6 @@ import * as tc from '@actions/tool-cache'; import * as path from 'path'; import * as semver from 'semver'; import fs = require('fs'); -import * as installer from './installer'; // // Node versions interface @@ -372,7 +371,7 @@ async function queryDistForMatch( } let versions: string[] = []; - let nodeVersions = await installer.getVersionsFromDist(); + let nodeVersions = await getVersionsFromDist(); if ( versionSpec === 'current' ||