fix:improve tests

dsoftwareinc · Feb 6, 2024 · 49c4b1b · 49c4b1b
1 parent ba0aca8
commit 49c4b1b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/test/kotlin/com/dsoftware/ghmanager/GitHubActionsManagerBaseTest.kt b/src/test/kotlin/com/dsoftware/ghmanager/GitHubActionsManagerBaseTest.kt
@@ -10,6 +10,7 @@ import com.intellij.testFramework.fixtures.BasePlatformTestCase
 import com.intellij.testFramework.registerServiceInstance
 import com.intellij.toolWindow.ToolWindowHeadlessManagerImpl
 import com.intellij.util.concurrency.annotations.RequiresEdt
+import io.mockk.Matcher
 import io.mockk.every
 import io.mockk.mockk
 import kotlinx.coroutines.flow.MutableStateFlow

diff --git a/src/test/kotlin/com/dsoftware/ghmanager/TestWindowTabController.kt b/src/test/kotlin/com/dsoftware/ghmanager/TestWindowTabController.kt
@@ -79,17 +79,23 @@ class TestWindowTabController : GitHubActionsManagerBaseTest() {
         })
         val workflowTypesResponse = WorkflowTypes(workflowTypes.size, workflowTypes.toList())
         executorMock.apply {
-            every {
-                execute(any(), any<GithubApiRequest<WorkflowRuns>>())
+            every {// workflow runs
+                execute(any(), match<GithubApiRequest<WorkflowRuns>> { it.url.contains("/actions/runs") })
             } returns WorkflowRuns(workflowRunsList.size, workflowRunsList.toList())
             every {// collaborators
-                execute(any(), any<GithubApiRequest<GithubResponsePage<GithubUserWithPermissions>>>())
+                execute(
+                    any(),
+                    match<GithubApiRequest<GithubResponsePage<GithubUserWithPermissions>>> { it.url.contains("/collaborators") }
+                )
             } returns collaboratorsResponse
             every { // branches
-                execute(any(), any<GithubApiRequest<GithubResponsePage<GithubBranch>>>())
+                execute(
+                    any(),
+                    match<GithubApiRequest<GithubResponsePage<GithubBranch>>> { it.url.contains("/branches") }
+                )
             } returns branchesResponse
-            every { // branches
-                execute(any(), any<GithubApiRequest<WorkflowTypes>>())
+            every { // workflow types
+                execute(any(), match<GithubApiRequest<WorkflowTypes>> { it.url.contains("/actions/workflows") })
             } returns workflowTypesResponse
         }