test: authStrategy option, .auth() method

gr2m · gr2m · commit e179b11f217c · 2019-11-03T08:48:07.000-08:00
diff --git a/test/auth.test.ts b/test/auth.test.ts
@@ -202,11 +202,12 @@ describe("Authentication", () => {
       .getOnce(matchGetUserWithOtp, responseGetUser);
 
     const octokit = new Octokit({
-      auth: createBasicAuth({
+      authStrategy: createBasicAuth,
+      auth: {
         username: "octocat",
         password: "secret",
         on2Fa: () => `123456`
-      }),
+      },
       request: {
         fetch: mock
       }
@@ -282,11 +283,12 @@ x//0u+zd/R/QRUzLOw4N72/Hu+UG6MNt5iDZFCtapRaKt6OvSBwy8w==
       );
 
     const octokit = new Octokit({
-      auth: createAppAuth({
+      authStrategy: createAppAuth,
+      auth: {
         id: APP_ID,
         privateKey: PRIVATE_KEY,
         installationId: 123
-      }),
+      },
       request: {
         fetch: mock
       }
@@ -322,7 +324,7 @@ x//0u+zd/R/QRUzLOw4N72/Hu+UG6MNt5iDZFCtapRaKt6OvSBwy8w==
     };
 
     const octokit = new Octokit({
-      auth: createActionAuth(),
+      authStrategy: createActionAuth,
       request: {
         fetch: mock
       }
@@ -331,4 +333,22 @@ x//0u+zd/R/QRUzLOw4N72/Hu+UG6MNt5iDZFCtapRaKt6OvSBwy8w==
     await octokit.request("/app");
     process.env = currentEnv;
   });
+
+  it("octokit.auth() is noop by default", async () => {
+    const octokit = new Octokit();
+    const result = await octokit.auth();
+    expect(result).toStrictEqual({ type: "unauthenticated" });
+  });
+
+  it("octokit.auth() with options.auth = secret", async () => {
+    const octokit = new Octokit({
+      auth: "secret"
+    });
+    const result = await octokit.auth();
+    expect(result).toStrictEqual({
+      type: "token",
+      tokenType: "oauth",
+      token: "secret"
+    });
+  });
 });
diff --git a/test/defaults.test.ts b/test/defaults.test.ts
@@ -2,6 +2,7 @@ import fetchMock from "fetch-mock";
 import { getUserAgent } from "universal-user-agent";
 import { createActionAuth } from "@octokit/auth";
 
+import { OctokitOptions } from "../src/types";
 import { Octokit } from "../src";
 
 const userAgent = `octokit-core.js/0.0.0-development ${getUserAgent()}`;
@@ -90,7 +91,7 @@ describe("Octokit.defaults", () => {
     });
   });
 
-  it("Octokit.defaults({auth})", async () => {
+  it("Octokit.defaults({ auth })", async () => {
     const mock = fetchMock.sandbox().getOnce(
       "https://api.github.com/app",
       { id: 123 },
@@ -109,7 +110,7 @@ describe("Octokit.defaults", () => {
     };
 
     const OctokitWithDefaults = Octokit.defaults({
-      auth: createActionAuth(),
+      authStrategy: createActionAuth,
       request: {
         fetch: mock
       }
@@ -149,7 +150,7 @@ describe("Octokit.defaults", () => {
     });
   });
 
-  it("Octokit.plugins().defaults()", () => {
+  it("Octokit.plugin().defaults()", () => {
     const mock = fetchMock.sandbox().getOnce(
       "https://github.acme-inc.test/api/v3/",
       { ok: true },
@@ -161,16 +162,31 @@ describe("Octokit.defaults", () => {
       }
     );
 
-    const OctokitWithDefaults = Octokit.plugin(octokit => {
-      octokit.foo = "bar";
-    }).defaults({
+    const OctokitWithPlugin = Octokit.plugin(() => {
+      return {
+        foo: "bar"
+      };
+    });
+
+    // See "A note on TypeScript" in README
+    class OctokitWithPluginWorkaround extends OctokitWithPlugin {
+      static defaults(defaults: OctokitOptions) {
+        return class OctokitWithDefaults extends this {
+          constructor(options: OctokitOptions = {}) {
+            super(Object.assign({}, defaults, options));
+          }
+        };
+      }
+    }
+
+    const OctokitWithPluginAndDefaults = OctokitWithPluginWorkaround.defaults({
       baseUrl: "https://github.acme-inc.test/api/v3",
       request: {
         fetch: mock
       }
     });
 
-    const octokit = new OctokitWithDefaults();
+    const octokit = new OctokitWithPluginAndDefaults();
 
     expect(octokit.foo).toEqual("bar");
 
