Skip to content

Commit 78ab8e1

Browse files
committed
Fix test paths for ... not-Windows
1 parent a2e8a0e commit 78ab8e1

File tree

3 files changed

+141
-141
lines changed

3 files changed

+141
-141
lines changed

Tests/Integration/Source1.Tests.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ Describe "Regression test for #40.2 not copying suffix if prefix" -Tag Integrati
180180

181181
$metadata = Import-Metadata TestDrive:\Source1\build.psd1
182182
$metadata += @{
183-
Prefix = ".\_GlobalScope.ps1"
184-
Suffix = ".\_GlobalScope.ps1"
183+
Prefix = "./_GlobalScope.ps1"
184+
Suffix = "./_GlobalScope.ps1"
185185
}
186186
$metadata | Export-Metadata TestDrive:\Source1\build.psd1
187187

@@ -193,11 +193,11 @@ Describe "Regression test for #40.2 not copying suffix if prefix" -Tag Integrati
193193
$Module = [IO.Path]::ChangeExtension($Output.Path, "psm1")
194194
$Code = Get-Content $Module
195195
$Code[0] | Should -be "using module ModuleBuilder" # because we moved it, from GetFinale
196-
$Code[1] | Should -be "#Region '.\_GlobalScope.ps1' 0"
196+
$Code[1] | Should -be "#Region './_GlobalScope.ps1' 0"
197197
$Code[2] | Should -be '$Global:Module = "Testing"'
198198

199199
$Code[-3] | Should -be '$Global:Module = "Testing"'
200-
$Code[-2] | Should -be "#EndRegion '.\_GlobalScope.ps1' 2"
200+
$Code[-2] | Should -be "#EndRegion './_GlobalScope.ps1' 2"
201201
$Code[-1] | Should -be ""
202202
}
203203
}

