Merge pull request #43 from Moya/fix-peril-invitations

Fixes Peril invitations
Moya · Oct 1, 2020 · 5b16986 · 5b16986
2 parents 5f9e3dc + cab8bb2
commit 5b16986
Show file tree

Hide file tree

Showing 5 changed files with 656 additions and 117 deletions.
diff --git a/org/aeryn.ts b/org/aeryn.ts
@@ -50,7 +50,7 @@ export const aeryn = wrap(
         const mergedPrCount = res.data.total_count;
         if (mergedPrCount === 1) {
           markdown(inviteMarkdown);
-          await api.orgs.addOrgMembership({ org, username, role: "member" });
+          await api.teams.addOrUpdateMembershipInOrg({ org, username, team_slug: 'contributors' });
         }
       });
     }

diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
   "devDependencies": {
     "@types/jest": "^22.2.3",
     "@types/node": "^8.0.25",
-    "danger": "^3.1.3",
+    "danger": "^10.5.0",
     "jest": "^22.4.3",
     "ts-jest": "^22.4.4",
     "typescript": "^2.3.2"
@@ -22,6 +22,12 @@
       "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
     },
     "testRegex": "(.test)\\.(ts|tsx)$",
-    "moduleFileExtensions": ["ts", "tsx", "js", "jsx", "json"]
+    "moduleFileExtensions": [
+      "ts",
+      "tsx",
+      "js",
+      "jsx",
+      "json"
+    ]
   }
 }
diff --git a/tests/aeryn.test.ts b/tests/aeryn.test.ts
@@ -59,7 +59,9 @@ describe("a merged PR", () => {
         checkMembership: async () => {
           throw new Error("Not a member");
         },
-        addOrgMembership: inviteMock
+      },
+      teams: {
+        addOrUpdateMembershipInOrg: inviteMock
       }
     };
     return aeryn().then(() => {
@@ -77,7 +79,9 @@ describe("a merged PR", () => {
         checkMembership: async () => {
           throw new Error("Not a member");
         },
-        addOrgMembership: inviteMock
+      },
+      teams: {
+        addOrUpdateMembershipInOrg: inviteMock
       }
     };
     return aeryn().then(() => {

diff --git a/tests/labeler.test.ts b/tests/labeler.test.ts
@@ -2,7 +2,7 @@ jest.mock("danger", () => jest.fn());
 import * as danger from "danger";
 const dm = danger as any;
 
-import { labeler } from "../org/labeler";
+import { labeler } from "../moya/labeler";
 
 beforeEach(() => {
   dm.danger = {