Fix integration test and test.ps1

Author: Jaykul

Tests/Integration/Source1.Tests.ps1

@@ -88,25 +88,21 @@ Describe "Regression test for #84: Multiple Aliases per command will Export" -Ta
 }
 
 Describe "Supports building without a build.psd1" -Tag Integration {
-    Copy-Item  $PSScriptRoot\Source1 $PSScriptRoot\Copy1 -Recurse
-    Remove-Item $PSScriptRoot\Copy1\build.psd1
-    Rename-Item $PSScriptRoot\Copy1\Source1.psd1 Copy1.psd1
+    Copy-Item  $PSScriptRoot\Source1 TestDrive:\Source1 -Recurse
+    Remove-Item TestDrive:\Source1\build.psd1
 
     $Build = @{ }
 
     It "No longer fails if there's no build.psd1" {
         $BuildParameters = @{
-            SourcePath               = "$PSScriptRoot\Copy1\Copy1.psd1"
-            OutputDirectory          = "..\Result1"
+            SourcePath               = "TestDrive:\Source1\Source1.psd1"
+            OutputDirectory          = "TestDrive:\Result1"
             VersionedOutputDirectory = $true
         }
 
         $Build.Output = Build-Module @BuildParameters -Passthru
     }
 
-    Remove-Item -Recurse $PSScriptRoot\Copy1
-
-
     It "Creates the same module as with a build.psd1" {
         $Build.Metadata = Import-Metadata $Build.Output.Path
     }

test.ps1

@@ -2,11 +2,11 @@
 using namespace Microsoft.PackageManagement.Provider.Utility
 param(
     [switch]$SkipCodeCoverage,
-    [switch]$HideSuccess
+    [switch]$HideSuccess,
     [switch]$IncludeVSCodeMarker
 )
 Push-Location $PSScriptRoot
-$ModuleUnderTest = Split-Path $PSScriptRoot -Leaf
+$ModuleName = "ModuleBuilder"
 
 # Disable default parameters during testing, just in case
 $PSDefaultParameterValues += @{}
@@ -15,10 +15,10 @@ $PSDefaultParameterValues["Disabled"] = $true
 # Find a built module as a version-numbered folder:
 $FullModulePath = Get-ChildItem [0-9]* -Directory | Sort-Object { $_.Name -as [SemanticVersion[]] } |
     Select-Object -Last 1 -Ov Version |
-    Get-ChildItem -Filter "$($ModuleUnderTest).psd1"
+    Get-ChildItem -Filter "$($ModuleName).psd1"
 
-    if(!$FullModulePath) {
-        throw "Can't find $($ModuleUnderTest).psd1 in $($Version.FullName)"
+    if (!$FullModulePath) {
+        throw "Can't find $($ModuleName).psd1 in $($Version.FullName)"
     }
 
 $Show = if ($HideSuccess) {
@@ -27,15 +27,15 @@ $Show = if ($HideSuccess) {
     "All"
 }
 
-Remove-Module (Split-Path $ModuleUnderTest -Leaf) -ErrorAction Ignore -Force
+Remove-Module (Split-Path $ModuleName -Leaf) -ErrorAction Ignore -Force
 $ModuleUnderTest = Import-Module $FullModulePath -PassThru -Force -DisableNameChecking -Verbose:$false
 Write-Host "Invoke-Pester for Module $($ModuleUnderTest) version $($ModuleUnderTest.Version)"
 
 if (-not $SkipCodeCoverage) {
     # Get code coverage for the psm1 file to a coverage.xml that we can mess with later
-    Invoke-Pester (Join-Path $PSScriptRoot Tests) -CodeCoverage $ModuleUnderTest.Path -CodeCoverageOutputFile ./coverage.xml -Show $Show -PesterOption @{ IncludeVSCodeMarker = $IncludeVSCodeMarker }
+    Invoke-Pester ./Tests -CodeCoverage $ModuleUnderTest.Path -CodeCoverageOutputFile ./coverage.xml -Show $Show -PesterOption @{ IncludeVSCodeMarker = $IncludeVSCodeMarker }
 } else {
-    Invoke-Pester (Join-Path $PSScriptRoot Tests) -Show $Show -PesterOption @{ IncludeVSCodeMarker = $IncludeVSCodeMarker }
+    Invoke-Pester ./Tests -Show $Show -PesterOption @{ IncludeVSCodeMarker = $IncludeVSCodeMarker }
 }
 
 Pop-Location