Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Modules/PSGalleryModules.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<ItemGroup>
<PackageReference Include="PackageManagement" Version="1.1.7.2" />
<PackageReference Include="PowerShellGet" Version="1.6.7" />
<PackageReference Include="PowerShellGet" Version="2.0.0" />
<PackageReference Include="Microsoft.PowerShell.Archive" Version="1.1.0.0" />
<PackageReference Include="PSReadLine" Version="2.0.0-beta3" />
<PackageReference Include="ThreadJob" Version="1.1.2" />
Expand Down
18 changes: 9 additions & 9 deletions test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
$ProgressPreference = "SilentlyContinue"

$RepositoryName = 'INTGallery'
$SourceLocation = 'https://dtlgalleryint.cloudapp.net'
$SourceLocation = 'https://www.poshtestgallery.com'
$RegisteredINTRepo = $false
$ContosoServer = 'ContosoServer'
$FabrikamServerScript = 'Fabrikam-ServerScript'
Expand Down Expand Up @@ -127,8 +127,8 @@ Describe "PowerShellGet - Module tests" -tags "Feature" {
$psgetModuleInfo.Repository | Should -Be $RepositoryName
}

It "Should install a module correctly to the required location with CurrentUser scope" {
Install-Module -Name $ContosoServer -Repository $RepositoryName -Scope CurrentUser
It "Should install a module correctly to the required location with default CurrentUser scope" {
Install-Module -Name $ContosoServer -Repository $RepositoryName
$installedModuleInfo = Get-InstalledModule -Name $ContosoServer

$installedModuleInfo | Should -Not -BeNullOrEmpty
Expand Down Expand Up @@ -159,8 +159,8 @@ Describe "PowerShellGet - Module tests (Admin)" -tags @('Feature', 'RequireAdmin
}

## Marked as 'Pending' on Linux for now because the test requires root privilege but we cannot do it now in our Travis CI Linux build
It "Should install a module correctly to the required location with default AllUsers scope" -Pending:$IsLinux {
Install-Module -Name $ContosoServer -Repository $RepositoryName
It "Should install a module correctly to the required location with AllUsers scope" -Pending:$IsLinux {
Install-Module -Name $ContosoServer -Repository $RepositoryName -Scope AllUsers
$installedModuleInfo = Get-InstalledModule -Name $ContosoServer

$installedModuleInfo | Should -Not -BeNullOrEmpty
Expand Down Expand Up @@ -201,8 +201,8 @@ Describe "PowerShellGet - Script tests" -tags "Feature" {
$psgetScriptInfo.Repository | Should -Be $RepositoryName
}

It "Should install a script correctly to the required location with CurrentUser scope" {
Install-Script -Name $FabrikamServerScript -Repository $RepositoryName -Scope CurrentUser -NoPathUpdate
It "Should install a script correctly to the required location with default CurrentUser scope" {
Install-Script -Name $FabrikamServerScript -Repository $RepositoryName -NoPathUpdate
$installedScriptInfo = Get-InstalledScript -Name $FabrikamServerScript

$installedScriptInfo | Should -Not -BeNullOrEmpty
Expand All @@ -229,8 +229,8 @@ Describe "PowerShellGet - Script tests (Admin)" -tags @('Feature', 'RequireAdmin
}

## Marked as 'Pending' on Linux for now because the test requires root privilege but we cannot do it now in our Travis CI Linux build
It "Should install a script correctly to the required location with default AllUsers scope" -Pending:$IsLinux {
Install-Script -Name $FabrikamServerScript -Repository $RepositoryName -NoPathUpdate
It "Should install a script correctly to the required location with AllUsers scope" -Pending:$IsLinux {
Install-Script -Name $FabrikamServerScript -Repository $RepositoryName -NoPathUpdate -Scope AllUsers
$installedScriptInfo = Get-InstalledScript -Name $FabrikamServerScript

$installedScriptInfo | Should -Not -BeNullOrEmpty
Expand Down