From d8072f50994fe47e4cb06f4a2329918d64690d2c Mon Sep 17 00:00:00 2001 From: alerickson <25858831+alerickson@users.noreply.github.com> Date: Wed, 9 Oct 2024 22:00:07 -0700 Subject: [PATCH 1/2] Fix tests --- .../InstallPSResourceADOServer.Tests.ps1 | 3 +-- .../InstallPSResourceADOV2Server.Tests.ps1 | 3 +-- test/InstallPSResourceTests/InstallPSResourceLocal.Tests.ps1 | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/test/InstallPSResourceTests/InstallPSResourceADOServer.Tests.ps1 b/test/InstallPSResourceTests/InstallPSResourceADOServer.Tests.ps1 index fbf32c59e..4d3a364cd 100644 --- a/test/InstallPSResourceTests/InstallPSResourceADOServer.Tests.ps1 +++ b/test/InstallPSResourceTests/InstallPSResourceADOServer.Tests.ps1 @@ -132,13 +132,12 @@ Describe 'Test Install-PSResource for V3Server scenarios' -tags 'CI' { $pkg.Version | Should -Be "5.0.0" } - It "Install resource with companyname and repository source location and validate properties" { + It "Install resource with repository source location and validate properties" { Install-PSResource -Name $testModuleName -Version "5.2.5-alpha001" -Repository $ADORepoName -TrustRepository $pkg = Get-InstalledPSResource $testModuleName $pkg.Version | Should -Be "5.2.5" $pkg.Prerelease | Should -Be "alpha001" - $pkg.CompanyName | Should -Be "None" $pkg.RepositorySourceLocation | Should -Be $ADORepoUri } diff --git a/test/InstallPSResourceTests/InstallPSResourceADOV2Server.Tests.ps1 b/test/InstallPSResourceTests/InstallPSResourceADOV2Server.Tests.ps1 index 3d53fb8c8..8696d4132 100644 --- a/test/InstallPSResourceTests/InstallPSResourceADOV2Server.Tests.ps1 +++ b/test/InstallPSResourceTests/InstallPSResourceADOV2Server.Tests.ps1 @@ -132,13 +132,12 @@ Describe 'Test Install-PSResource for V3Server scenarios' -tags 'CI' { $pkg.Version | Should -Be "5.0.0" } - It "Install resource with companyname and repository source location and validate properties" { + It "Install resource with repository source location and validate properties" { Install-PSResource -Name $testModuleName -Version "5.2.5-alpha001" -Repository $ADORepoName -TrustRepository $pkg = Get-InstalledPSResource $testModuleName $pkg.Version | Should -Be "5.2.5" $pkg.Prerelease | Should -Be "alpha001" - $pkg.CompanyName | Should -Be "None" $pkg.RepositorySourceLocation | Should -Be $ADORepoUri } diff --git a/test/InstallPSResourceTests/InstallPSResourceLocal.Tests.ps1 b/test/InstallPSResourceTests/InstallPSResourceLocal.Tests.ps1 index 493495282..5c95c5072 100644 --- a/test/InstallPSResourceTests/InstallPSResourceLocal.Tests.ps1 +++ b/test/InstallPSResourceTests/InstallPSResourceLocal.Tests.ps1 @@ -24,7 +24,7 @@ Describe 'Test Install-PSResource for local repositories' -tags 'CI' { $testModuleClobber2 = "testModuleClobber2" Get-NewPSResourceRepositoryFile Register-LocalRepos - Register-PSResourceRepository -Name $localNupkgRepo -SourceLocation $localNupkgRepoUri + Register-PSResourceRepository -Name $localNupkgRepo -Uri $localNupkgRepoUri $prereleaseLabel = "alpha001" $tags = @() From ff3d4126891ededf5a22ba382d111b85658a57cd Mon Sep 17 00:00:00 2001 From: alerickson <25858831+alerickson@users.noreply.github.com> Date: Thu, 10 Oct 2024 12:56:23 -0700 Subject: [PATCH 2/2] Update localNupkgRepoUri --- test/InstallPSResourceTests/InstallPSResourceLocal.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/InstallPSResourceTests/InstallPSResourceLocal.Tests.ps1 b/test/InstallPSResourceTests/InstallPSResourceLocal.Tests.ps1 index 5c95c5072..2816bff57 100644 --- a/test/InstallPSResourceTests/InstallPSResourceLocal.Tests.ps1 +++ b/test/InstallPSResourceTests/InstallPSResourceLocal.Tests.ps1 @@ -17,7 +17,7 @@ Describe 'Test Install-PSResource for local repositories' -tags 'CI' { $localRepo = "psgettestlocal" $localUNCRepo = "psgettestlocal3" $localNupkgRepo = "LocalNupkgRepo" - $localNupkgRepoUri = "test\testFiles\testNupkgs" + $localNupkgRepoUri = "testFiles\testNupkgs" $testModuleName = "test_local_mod" $testModuleName2 = "test_local_mod2" $testModuleClobber = "testModuleClobber"