Skip to content

Commit 8ce5571

Browse files
committed
Fix some test discovery scope issues
1 parent 13c601e commit 8ce5571

2 files changed

Lines changed: 42 additions & 15 deletions

File tree

Tests/Private/ResolveOutputFolder.Tests.ps1

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
#requires -Module ModuleBuilder
22
Describe "ResolveOutputFolder" {
3-
BeforeAll {
4-
. $PSScriptRoot\..\Convert-FolderSeparator.ps1
5-
$CommandInTest = InModuleScope ModuleBuilder { Get-Command ResolveOutputFolder }
6-
filter ToTestDrive { "$_".Replace($TestDrive, "TestDrive:") }
7-
3+
BeforeDiscovery {
84
$TestCases = [Hashtable[]]@(
95
@{ # Be like Jaykul
106
Source = "ModuleName/Source"
@@ -56,9 +52,19 @@ Describe "ResolveOutputFolder" {
5652
}
5753
)
5854
}
55+
BeforeAll {
56+
. $PSScriptRoot\..\Convert-FolderSeparator.ps1
57+
$CommandInTest = InModuleScope ModuleBuilder { Get-Command ResolveOutputFolder }
58+
filter ToTestDrive {
59+
"$_".Replace($TestDrive, "TestDrive:")
60+
}
61+
}
5962
Context "Build ModuleName" {
6063
It "From '<Source>' to '<Output>' creates '<Result>'" -TestCases $TestCases {
6164
param($Source, $Output, $Result)
65+
if (!$Source -or !$Output -or !$Result) {
66+
throw "Test Scope is Broken"
67+
}
6268

6369
$Parameters = @{
6470
Source = Convert-FolderSeparator "$TestDrive/$Source"

Tests/Public/ConvertFrom-SourceLineNumber.Tests.ps1

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,40 @@
11
Describe "ConvertFrom-SourceLineNumber" {
22
# use the integration test code
3+
BeforeDiscovery {
4+
$Convert_LineNumber_ModulePath = Convert-Path "$PSScriptRoot/../Integration/Result1/Source1/1.0.0/Source1.psm1"
5+
$Convert_LineNumber_ModuleSource = Convert-Path "$PSScriptRoot/../Integration/Source1"
6+
$Convert_LineNumber_ModuleContent = Get-Content $Convert_LineNumber_ModulePath
7+
${\} = [io.path]::DirectorySeparatorChar
8+
9+
$TestCases = @(
10+
@{
11+
outputLine = 40;
12+
sourceFile = ".${\}Private${\}TestUnExportedAliases.ps1";
13+
sourceLine = 13;
14+
Module = $Convert_LineNumber_ModulePath
15+
}
16+
@{
17+
outputLine = 48;
18+
sourceFile = ".${\}Public${\}Get-Source.ps1";
19+
sourceLine = 5;
20+
Module = $Convert_LineNumber_ModulePath
21+
}
22+
@{
23+
outputLine = 56;
24+
sourceFile = ".${\}Public${\}Set-Source.ps1";
25+
sourceLine = 3;
26+
Module = $Convert_LineNumber_ModulePath
27+
}
28+
)
29+
}
330
BeforeAll {
431
Build-Module $PSScriptRoot/../Integration/Source1/build.psd1 -Passthru
532
Push-Location $PSScriptRoot -StackName ConvertFrom-SourceLineNumber
633

7-
$global:Convert_LineNumber_ModulePath = Convert-Path "$PSScriptRoot/../Integration/Result1/Source1/1.0.0/Source1.psm1"
8-
$global:Convert_LineNumber_ModuleSource = Convert-Path "$PSScriptRoot/../Integration/Source1"
9-
$global:Convert_LineNumber_ModuleContent = Get-Content $global:Convert_LineNumber_ModulePath
10-
${global:\} = [io.path]::DirectorySeparatorChar
11-
12-
$global:TestCases = @(
13-
@{ outputLine = 40; sourceFile = ".${\}Private${\}TestUnExportedAliases.ps1"; sourceLine = 13; Module = $Convert_LineNumber_ModulePath }
14-
@{ outputLine = 48; sourceFile = ".${\}Public${\}Get-Source.ps1"; sourceLine = 5; Module = $Convert_LineNumber_ModulePath }
15-
@{ outputLine = 56; sourceFile = ".${\}Public${\}Set-Source.ps1"; sourceLine = 3; Module = $Convert_LineNumber_ModulePath }
16-
)
34+
$Convert_LineNumber_ModulePath = Convert-Path "$PSScriptRoot/../Integration/Result1/Source1/1.0.0/Source1.psm1"
35+
$Convert_LineNumber_ModuleSource = Convert-Path "$PSScriptRoot/../Integration/Source1"
36+
$Convert_LineNumber_ModuleContent = Get-Content $Convert_LineNumber_ModulePath
37+
${\} = [io.path]::DirectorySeparatorChar
1738
}
1839
AfterAll {
1940
Pop-Location -StackName ConvertFrom-SourceLineNumber

0 commit comments

Comments
 (0)