Skip to content

Commit 15c2bea

Browse files
mdekreymdekrey
committed
Combine mock setups
1 parent 0dea69f commit 15c2bea

File tree

4 files changed

+42
-55
lines changed

4 files changed

+42
-55
lines changed

‎git-release.tests.ps1‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ Describe 'git-release' {
3737
'integrate/FOO-125_XYZ-1' = @("feature/FOO-124_FOO-125","feature/XYZ-1-services")
3838
'main' = @()
3939
} -initialCommits $initialCommits
40-
Initialize-LocalActionAssertUpdatedSuccess 'rc/2022-07-14' 'main' -initialCommits $initialCommits
41-
Initialize-LocalActionAssertUpdatedSuccess 'rc/2022-07-14' 'feature/XYZ-1-services' -initialCommits $initialCommits
42-
Initialize-LocalActionAssertUpdatedSuccess 'rc/2022-07-14' 'feature/FOO-123' -initialCommits $initialCommits
40+
Initialize-LocalActionAssertUpdated 'rc/2022-07-14' 'main' -initialCommits $initialCommits
41+
Initialize-LocalActionAssertUpdated 'rc/2022-07-14' 'feature/XYZ-1-services' -initialCommits $initialCommits
42+
Initialize-LocalActionAssertUpdated 'rc/2022-07-14' 'feature/FOO-123' -initialCommits $initialCommits
4343
Initialize-LocalActionSimplifyUpstreamBranchesSuccess `
4444
-from @("feature/FOO-124_FOO-125", "main") `
4545
-to @("feature/FOO-124_FOO-125")
@@ -72,9 +72,9 @@ Describe 'git-release' {
7272
'integrate/FOO-125_XYZ-1' = @("feature/FOO-124_FOO-125","feature/XYZ-1-services")
7373
'main' = @()
7474
} -initialCommits $initialCommits
75-
Initialize-LocalActionAssertUpdatedSuccess 'rc/2022-07-14' 'main' -initialCommits $initialCommits
76-
Initialize-LocalActionAssertUpdatedFailure 'rc/2022-07-14' 'feature/XYZ-1-services' -initialCommits $initialCommits
77-
Initialize-LocalActionAssertUpdatedFailure 'rc/2022-07-14' 'feature/FOO-123' -initialCommits $initialCommits
75+
Initialize-LocalActionAssertUpdated 'rc/2022-07-14' 'main' -initialCommits $initialCommits
76+
Initialize-LocalActionAssertUpdated -withChanges 'rc/2022-07-14' 'feature/XYZ-1-services' -initialCommits $initialCommits
77+
Initialize-LocalActionAssertUpdated -withChanges 'rc/2022-07-14' 'feature/FOO-123' -initialCommits $initialCommits
7878

