Skip to content

Commit c89a57d

Browse files
authored
Merge pull request #199 from rulasg/resolve-project-environment
feat(Resolve-ProjectParameters): Remove sticky project environment setting
2 parents 1e74acc + 5aafd9d commit c89a57d

34 files changed

Lines changed: 210 additions & 201 deletions

Test/private/MockCall_Project700.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ function Get-Mock_Project_700 {
170170
$project.searchInTitle = @{}
171171
$project.searchInTitle.titleFilter = "development"
172172
$project.searchInTitle.Titles = $pActual.items.nodes.content.title | Where-Object { $_ -like "*development*" }
173-
$project.searchInTitle.attributesDefault = @("Title", "id")
173+
$project.searchInTitle.attributesDefault = @("Title", "id" , "RepositoryName")
174174
$project.searchInTitle.attributes = @("Title", "id", "url", "Status", "field-text")
175175

176176
# SearchIn FieldName

Test/public/integrations/sync-ProjectItemsBetweenProjects.test.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function Test_UpdateProjectItemsBetweenProjects{
2222

2323
Assert-IsNull -Object $result
2424

25-
$staged = Get-ProjectItemStaged -Owner $owner -ProjectNumber $destinationProjectNumber
25+
$staged = Get-ProjectItemStaged -Owner $destinationOwner -ProjectNumber $destinationProjectNumber
2626

2727
$p = $p626.syncBtwPrj_625
2828

Test/public/interactive_test/getproject.test.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ function Test_Get_Project_ItemId_Equal_Case_Sensitive {
99
$item1 = "PVTI_lADOAlIw4c4BCe3Vzgec8pU"
1010
$item2 = "PVTI_lADOAlIw4c4BCe3Vzgec8pu"
1111

12+
Set-ProjectHelperEnvironment -Owner $owner -ProjectNumber $projectNumber
13+
1214
# Act
13-
$result = Get-Project -owner $owner -ProjectNumber $ProjectNumber
15+
$result = Get-Project
1416
Assert-Count -Expected $p.items.totalCount -Presented $result.items.keys
1517

1618
$result1 = Get-ProjectItem -ItemId $item1

Test/public/issues/Add-IssuePullRequestComment.test.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function Test_AddComment_SUCCESS_Using_Cache{
2222

2323
function Test_AddComment_SUCCESS_Using_Direct{
2424

25-
$p = Get-Mock_Project_700
25+
$p = Get-Mock_Project_700
2626
$i = $p.Issue
2727
$id = $i.id
2828
$contentId = $i.contentId

Test/public/issues/Get-ProjectIssue.test.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
function Test_GetProjectIssue{
22

3-
$p = Get-Mock_Project_700 ; $Owner = $p.owner ; $projectNumber = $p.number
3+
$p = Get-Mock_Project_700
44
$i = $p.issue
55

66
MockCallJson -Command "Invoke-GetIssueOrPullRequest -Url $($i.url)" -FileName "invoke-GetIssueOrPullRequest-26.json"
77

88
# Act
9-
$result = Get-ProjectIssue -Url $i.url
9+
$result = Get-ProjectIssue -Url $i.url
1010

1111
Assert-AreEqual -Expected $i.contentId -Presented $result.id
1212
Assert-AreEqual -Expected $i.title -Presented $result.title

Test/public/issues/Remove-ProjectIssue.test.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function Test_RemoveProjectIssue_SUCCESS {
99
MockCallJson -Command "Invoke-GetIssueOrPullRequest -Url $($i.url)" -fileName $i.getIssueOrPullRequestMockFile
1010
MockCallJson -Command "Invoke-AddItemToProject -ProjectId $($p.id) -ContentId $($i.id)" -fileName $i.addIssueToOProjectMockFile
1111
$itemId = Add-ProjectItem -owner $owner -projectNumber $projectNumber -Url $i.url
12-
$item = Get-ProjectItem -Id $itemId
12+
$item = Get-ProjectItem -Id $itemId -owner $owner -projectNumber $projectNumber
1313
Assert-AreEqual -expected $i.id -Presented $item.contentId
1414

1515
MockCallJson -Command "Invoke-RemoveItemFromProject -ProjectId $($p.id) -ItemId $($i.itemId)" -fileName $i.removeIssueFromProjectMockFile
@@ -19,11 +19,11 @@ function Test_RemoveProjectIssue_SUCCESS {
1919

2020
# Assert
2121
Assert-AreEqual -Expected $i.url -Presented $result
22-
Assert-IsFalse -Condition $(Test-ProjectItem -Url $i.url)
22+
Assert-IsFalse -Condition $(Test-ProjectItem -Url $i.url -Owner $owner -ProjectNumber $projectNumber)
2323

24-
# Remove issue assocaited
24+
# Remove issue associated
2525
$itemId = Add-ProjectItem -owner $owner -projectNumber $projectNumber -Url $i.url
26-
Assert-IsTrue -Condition $(Test-ProjectItem -Url $i.url)
26+
Assert-IsTrue -Condition $(Test-ProjectItem -Url $i.url -Owner $owner -ProjectNumber $projectNumber)
2727
MockCallJson -Command "Invoke-RemoveIssue -IssueId $($i.id)" -FileName "invoke-removeissue-any.json"
2828

2929
# Act

Test/public/items/project_item_draftissue.test.ps1

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ function Test_NewProjectDraftIssue {
1111
# Act
1212
$draftIssueId = New-ProjectDraftIssueDirect -Owner $owner -ProjectNumber $projectNumber -Title $title -Body $body
1313

14-
15-
$item = Get-ProjectItem -ItemId $draftIssueId
16-
1714
# Assert
15+
$item = Get-ProjectItem -ItemId $draftIssueId -Owner $owner -ProjectNumber $projectNumber
1816
Assert-AreEqual -Expected $draftIssueId -Presented $item.id
1917
Assert-AreEqual -Expected $title -Presented $item.Title
2018
Assert-AreEqual -Expected $body -Presented $item.Body

Test/public/items/use_order.test.ps1

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,34 @@ function Test_UserOrder_Success{
1212

1313
}
1414

15-
function Test_UserOrder_Success_GetItem{
15+
function Test_UserOrder_Success_GetItem_FAIL_NO_ENVIRONMENT{
1616
MockCall_GetProject_700
1717

1818
$p = Get-Mock_Project_700 ; $owner = $p.owner ; $projectNumber = $p.number
1919

20+
# We need to have the environment set to get item details in PassThru
2021
$list = Search-ProjectItem -Owner $owner -ProjectNumber $projectNumber -IncludeDone
2122

23+
# Act
24+
$hasthorwn = $false
25+
try {
26+
$list | Use-Order 1
27+
} catch {
28+
$hasthorwn = $true
29+
Assert-IsTrue -Condition $_.Exception.Message.StartsWith("ProjectEnvironment is required.")
30+
}
31+
Assert-IsTrue -Condition $hasthorwn
32+
}
33+
34+
function Test_UserOrder_Success_GetItem{
35+
MockCall_GetProject_700
36+
37+
$p = Get-Mock_Project_700 ; $owner = $p.owner ; $projectNumber = $p.number
38+
39+
# We need to have the environment set to get item details in PassThru
40+
Set-ProjectHelperEnvironment -Owner $owner -ProjectNumber $projectNumber
41+
$list = Search-ProjectItem -IncludeDone
42+
2243
# Act
2344
$result = $list | Use-Order 1 -PassThru
2445

@@ -33,7 +54,9 @@ function Test_UserOrder_Success_OpenBrowser{
3354

3455
MockCallToNull -command "Invoke-ProjectHelperOpenUrl -Url $url"
3556

36-
$list = Search-ProjectItem -Owner $owner -ProjectNumber $projectNumber -IncludeDone
57+
# We need to have the environment set to get item details in PassThru
58+
Set-ProjectHelperEnvironment -Owner $owner -ProjectNumber $projectNumber
59+
$list = Search-ProjectItem -IncludeDone
3760

3861
# Act
3962
$result = $list | Use-Order $order -OpenInBrowser
@@ -48,7 +71,9 @@ function Test_UserOrder_Success_Passthru{
4871
$p = Get-Mock_Project_700 ; $owner = $p.owner ; $projectNumber = $p.number
4972
$order = $p.issue.order ; $id = $p.issue.id
5073

51-
$list = Search-ProjectItem -Owner $owner -ProjectNumber $projectNumber -IncludeDone
74+
# We need to have the environment set to get item details in PassThru
75+
Set-ProjectHelperEnvironment -Owner $owner -ProjectNumber $projectNumber
76+
$list = Search-ProjectItem -IncludeDone
5277

5378
# Act
5479
$result = $list | Use-Order $order -PassThru

Test/public/project_item.searchprojectitem.test.ps1

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,22 @@ function Test_SearchProjectItem_Basic_SUCCESS {
77
$p = Get-Mock_Project_700
88
$Owner = $p.owner
99
$ProjectNumber = $p.number
10-
$filter = $p.searchInTitle.titleFilter
11-
$expected = $p.searchInTitle.Titles.Count
10+
$s = $p.searchInTitle
11+
$filter = $s.titleFilter
12+
$expected = $s.Titles.Count
13+
$defautlAttrs = $s.attributesDefault
1214

1315
$result = Search-ProjectItem -Owner $Owner -ProjectNumber $ProjectNumber -Filter $filter
1416
Assert-Count -Expected $expected -Presented $result
1517

16-
# Default attributes should be id + Title
18+
# Default attributes should be id + Title + RepositoryName
1719
foreach($r in $result){
1820
$props = $r.PSObject.Properties.Name
19-
Assert-Count -Expected 2 -Presented $props
20-
Assert-Contains -Expected "id" -Presented $props
21-
Assert-Contains -Expected "Title" -Presented $props
21+
22+
Assert-Count -Expected $defautlAttrs.Count -Presented $props
23+
$defautlAttrs | ForEach-Object -Process {
24+
Assert-Contains -Expected $_ -Presented $props
25+
}
2226
}
2327
}
2428

Test/public/project_item.test.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ function Test_TestProjectItem_Success{
192192

193193
# Not found
194194

195-
$result = Test-ProjectItem -Url "https://github.com/octodemo/Project-700/issues/999"
195+
$result = Test-ProjectItem -Url "https://github.com/octodemo/Project-700/issues/999" -Owner $owner -ProjectNumber $projectNumber
196196
Assert-IsFalse -Condition $result
197197

198198
}

0 commit comments

Comments
 (0)