Tests/Private/ResolveOutputFolder.Tests.ps1

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -6,120 +6,120 @@ Describe "ResolveOutputFolder" {
66
$TestCases = [Hashtable[]]@(
77
@{ Source = "Source"
88
Output = "Output"
9-
Result = "Output\ModuleName"
10-
Forced = "Output\ModuleName\1.2.3"
9+
Result = "Output/ModuleName"
10+
Forced = "Output/ModuleName/1.2.3"
1111
}
12-
@{ Output = "ModuleName\Output"
13-
Source = "ModuleName\Source"
14-
Result = "ModuleName\Output\ModuleName"
15-
Forced = "ModuleName\Output\ModuleName\1.2.3"
12+
@{ Output = "ModuleName/Output"
13+
Source = "ModuleName/Source"
14+
Result = "ModuleName/Output/ModuleName"
15+
Forced = "ModuleName/Output/ModuleName/1.2.3"
1616
}
1717
@{ # Be like Jaykul
18-
Source = "ModuleName\Source"
18+
Source = "ModuleName/Source"
1919
Output = "ModuleName"
20-
Result = "ModuleName\1.2.3"
21-
Forced = "ModuleName\1.2.3"
20+
Result = "ModuleName/1.2.3"
21+
Forced = "ModuleName/1.2.3"
2222
}
2323
@{ # Be like azure
24-
Source = "1\s"
25-
Output = "1\b"
26-
Result = "1\b\ModuleName"
27-
Forced = "1\b\ModuleName\1.2.3"
24+
Source = "1/s"
25+
Output = "1/b"
26+
Result = "1/b/ModuleName"
27+
Forced = "1/b/ModuleName/1.2.3"
2828
}
2929
@{ # An edge case, build straight to a modules folder
30-
Source = "ModuleName\Source"
30+
Source = "ModuleName/Source"
3131
Output = "Modules"
32-
Result = "Modules\ModuleName"
33-
Forced = "Modules\ModuleName\1.2.3"
32+
Result = "Modules/ModuleName"
33+
Forced = "Modules/ModuleName/1.2.3"
3434
}
3535
@{ # What if they pass in the correct path ahead of time?
36-
Source = "1\s"
37-
Output = "1\b\ModuleName"
38-
Result = "1\b\ModuleName"
39-
Forced = "1\b\ModuleName\1.2.3"
36+
Source = "1/s"
37+
Output = "1/b/ModuleName"
38+
Result = "1/b/ModuleName"
39+
Forced = "1/b/ModuleName/1.2.3"
4040
}
4141
@{ # What if they pass in the correct path ahead of time?
42-
Source = "1\s"
43-
Output = "1\b\ModuleName\1.2.3"
44-
Result = "1\b\ModuleName\1.2.3"
45-
Forced = "1\b\ModuleName\1.2.3"
42+
Source = "1/s"
43+
Output = "1/b/ModuleName/1.2.3"
44+
Result = "1/b/ModuleName/1.2.3"
45+
Forced = "1/b/ModuleName/1.2.3"
4646
}
4747
@{ # Super edge case: what if they pass in an incorrectly versioned output path?
48-
Source = "1\s"
49-
Output = "1\b\ModuleName\4.5.6"
50-
Result = "1\b\ModuleName\4.5.6\ModuleName"
51-
Forced = "1\b\ModuleName\4.5.6\ModuleName\1.2.3"
48+
Source = "1/s"
49+
Output = "1/b/ModuleName/4.5.6"
50+
Result = "1/b/ModuleName/4.5.6/ModuleName"
51+
Forced = "1/b/ModuleName/4.5.6/ModuleName/1.2.3"
5252
}
5353
)
5454
Context "Build ModuleName" {
5555
It "From '<Source>' to '<Output>' creates '<Result>'" -TestCases $TestCases {
5656
param($Source, $Output, $Result)
5757

5858
$Parameters = @{
59-
Source = "TestDrive:\$Source"
60-
Output = "TestDrive:\$Output"
59+
Source = "TestDrive:/$Source"
60+
Output = "TestDrive:/$Output"
6161
}
6262

6363
$Actual = &$CommandInTest @Parameters -Name ModuleName -Target Build -Version 1.2.3 | ToTestDrive
6464
$Actual | Should -Exist
65-
$Actual | Should -Be "TestDrive:\$Result"
65+
$Actual | Should -Be "TestDrive:/$Result"
6666
}
6767

6868
It "From '<Source>' to '<Output>' -ForceVersion creates '<Forced>'" -TestCases $TestCases {
6969
param($Source, $Output, $Forced)
7070

7171
$Parameters = @{
72-
Source = "TestDrive:\$Source"
73-
Output = "TestDrive:\$Output"
72+
Source = "TestDrive:/$Source"
73+
Output = "TestDrive:/$Output"
7474
}
7575

7676
$Actual = &$CommandInTest @Parameters -Name ModuleName -Target Build -Version 1.2.3 -Force | ToTestDrive
7777
$Actual | Should -Exist
78-
$Actual | Should -Be "TestDrive:\$Forced"
78+
$Actual | Should -Be "TestDrive:/$Forced"
7979
}
8080
}
8181
Context "Cleaned ModuleName" {
8282
It "From '<Source>' to '<Output>' deletes '<Result>'" -TestCases $TestCases {
8383
param($Source, $Output, $Result)
8484

8585
$Parameters = @{
86-
Source = "TestDrive:\$Source"
87-
Output = "TestDrive:\$Output"
86+
Source = "TestDrive:/$Source"
87+
Output = "TestDrive:/$Output"
8888
}
8989

90-
$null = mkdir "TestDrive:\$Result" -Force
90+
$null = New-Item -ItemType Directory "TestDrive:/$Result" -Force
9191

9292
# There's no output when we're cleaning
9393
&$CommandInTest @Parameters -Name ModuleName -Version 1.2.3 -Target Clean | Should -BeNullOrEmpty
94-
"TestDrive:\$Result" | Should -Not -Exist
94+
"TestDrive:/$Result" | Should -Not -Exist
9595
# NOTE: This is only true because we made it above
96-
"TestDrive:\$Result" | Split-Path | Should -Exist
96+
"TestDrive:/$Result" | Split-Path | Should -Exist
9797
}
9898

9999
It "From '<Source>' to '<Output>' -ForceVersion deletes '<Forced>'" -TestCases $TestCases {
100100
param($Source, $Output, $Forced)
101101

102102
$Parameters = @{
103-
Source = "TestDrive:\$Source"
104-
Output = "TestDrive:\$Output"
103+
Source = "TestDrive:/$Source"
104+
Output = "TestDrive:/$Output"
105105
}
106-
$null = mkdir "TestDrive:\$Forced" -Force
106+
$null = New-Item -ItemType Directory "TestDrive:/$Forced" -Force
107107

108108
# There's no output when we're cleaning
109109
&$CommandInTest @Parameters -Name ModuleName -Version 1.2.3 -Force -Target Clean | Should -BeNullOrEmpty
110-
"TestDrive:\$Forced" | Should -Not -Exist
110+
"TestDrive:/$Forced" | Should -Not -Exist
111111
# NOTE: This is only true because we made it above
112-
"TestDrive:\$Forced" | Split-Path | Should -Exist
112+
"TestDrive:/$Forced" | Split-Path | Should -Exist
113113
}
114114
}
115115
Context "Error Cases" {
116116
It "Won't remove a file that blocks the folder path" {
117-
$null = mkdir TestDrive:\ModuleName\Source -force
118-
New-Item TestDrive:\ModuleName\1.2.3 -ItemType File -Value "Hello World"
117+
$null = New-Item -ItemType Directory TestDrive:/ModuleName/Source -force
118+
New-Item TestDrive:/ModuleName/1.2.3 -ItemType File -Value "Hello World"
119119

120120
$Parameters = @{
121-
Source = "TestDrive:\ModuleName\Source"
122-
Output = "TestDrive:\ModuleName\"
121+
Source = "TestDrive:/ModuleName/Source"
122+
Output = "TestDrive:/ModuleName/"
123123
}
124124

125125
{ &$CommandInTest @Parameters -Name ModuleName -Target Build -Version 1.2.3 -Force } | Should -throw "There is a file in the way"

0 commit comments

Comments
 (0)