7979
{ & $PSScriptRoot/git-release.ps1 rc/2022-07-14 main } | Should -Throw
8080
$fw.assertDiagnosticOutput.Count | Should -Be 2
@@ -93,9 +93,9 @@ Describe 'git-release' {
9393
'integrate/FOO-125_XYZ-1' = @("feature/FOO-124_FOO-125","feature/XYZ-1-services")
9494
'main' = @()
9595
} -initialCommits $initialCommits
96-
Initialize-LocalActionAssertUpdatedFailure 'rc/2022-07-14' 'main' -initialCommits $initialCommits
97-
Initialize-LocalActionAssertUpdatedFailure 'rc/2022-07-14' 'feature/XYZ-1-services' -initialCommits $initialCommits
98-
Initialize-LocalActionAssertUpdatedFailure 'rc/2022-07-14' 'feature/FOO-123' -initialCommits $initialCommits
96+
Initialize-LocalActionAssertUpdated -withChanges 'rc/2022-07-14' 'main' -initialCommits $initialCommits
97+
Initialize-LocalActionAssertUpdated -withChanges 'rc/2022-07-14' 'feature/XYZ-1-services' -initialCommits $initialCommits
98+
Initialize-LocalActionAssertUpdated -withChanges 'rc/2022-07-14' 'feature/FOO-123' -initialCommits $initialCommits
9999
Initialize-LocalActionSimplifyUpstreamBranchesSuccess `
100100
-from @("feature/FOO-124_FOO-125", "main") `
101101
-to @("feature/FOO-124_FOO-125")
@@ -128,9 +128,9 @@ Describe 'git-release' {
128128
'integrate/FOO-125_XYZ-1' = @("feature/FOO-124_FOO-125","feature/XYZ-1-services")
129129
'main' = @()
130130
} -initialCommits $initialCommits
131-
Initialize-LocalActionAssertUpdatedSuccess 'rc/2022-07-14' 'main' -initialCommits $initialCommits
132-
Initialize-LocalActionAssertUpdatedSuccess 'rc/2022-07-14' 'feature/XYZ-1-services' -initialCommits $initialCommits
133-
Initialize-LocalActionAssertUpdatedSuccess 'rc/2022-07-14' 'feature/FOO-123' -initialCommits $initialCommits
131+
Initialize-LocalActionAssertUpdated 'rc/2022-07-14' 'main' -initialCommits $initialCommits
132+
Initialize-LocalActionAssertUpdated 'rc/2022-07-14' 'feature/XYZ-1-services' -initialCommits $initialCommits
133+
Initialize-LocalActionAssertUpdated 'rc/2022-07-14' 'feature/FOO-123' -initialCommits $initialCommits
134134
Initialize-LocalActionSimplifyUpstreamBranchesSuccess `
135135
-from @("feature/FOO-124_FOO-125", "main") `
136136
-to @("feature/FOO-124_FOO-125")
@@ -160,12 +160,12 @@ Describe 'git-release' {
160160
'main' = {}
161161
'rc/2022-07-14' = @("feature/FOO-123", "integrate/FOO-125_XYZ-1")
162162
} -initialCommits $initialCommits
163-
Initialize-LocalActionAssertUpdatedSuccess 'rc/2022-07-14' 'main' -initialCommits $initialCommits
164-
Initialize-LocalActionAssertUpdatedSuccess 'rc/2022-07-14' 'feature/FOO-124-comment' -initialCommits $initialCommits
165-
Initialize-LocalActionAssertUpdatedSuccess 'rc/2022-07-14' 'feature/XYZ-1-services' -initialCommits $initialCommits
166-
Initialize-LocalActionAssertUpdatedSuccess 'rc/2022-07-14' 'feature/FOO-124_FOO-125' -initialCommits $initialCommits
167-
Initialize-LocalActionAssertUpdatedSuccess 'rc/2022-07-14' 'integrate/FOO-125_XYZ-1' -initialCommits $initialCommits
168-
Initialize-LocalActionAssertUpdatedSuccess 'rc/2022-07-14' 'feature/FOO-123' -initialCommits $initialCommits
163+
Initialize-LocalActionAssertUpdated 'rc/2022-07-14' 'main' -initialCommits $initialCommits
164+
Initialize-LocalActionAssertUpdated 'rc/2022-07-14' 'feature/FOO-124-comment' -initialCommits $initialCommits
165+
Initialize-LocalActionAssertUpdated 'rc/2022-07-14' 'feature/XYZ-1-services' -initialCommits $initialCommits
166+
Initialize-LocalActionAssertUpdated 'rc/2022-07-14' 'feature/FOO-124_FOO-125' -initialCommits $initialCommits
167+
Initialize-LocalActionAssertUpdated 'rc/2022-07-14' 'integrate/FOO-125_XYZ-1' -initialCommits $initialCommits
168+
Initialize-LocalActionAssertUpdated 'rc/2022-07-14' 'feature/FOO-123' -initialCommits $initialCommits
169169
Initialize-LocalActionSetUpstream @{
170170
'feature/FOO-123' = $null
171171
'integrate/FOO-125_XYZ-1' = $null
@@ -200,10 +200,10 @@ Describe 'git-release' {
200200
'main' = {}
201201
'rc/2022-07-14' = @("feature/FOO-123", "integrate/FOO-125_XYZ-1")
202202
} -initialCommits $initialCommits
203-
Initialize-LocalActionAssertUpdatedSuccess 'rc/2022-07-14' 'main' -initialCommits $initialCommits
204-
Initialize-LocalActionAssertUpdatedSuccess 'rc/2022-07-14' 'feature/FOO-124-comment' -initialCommits $initialCommits
205-
Initialize-LocalActionAssertUpdatedSuccess 'rc/2022-07-14' 'feature/XYZ-1-services' -initialCommits $initialCommits
206-
Initialize-LocalActionAssertUpdatedSuccess 'rc/2022-07-14' 'feature/FOO-123' -initialCommits $initialCommits
203+
Initialize-LocalActionAssertUpdated 'rc/2022-07-14' 'main' -initialCommits $initialCommits
204+
Initialize-LocalActionAssertUpdated 'rc/2022-07-14' 'feature/FOO-124-comment' -initialCommits $initialCommits
205+
Initialize-LocalActionAssertUpdated 'rc/2022-07-14' 'feature/XYZ-1-services' -initialCommits $initialCommits
206+
Initialize-LocalActionAssertUpdated 'rc/2022-07-14' 'feature/FOO-123' -initialCommits $initialCommits
207207
Initialize-LocalActionSimplifyUpstreamBranchesSuccess `
208208
-from @("feature/FOO-124_FOO-125", "main") `
209209
-to @("feature/FOO-124_FOO-125")
@@ -242,7 +242,7 @@ Describe 'git-release' {
242242
'main' = {}
243243
'rc/2022-07-14' = @("feature/XYZ-1-services")
244244
} -initialCommits $initialCommits
245-
Initialize-LocalActionAssertUpdatedSuccess 'feature/FOO-123' 'main' -initialCommits $initialCommits
245+
Initialize-LocalActionAssertUpdated 'feature/FOO-123' 'main' -initialCommits $initialCommits
246246
Initialize-LocalActionSetUpstream @{
247247
'feature/FOO-123' = $null
248248
} -commitMessage 'Release feature/FOO-123 to main' -commitish 'new-commit'
@@ -257,7 +257,7 @@ Describe 'git-release' {
257257
}
258258

259259
It 'aborts if not a fast-forward' {
260-
Initialize-LocalActionAssertUpdatedFailure 'rc/2022-07-14' 'main'
260+
Initialize-LocalActionAssertUpdated -withChanges 'rc/2022-07-14' 'main'
261261

262262
{ & $PSScriptRoot/git-release.ps1 rc/2022-07-14 main } | Should -Throw
263263
$fw.assertDiagnosticOutput | Should -Be 'ERR: The branch main has changes that are not in rc/2022-07-14'
@@ -274,8 +274,8 @@ Describe 'git-release' {
274274
'main' = {}
275275
'rc/2022-07-14' = @("feature/XYZ-1-services")
276276
} -initialCommits $initialCommits
277-
Initialize-LocalActionAssertUpdatedSuccess 'main' 'rc/2022-07-14' -initialCommits $initialCommits
278-
Initialize-LocalActionAssertUpdatedSuccess 'main' 'feature/XYZ-1-services' -initialCommits $initialCommits
277+
Initialize-LocalActionAssertUpdated 'main' 'rc/2022-07-14' -initialCommits $initialCommits
278+
Initialize-LocalActionAssertUpdated 'main' 'feature/XYZ-1-services' -initialCommits $initialCommits
279279
Initialize-LocalActionSetUpstream @{
280280
'integrate/FOO-125_XYZ-1' = @("feature/FOO-124_FOO-125")
281281
'rc/2022-07-14' = $null
@@ -294,7 +294,7 @@ Describe 'git-release' {
294294
}
295295

296296
It 'aborts clean up if not already released' {
297-
Initialize-LocalActionAssertUpdatedFailure 'main' 'rc/2022-07-14'
297+
Initialize-LocalActionAssertUpdated -withChanges 'main' 'rc/2022-07-14'
298298

299299
{ & $PSScriptRoot/git-release.ps1 rc/2022-07-14 main -cleanupOnly } | Should -Throw
300300
$fw.assertDiagnosticOutput | Should -Be 'ERR: The branch rc/2022-07-14 has changes that are not in main'

‎utils/actions.mocks.psm1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Import-Module -Scope Local "$PSScriptRoot/actions/local/Register-LocalActionAsse
55
Export-ModuleMember -Function Initialize-LocalActionAssertPushedNotTracked, Initialize-LocalActionAssertPushedSuccess, Initialize-LocalActionAssertPushedAhead
66

77
Import-Module -Scope Local "$PSScriptRoot/actions/local/Register-LocalActionAssertUpdated.mocks.psm1"
8-
Export-ModuleMember -Function Initialize-LocalActionAssertUpdatedSuccess, Initialize-LocalActionAssertUpdatedFailure
8+
Export-ModuleMember -Function Initialize-LocalActionAssertUpdated
99

1010
Import-Module -Scope Local "$PSScriptRoot/actions/local/Register-LocalActionGetAllUpstreams.mocks.psm1"
1111
Export-ModuleMember -Function Initialize-AllUpstreamBranches

‎utils/actions/local/Register-LocalActionAssertUpdated.mocks.psm1‎

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,11 @@ function Get-CommitsWithRemote(
1111
return $initialCommits.Keys | ConvertTo-HashMap -getKey { Get-RemoteBranchRef $_ } -getValue { $initialCommits[$_] }
1212
}
1313

14-
function Initialize-LocalActionAssertUpdatedSuccess(
15-
[Parameter()][string] $downstream,
16-
[Parameter()][string] $upstream,
17-
[Parameter()][Hashtable] $initialCommits = @{}
18-
) {
19-
$resultCommit = $initialCommits[$downstream] ?? 'result-commitish'
20-
$downstream = Get-RemoteBranchRef $downstream
21-
$upstream = Get-RemoteBranchRef $upstream
22-
23-
Initialize-MergeTogether `
24-
-allBranches @($upstream) `
25-
-successfulBranches @() `
26-
-noChangeBranches @($upstream) `
27-
-initialCommits (Get-CommitsWithRemote $initialCommits) `
28-
-source $downstream `
29-
-messageTemplate 'Verification Only' `
30-
-resultCommitish $resultCommit
31-
}
32-
33-
function Initialize-LocalActionAssertUpdatedFailure(
14+
function Initialize-LocalActionAssertUpdated(
3415
[Parameter()][string] $downstream,
3516
[Parameter()][string] $upstream,
3617
[Parameter()][Hashtable] $initialCommits = @{},
18+
[switch] $withChanges,
3719
[switch] $withConflict
3820
) {
3921
$resultCommit = $initialCommits[$downstream] ?? 'result-commitish'
@@ -42,7 +24,6 @@ function Initialize-LocalActionAssertUpdatedFailure(
4224

4325
$base = @{
4426
allBranches = @($upstream)
45-
noChangeBranches = @()
4627
initialCommits = (Get-CommitsWithRemote $initialCommits)
4728
source = $downstream
4829
messageTemplate = 'Verification Only'
@@ -51,11 +32,17 @@ function Initialize-LocalActionAssertUpdatedFailure(
5132

5233
if ($withConflict) {
5334
Initialize-MergeTogether @base `
54-
-successfulBranches @()
35+
-successfulBranches @() `
36+
-noChangeBranches @()
37+
} elseif ($withChanges) {
38+
Initialize-MergeTogether @base `
39+
-successfulBranches @($upstream) `
40+
-noChangeBranches @()
5541
} else {
5642
Initialize-MergeTogether @base `
57-
-successfulBranches @($upstream)
43+
-successfulBranches @() `
44+
-noChangeBranches @($upstream)
5845
}
5946
}
6047

61-
Export-ModuleMember -Function Initialize-LocalActionAssertUpdatedSuccess, Initialize-LocalActionAssertUpdatedFailure
48+
Export-ModuleMember -Function Initialize-LocalActionAssertUpdated

‎utils/actions/local/Register-LocalActionAssertUpdated.tests.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Describe 'local action "assert-updated"' {
2525
}
2626

2727
It 'handles successful cases' {
28-
Initialize-LocalActionAssertUpdatedSuccess -downstream 'rc/next' -upstream 'main'
28+
Initialize-LocalActionAssertUpdated -downstream 'rc/next' -upstream 'main'
2929

3030
Invoke-LocalAction $standardScript -diagnostics $fw.diagnostics
3131

@@ -34,7 +34,7 @@ Describe 'local action "assert-updated"' {
3434
}
3535

3636
It 'reports an error for conflicts' {
37-
Initialize-LocalActionAssertUpdatedFailure -downstream 'rc/next' -upstream 'main' -withConflict
37+
Initialize-LocalActionAssertUpdated -downstream 'rc/next' -upstream 'main' -withConflict
3838

3939
Invoke-LocalAction $standardScript -diagnostics $fw.diagnostics
4040

@@ -43,7 +43,7 @@ Describe 'local action "assert-updated"' {
4343
}
4444

4545
It 'reports an error if there are changes' {
46-
Initialize-LocalActionAssertUpdatedFailure -downstream 'rc/next' -upstream 'main'
46+
Initialize-LocalActionAssertUpdated -downstream 'rc/next' -upstream 'main' -withChanges
4747

4848
Invoke-LocalAction $standardScript -diagnostics $fw.diagnostics
4949

0 commit comments

Comments
 (0)