fix e2e test

kiegroup · Oct 4, 2023 · 2932ab6 · 2932ab6
1 parent d060b00
commit 2932ab6
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 11 deletions.
diff --git a/test/e2e/cross-pr/cross-pr.test.ts b/test/e2e/cross-pr/cross-pr.test.ts
@@ -158,13 +158,22 @@ test("PR from owner1/target:branchA to owner2/target:branchB while using mapping
       mockApi: [
         moctokit.rest.repos
           .get({
-            owner: "owner1",
-            repo: /project(1|2|4)/,
+            owner: "owner2",
+            repo: /project(1|2)/,
           })
           .setResponse({
             status: 404,
             data: {},
-            repeat: 3
+            repeat: 2
+          }),
+          moctokit.rest.repos
+          .get({
+            owner: "owner2",
+            repo: "project4"
+          })
+          .setResponse({
+            status: 200,
+            data: {},
           }),
         moctokit.rest.repos
           .listForks({
@@ -184,7 +193,7 @@ test("PR from owner1/target:branchA to owner2/target:branchB while using mapping
           }),
         moctokit.rest.repos
           .get({
-            owner: "owner1",
+            owner: "owner2",
             repo: "project3",
           })
           .setResponse({

diff --git a/test/e2e/full-downstream/full-downstream.test.ts b/test/e2e/full-downstream/full-downstream.test.ts
@@ -187,13 +187,22 @@ test("PR from owner1/target:branchA to owner2/target:branchB while using mapping
       mockApi: [
         moctokit.rest.repos
           .get({
-            owner: "owner1",
-            repo: /project(1|2|3|4)/,
+            owner: "owner2",
+            repo: "project2",
           })
           .setResponse({
             status: 404,
             data: {},
-            repeat: 4
+          }),
+          moctokit.rest.repos
+          .get({
+            owner: "owner2",
+            repo: /project(1|3|4)/,
+          })
+          .setResponse({
+            status: 200,
+            data: {},
+            repeat: 3
           }),
         moctokit.rest.repos
           .listForks({
@@ -313,7 +322,7 @@ test("PR from owner1/target:branchA to owner2/target:branchB while using mapping
   );
   expect(group4.output).toEqual(
     expect.stringContaining(
-      "Merged owner1/project4:branchA into branch 8.x"
+      "Merged owner2/project4:branchA into branch 8.x"
     )
   );
 

diff --git a/test/e2e/single-pr/single-pr.test.ts b/test/e2e/single-pr/single-pr.test.ts
@@ -262,15 +262,15 @@ test("PR from owner2/target:branchA to owner1/target:branchB", async () => {
       mockApi: [
         moctokit.rest.repos
           .get({
-            owner: "owner1",
+            owner: "owner2",
             repo: "project3",
           })
           .setResponse({
             status: 200,
             data: {
               name: "project3",
               owner: {
-                login: "owner1",
+                login: "owner2",
               },
             },
           }),
@@ -391,7 +391,7 @@ test("PR from owner2/target:branchA to owner1/target-different-name:branchB", as
       mockApi: [
         moctokit.rest.repos
           .get({
-            owner: "owner1",
+            owner: "owner2",
             repo: "project1",
           })
           .setResponse({