From 09cc69fecbb9f44b83a14e28d873baff98990567 Mon Sep 17 00:00:00 2001 From: Zachary Eisinger Date: Tue, 26 Nov 2019 13:27:50 -0800 Subject: [PATCH] Fix tests that do not specify full url --- __tests__/authutil.test.ts | 26 +++++++++++++------------- __tests__/installer.test.ts | 4 ++-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/__tests__/authutil.test.ts b/__tests__/authutil.test.ts index 610ea12..de0fd7d 100644 --- a/__tests__/authutil.test.ts +++ b/__tests__/authutil.test.ts @@ -29,7 +29,7 @@ const nugetorgNuGetConfig: string = ` const gprnugetorgNuGetConfig: string = ` - + `; @@ -37,7 +37,7 @@ const gprnugetorgNuGetConfig: string = ` const gprNuGetConfig: string = ` - + `; @@ -52,7 +52,7 @@ const twogprNuGetConfig: string = ` const spaceNuGetConfig: string = ` - + `; @@ -94,7 +94,7 @@ describe('authutil tests', () => { it('No existing config, sets up a full NuGet.config with URL and user/PAT for GPR', async () => { process.env['NUGET_AUTH_TOKEN'] = 'TEST_FAKE_AUTH_TOKEN'; - await auth.configAuthentication('https://nuget.pkg.github.com'); + await auth.configAuthentication('https://nuget.pkg.github.com/OwnerName/index.json'); expect(fs.existsSync(nugetConfigFile)).toBe(true); expect( fs.readFileSync(nugetConfigFile, {encoding: 'utf8'}) @@ -104,7 +104,7 @@ describe('authutil tests', () => { it('No existing config, auth token environment variable not provided, throws', async () => { let thrown = false; try { - await auth.configAuthentication('https://nuget.pkg.github.com'); + await auth.configAuthentication('https://nuget.pkg.github.com/OwnerName/index.json'); } catch { thrown = true; } @@ -114,7 +114,7 @@ describe('authutil tests', () => { it('No existing config, sets up a full NuGet.config with URL and other owner/PAT for GPR', async () => { process.env['NUGET_AUTH_TOKEN'] = 'TEST_FAKE_AUTH_TOKEN'; process.env['INPUT_OWNER'] = 'otherorg'; - await auth.configAuthentication('https://nuget.pkg.github.com'); + await auth.configAuthentication('https://nuget.pkg.github.com/otherorg/index.json'); expect(fs.existsSync(nugetConfigFile)).toBe(true); expect( fs.readFileSync(nugetConfigFile, {encoding: 'utf8'}) @@ -130,7 +130,7 @@ describe('authutil tests', () => { fs.writeFileSync(inputNuGetConfigPath, invalidNuGetConfig); let thrown = false; try { - await auth.configAuthentication('https://nuget.pkg.github.com'); + await auth.configAuthentication('https://nuget.pkg.github.com/OwnerName/index.json'); } catch { thrown = true; } @@ -144,7 +144,7 @@ describe('authutil tests', () => { 'nuget.config' ); fs.writeFileSync(inputNuGetConfigPath, emptyNuGetConfig); - await auth.configAuthentication('https://nuget.pkg.github.com'); + await auth.configAuthentication('https://nuget.pkg.github.com/OwnerName/index.json'); expect(fs.existsSync(nugetConfigFile)).toBe(true); expect( fs.readFileSync(nugetConfigFile, {encoding: 'utf8'}) @@ -158,7 +158,7 @@ describe('authutil tests', () => { 'nuget.config' ); fs.writeFileSync(inputNuGetConfigPath, nugetorgNuGetConfig); - await auth.configAuthentication('https://nuget.pkg.github.com'); + await auth.configAuthentication('https://nuget.pkg.github.com/OwnerName/index.json'); expect(fs.existsSync(nugetConfigFile)).toBe(true); expect( fs.readFileSync(nugetConfigFile, {encoding: 'utf8'}) @@ -172,7 +172,7 @@ describe('authutil tests', () => { 'nuget.config' ); fs.writeFileSync(inputNuGetConfigPath, gprNuGetConfig); - await auth.configAuthentication('https://nuget.pkg.github.com'); + await auth.configAuthentication('https://nuget.pkg.github.com/OwnerName/index.json'); expect(fs.existsSync(nugetConfigFile)).toBe(true); expect( fs.readFileSync(nugetConfigFile, {encoding: 'utf8'}) @@ -186,7 +186,7 @@ describe('authutil tests', () => { 'nuget.config' ); fs.writeFileSync(inputNuGetConfigPath, gprnugetorgNuGetConfig); - await auth.configAuthentication('https://nuget.pkg.github.com'); + await auth.configAuthentication('https://nuget.pkg.github.com/OwnerName/index.json'); expect(fs.existsSync(nugetConfigFile)).toBe(true); expect( fs.readFileSync(nugetConfigFile, {encoding: 'utf8'}) @@ -216,7 +216,7 @@ describe('authutil tests', () => { fs.writeFileSync(inputNuGetConfigPath, spaceNuGetConfig); let thrown = false; try { - await auth.configAuthentication('https://nuget.pkg.github.com'); + await auth.configAuthentication('https://nuget.pkg.github.com/OwnerName/index.json'); } catch { thrown = true; } @@ -236,7 +236,7 @@ describe('authutil tests', () => { fs.mkdirSync(inputNuGetConfigDirectory, {recursive: true}); fs.writeFileSync(inputNuGetConfigPath, gprNuGetConfig); await auth.configAuthentication( - 'https://nuget.pkg.github.com', + 'https://nuget.pkg.github.com/OwnerName/index.json', 'subfolder/nuget.config' ); expect(fs.existsSync(nugetConfigFile)).toBe(true); diff --git a/__tests__/installer.test.ts b/__tests__/installer.test.ts index 3af807c..dec75c2 100644 --- a/__tests__/installer.test.ts +++ b/__tests__/installer.test.ts @@ -29,8 +29,8 @@ describe('installer tests', () => { }, 100000); it('Acquires version of dotnet if no matching version is installed', async () => { - await getDotnet('2.2.104'); - const dotnetDir = path.join(toolDir, 'dncs', '2.2.104', os.arch()); + await getDotnet('2.2.205'); + const dotnetDir = path.join(toolDir, 'dncs', '2.2.205', os.arch()); expect(fs.existsSync(`${dotnetDir}.complete`)).toBe(true); if (IS_WINDOWS) {