Merge pull request #15 from ChrisLGardner/handle-no-psget-repo

Handle no psget repo - fixes #7

Author: ChrisLGardner

Extension/task/HelperModule.psm1

@@ -34,7 +34,8 @@ function Import-Pester {
 
 
     if ((Get-Module -Name PowerShellGet -ListAvailable) -and
-        (Get-Command Install-Module).Parameters.ContainsKey('SkipPublisherCheck')) {
+        (Get-Command Install-Module).Parameters.ContainsKey('SkipPublisherCheck') -and
+        (Get-PSRepository)) {
 
         try {
             $null = Get-PackageProvider -Name NuGet -ErrorAction Stop
@@ -44,7 +45,7 @@ function Import-Pester {
                 Install-PackageProvider -Name Nuget -RequiredVersion 2.8.5.201 -Scope CurrentUser -Force -Confirm:$false -ErrorAction Stop
             }
             catch {
-                Write-Host "##vos[task.logissue type=warning]Falling back to version of Pester shipped with extension. To use a newer version please update the version of PowerShellGet available on this machine."
+                Write-Host "##vso[task.logissue type=warning]Falling back to version of Pester shipped with extension. To use a newer version please update the version of PowerShellGet available on this machine."
                 Import-Module "$PSScriptRoot\4.10.1\Pester.psd1" -force -Verbose:$false
             }
         }
@@ -65,7 +66,7 @@ function Import-Pester {
         Import-Module -Name Pester -RequiredVersion $NewestPester.Version -Verbose:$false
     }
     else {
-        Write-Host "##vos[task.logissue type=warning]Falling back to version of Pester shipped with extension. To use a newer version please update the version of PowerShellGet available on this machine."
+        Write-Host "##vso[task.logissue type=warning]Falling back to version of Pester shipped with extension. To use a newer version please update the version of PowerShellGet available on this machine."
         Import-Module "$PSScriptRoot\4.10.1\Pester.psd1" -Force -Verbose:$false
     }
 

Extension/task/Pester.ps1

@@ -53,7 +53,7 @@ Write-Host "CodeCoverageOutputFile $CodeCoverageOutputFile"
 Write-Host "CodeCoverageFolder $CodeCoverageFolder"
 Write-Host "ScriptBlock $ScriptBlock"
 
-Import-Module -Name "$PSScriptRoot\HelperModule.psm1" -Force
+Import-Module -Name (Join-Path $PSScriptRoot "HelperModule.psm1") -Force
 Import-Pester -Version $TargetPesterVersion
 
 if ($run32Bit -eq $true -and $env:Processor_Architecture -ne "x86") {

Extension/test/PesterTask/Helper.Tests.ps1

@@ -2,7 +2,7 @@
 Describe "Testing Helper Functions" {
 
     BeforeAll {
-        Import-Module -Name "$PSScriptRoot\..\..\Task\HelperModule.psm1" -Force
+        Import-Module -Name (Resolve-Path "$PSScriptRoot/../../task/HelperModule.psm1") -Force
     }
     Context "Testing Get-HashtableFromString" {
 
@@ -152,7 +152,20 @@ Describe "Testing Helper Functions" {
             Import-Pester -Version "latest"
 
             Assert-MockCalled -CommandName Install-Module -Times 0 -Scope It
-            Assert-MockCalled -CommandName Import-Module -Times 1 -ParameterFilter {$Name -like '*\4.6.0\Pester.psd1'}
+            Assert-MockCalled -CommandName Import-Module -Times 1 -ParameterFilter {$Name -like '*\4.10.1\Pester.psd1'}
+        }
+
+        It "Should fall back to build in version of Pester when no repositories are available" {
+            Mock -CommandName Get-PSRepository -MockWith {}
+            Mock -CommandName Get-Command -MockWith { [PsCustomObject]@{Parameters=@{SkipPublisherCheck='SomeValue'}}} -ParameterFilter {$Name -eq 'Install-Module'}
+
+            Import-Pester -Version "latest"
+
+            Assert-MockCalled -CommandName Install-Module -Times 0 -Scope It
+            Assert-MockCalled -CommandName Write-Host -Times 1 -Scope It -ParameterFilter {
+                $Object -eq "##vso[task.logissue type=warning]Falling back to version of Pester shipped with extension. To use a newer version please update the version of PowerShellGet available on this machine."
+            }
+            Assert-MockCalled -CommandName Import-Module -Times 1 -ParameterFilter {$Name -like '*\4.10.1\Pester.psd1'}
         }
 
         <#It "Loads Pester version that ships with task when not on PS5+ or PowerShellGet is unavailable" {
@@ -164,7 +177,7 @@ Describe "Testing Helper Functions" {
             Mock -CommandName Get-Module -MockWith { }
 
             &$sut -ScriptFolder TestDrive:\ -ResultsFile TestDrive:\output.xml
-            Assert-MockCalled  Import-Module -ParameterFilter { $Name -eq "$pwd\4.6.0\Pester.psd1" }
+            Assert-MockCalled  Import-Module -ParameterFilter { $Name -eq "$pwd\4.10.1\Pester.psd1" }
             Assert-MockCalled Invoke-Pester
         }#>
     }

Extension/test/PesterTask/Pester.Tests.ps1

@@ -1,7 +1,7 @@
 Describe "Testing Pester Task" {
 
     BeforeAll {
-        $taskPath = "$PSScriptRoot\..\..\Task"
+        $taskPath = Resolve-Path "$PSScriptRoot/../../task"
         $sut = Join-Path -Path $taskPath -ChildPath Pester.ps1 -Resolve
     }
 

azure-pipelines.yml

@@ -1,3 +1,4 @@
+name: $(major).$(minor).$(rev:r)
 stages:
   - stage: build
     displayName: Build VSIX
@@ -6,10 +7,6 @@ stages:
         pool:
           vmimage: ubuntu-latest
         steps: 
-        - task: GitVersion@5
-          inputs:
-            runtime: 'core'
-
         #- task: Pester@9
         #  inputs:
         #    scriptFolder: '$(System.DefaultWorkingDirectory)\Extension\test\PesterTask'
@@ -59,7 +56,7 @@ stages:
             rootFolder: './Extension'
             outputPath: '$(Build.ArtifactStagingDirectory)/Pester.vsix'
             updateTasksVersion: true
-            extensionVersion: "$(GitVersion.MajorMinorPatch).$(GitVersion.CommitsSinceVersionSource)"
+            extensionVersion: "$(Build.BuildNumber)"
 
         - task: PublishBuildArtifacts@1
           displayName: 'Publish Artifact: vsix'