Tests refactoring & fixes

alan-null · alan-null · commit a80b77c4eeca · 2025-02-03T23:06:13.000+01:00
diff --git a/Tests/Initialize-Parameters.ps1 b/Tests/Initialize-Parameters.ps1
@@ -0,0 +1,14 @@
+$configPath = Join-Path -Path $PSScriptRoot -ChildPath "..\config.json"
+
+if (Test-Path -Path $configPath) {
+    $config = Get-Content -Path $configPath | ConvertFrom-Json
+    $apiToken = $config.apiToken
+    $workspaceId = $config.workspaceId
+}
+else {
+    if ($env:TOGGL_API_TOKEN -eq $null) {
+        .\scripts\load-env.ps1
+    }
+    $apiToken = $env:TOGGL_API_TOKEN
+    $workspaceId = $env:TOGGL_WORKSPACE_ID
+}
diff --git a/Tests/Integration/Projects.Tests.ps1 b/Tests/Integration/Projects.Tests.ps1
@@ -5,12 +5,7 @@ Import-Module .\Toggl.API\Toggl.API.psm1 -Force
 
 Describe 'Toggl Projects Integration Tests' {
     BeforeAll {
-        $configPath = Join-Path -Path $PSScriptRoot -ChildPath "..\config.json"
-        $config = Get-Content -Path $configPath | ConvertFrom-Json
-
-        $apiToken = $config.apiToken
-        $workspaceId = $config.workspaceId
-
+        . "$PSScriptRoot\..\Initialize-Parameters.ps1"
         $projectName = "TestProjectToRemove"
         $projectId = $null
     }
@@ -45,7 +40,7 @@ Describe 'Toggl Projects Integration Tests' {
     }
 
     Context "Remove-TogglProject" {
-        It "should delete the project from the workspace" -Skip:($Script:projectId -eq $null) {
+        It "should delete the project from the workspace" {
             Remove-TogglProject `
                 -ApiToken $apiToken `
                 -WorkspaceId $workspaceId `
@@ -61,7 +56,7 @@ Describe 'Toggl Projects Integration Tests' {
                 -SortField "name" `
                 -SortOrder "asc" `
                 -OnlyTemplates $false
-            $projects | Where-Object { $_.id -eq $Script:projectId } | Should BeNullOrEmpty
+            $projects | Where-Object { $_.id -eq $Script:projectId } | Should -BeNullOrEmpty
         }
     }
 }
diff --git a/Tests/Integration/Reports.Detailed.Tests.ps1 b/Tests/Integration/Reports.Detailed.Tests.ps1
@@ -5,11 +5,7 @@ Import-Module .\Toggl.API\Toggl.API.psm1 -Force
 
 Describe 'Reports.Detailed Integration Tests' {
     BeforeAll {
-        $configPath = Join-Path -Path $PSScriptRoot -ChildPath "..\config.json"
-        $config = Get-Content -Path $configPath | ConvertFrom-Json
-
-        $apiToken = $config.apiToken
-        $workspaceId = $config.workspaceId
+        . "$PSScriptRoot\..\Initialize-Parameters.ps1"
 
         $startDate = "2023-01-01"
         $endDate = "2023-12-31"
@@ -61,6 +57,13 @@ Describe 'Reports.Detailed Integration Tests' {
                 -WorkspaceId $workspaceId `
                 -TimeEntryId $timeEntryId
         }
+
+        foreach ($tagId in $tagIds) {
+            Remove-TogglTag `
+                -ApiToken $apiToken `
+                -WorkspaceId $workspaceId `
+                -TagId $tagId
+        }
     }
 
     Context "Search-TogglTimeEntries" {
diff --git a/Tests/Integration/Tags.Tests.ps1 b/Tests/Integration/Tags.Tests.ps1
@@ -5,11 +5,7 @@ Import-Module .\Toggl.API\Toggl.API.psm1 -Force
 
 Describe 'Toggl Tag Integration Tests' {
     BeforeAll {
-        $configPath = Join-Path -Path $PSScriptRoot -ChildPath "..\config.json"
-        $config = Get-Content -Path $configPath | ConvertFrom-Json
-
-        $apiToken = $config.apiToken
-        $workspaceId = $config.workspaceId
+        . "$PSScriptRoot\..\Initialize-Parameters.ps1"
 
         $tagName = "TestTagToRemove"
     }
@@ -24,20 +20,20 @@ Describe 'Toggl Tag Integration Tests' {
     }
 
     Context "Get-TogglTags" {
-        It "should retrieve the list of tags for the workspace" -Skip:($Script:tagId -eq $null) {
+        It "should retrieve the list of tags for the workspace" {
             $tags = Get-TogglTags -ApiToken $apiToken -WorkspaceId $workspaceId
             $tags | Should -Not -BeNullOrEmpty
             $tags | Where-Object { $_.name -eq $tagName } | Should -Not -BeNullOrEmpty
         }
     }
 
     Context "Remove-TogglTag" {
-        It "should delete the tag from the workspace" -Skip:($Script:tagId -eq $null) {
+        It "should delete the tag from the workspace" {
             Remove-TogglTag -ApiToken $apiToken -WorkspaceId $workspaceId -TagId $Script:tagId
 
             # Verify the tag was deleted
             $tags = Get-TogglTags -ApiToken $apiToken -WorkspaceId $workspaceId
-            $tags | Where-Object { $_.id -eq $Script:tagId } | Should BeNullOrEmpty
+            $tags | Where-Object { $_.id -eq $Script:tagId } | Should -BeNullOrEmpty
         }
     }
 }
diff --git a/Tests/Integration/TimeEntries.Tests.ps1 b/Tests/Integration/TimeEntries.Tests.ps1
@@ -5,12 +5,7 @@ Import-Module .\Toggl.API\Toggl.API.psm1 -Force
 
 Describe 'TimeEntries Integration Tests' {
     BeforeAll {
-        $configPath = Join-Path -Path $PSScriptRoot -ChildPath "..\config.json"
-        $config = Get-Content -Path $configPath | ConvertFrom-Json
-
-        $apiToken = $config.apiToken
-        $workspaceId = $config.workspaceId
-
+        . "$PSScriptRoot\..\Initialize-Parameters.ps1"
         $timeEntryId = $null
     }
 
@@ -34,7 +29,7 @@ Describe 'TimeEntries Integration Tests' {
     }
 
     Context "Get-TogglTimeEntryById" {
-        It "should retrieve the created time entry by ID" -Skip:($Script:timeEntryId -eq $null) {
+        It "should retrieve the created time entry by ID" {
             $response = Get-TogglTimeEntryById `
                 -ApiToken $apiToken `
                 -TimeEntryId $Script:timeEntryId
@@ -55,7 +50,7 @@ Describe 'TimeEntries Integration Tests' {
     }
 
     Context "Update-TogglTimeEntry" {
-        It "should update the time entry" -Skip:($Script:timeEntryId -eq $null) {
+        It "should update the time entry" {
             $newDescription = "Updated Test Time Entry"
 
             $response = Update-TogglTimeEntry `
@@ -64,7 +59,7 @@ Describe 'TimeEntries Integration Tests' {
                 -TimeEntryId $Script:timeEntryId `
                 -Description $newDescription
 
-            $response | Should Not BeNullOrEmpty
+            $response | Should -Not -BeNullOrEmpty
             $response.description | Should -BeExactly $newDescription
         }
     }
@@ -85,7 +80,7 @@ Describe 'TimeEntries Integration Tests' {
     }
 
     Context "Remove-TogglTimeEntry" {
-        It "should delete the time entry" -Skip:($Script:timeEntryId -eq $null) {
+        It "should delete the time entry" {
             Remove-TogglTimeEntry `
                 -ApiToken $apiToken `
                 -WorkspaceId $workspaceId `

Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,7 @@ Import-Module .\Toggl.API\Toggl.API.psm1 -Force`
`5`	`5`
`6`	`6`	`Describe 'Toggl Projects Integration Tests' {`
`7`	`7`	`BeforeAll {`
`8`		`- $configPath = Join-Path -Path $PSScriptRoot -ChildPath "..\config.json"`
`9`		`- $config = Get-Content -Path $configPath \| ConvertFrom-Json`
`10`		`-`
`11`		`- $apiToken = $config.apiToken`
`12`		`- $workspaceId = $config.workspaceId`
`13`		`-`
	`8`	`+ . "$PSScriptRoot\..\Initialize-Parameters.ps1"`
`14`	`9`	`$projectName = "TestProjectToRemove"`
`15`	`10`	`$projectId = $null`
`16`	`11`	`}`
`@@ -45,7 +40,7 @@ Describe 'Toggl Projects Integration Tests' {`
`45`	`40`	`}`
`46`	`41`
`47`	`42`	`Context "Remove-TogglProject" {`
`48`		`- It "should delete the project from the workspace" -Skip:($Script:projectId -eq $null) {`
	`43`	`+ It "should delete the project from the workspace" {`
`49`	`44`	Remove-TogglProject `
`50`	`45`	-ApiToken $apiToken `
`51`	`46`	-WorkspaceId $workspaceId `
`@@ -61,7 +56,7 @@ Describe 'Toggl Projects Integration Tests' {`
`61`	`56`	-SortField "name" `
`62`	`57`	-SortOrder "asc" `
`63`	`58`	`-OnlyTemplates $false`
`64`		`- $projects \| Where-Object { $_.id -eq $Script:projectId } \| Should BeNullOrEmpty`
	`59`	`+ $projects \| Where-Object { $_.id -eq $Script:projectId } \| Should -BeNullOrEmpty`
`65`	`60`	`}`
`66`	`61`	`}`
`67`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,7 @@ Import-Module .\Toggl.API\Toggl.API.psm1 -Force`
`5`	`5`
`6`	`6`	`Describe 'Toggl Tag Integration Tests' {`
`7`	`7`	`BeforeAll {`
`8`		`- $configPath = Join-Path -Path $PSScriptRoot -ChildPath "..\config.json"`
`9`		`- $config = Get-Content -Path $configPath \| ConvertFrom-Json`
`10`		`-`
`11`		`- $apiToken = $config.apiToken`
`12`		`- $workspaceId = $config.workspaceId`
	`8`	`+ . "$PSScriptRoot\..\Initialize-Parameters.ps1"`
`13`	`9`
`14`	`10`	`$tagName = "TestTagToRemove"`
`15`	`11`	`}`
`@@ -24,20 +20,20 @@ Describe 'Toggl Tag Integration Tests' {`
`24`	`20`	`}`
`25`	`21`
`26`	`22`	`Context "Get-TogglTags" {`
`27`		`- It "should retrieve the list of tags for the workspace" -Skip:($Script:tagId -eq $null) {`
	`23`	`+ It "should retrieve the list of tags for the workspace" {`
`28`	`24`	`$tags = Get-TogglTags -ApiToken $apiToken -WorkspaceId $workspaceId`
`29`	`25`	`$tags \| Should -Not -BeNullOrEmpty`
`30`	`26`	`$tags \| Where-Object { $_.name -eq $tagName } \| Should -Not -BeNullOrEmpty`
`31`	`27`	`}`
`32`	`28`	`}`
`33`	`29`
`34`	`30`	`Context "Remove-TogglTag" {`
`35`		`- It "should delete the tag from the workspace" -Skip:($Script:tagId -eq $null) {`
	`31`	`+ It "should delete the tag from the workspace" {`
`36`	`32`	`Remove-TogglTag -ApiToken $apiToken -WorkspaceId $workspaceId -TagId $Script:tagId`
`37`	`33`
`38`	`34`	`# Verify the tag was deleted`
`39`	`35`	`$tags = Get-TogglTags -ApiToken $apiToken -WorkspaceId $workspaceId`
`40`		`- $tags \| Where-Object { $_.id -eq $Script:tagId } \| Should BeNullOrEmpty`
	`36`	`+ $tags \| Where-Object { $_.id -eq $Script:tagId } \| Should -BeNullOrEmpty`
`41`	`37`	`}`
`42`	`38`	`}`
`43`	`39`	`}`