Fix more tests

Author: martinml

end-to-end/attempt-silent-login.test.js

@@ -97,7 +97,7 @@ describe('attempt silent login', async () => {
       });
     }
 
-    const loggedOutCookies = await context.cookies(baseUrl);
+    const loggedOutCookies = await context.cookies();
     assert.isNotOk(loggedOutCookies.find(({ name }) => name === 'appSession'));
 
     await goto(baseUrl, page);

end-to-end/backchannel-logout.test.js

@@ -37,6 +37,7 @@ describe('back-channel logout', async () => {
         .concat(['--no-sandbox', '--disable-setuid-sandbox']),
     });
     const page = await browser.newPage();
+    const context = page.browserContext();
     await goto(baseUrl, page);
     assert.match(page.url(), /http:\/\/localhost:300/);
     await Promise.all([page.click('a'), page.waitForNavigation()]);
@@ -67,8 +68,9 @@ describe('back-channel logout', async () => {
     assert.equal(res.statusCode, 204);
 
     await goto(baseUrl, page);
-    const loggedOutCookies = await page.cookies('http://localhost:3000');
-    assert.notOk(loggedOutCookies.find(({ name }) => name === 'appSession'));
+
+    const loggedOutCookies = await context.cookies();
+    assert.isNotOk(loggedOutCookies.find(({ name }) => name === 'appSession'));
   };
 
   it('should logout via back-channel logout', () =>

end-to-end/basic.test.js

@@ -35,6 +35,8 @@ describe('basic login and logout', async () => {
         .concat(['--no-sandbox', '--disable-setuid-sandbox']),
     });
     const page = await browser.newPage();
+    const context = page.browserContext();
+
     await goto(baseUrl, page);
     assert.match(
       page.url(),
@@ -64,7 +66,7 @@ describe('basic login and logout', async () => {
      * verify their content since they're encrypted, so at least let's check it's
      * small enough that a token can't possibly fit inside.
      */
-    const loggedOutCookies = await page.cookies('http://localhost:3000');
+    const loggedOutCookies = await context.cookies();
     assert.isTrue(loggedOutCookies.find(({ name }) => name === 'appSession').size < 200);
   });
 });

test/tokenSetUtils.tests.js

@@ -17,29 +17,26 @@ function newReq(props = {}) {
 
 describe('TokenSetUtils', () => {
   describe('areScopesCompatible()', () => {
-    it('returns true when scopes are enough plus some extra', () => {
-      assert.isTrue(
-        TokenSetUtils.areScopesCompatible({ scope: 'a b' }, { scope: 'b c a' }),
-      );
-    });
-
-    it('returns false when scopes are not enough', () => {
-      assert.isFalse(
-        TokenSetUtils.areScopesCompatible({ scope: 'a b' }, { scope: 'b' }),
-      );
-    });
+    /** @type {[string | undefined, string | undefined, boolean][]} */
+    const testCases = [
+      ['a b', 'b c a', true],
+      ['a b', 'b', false],
+      ['foo', undefined, true],
+      [undefined, undefined, true],
+    ];
 
-    it('falls back to default SDK scope when no scope is requested', () => {
-      assert.isTrue(
-        TokenSetUtils.areScopesCompatible(
-          {},
-          { scope: 'openid profile email' },
-        ),
-      );
-    });
+    testCases.forEach((testCase) => {
+      const [requested, available, expected] = testCase;
 
-    it('returns false when no scope is available', () => {
-      assert.isFalse(TokenSetUtils.areScopesCompatible({ scope: 'a b' }, {}));
+      it(`returns ${expected} for (${requested}, ${available})`, () => {
+        assert.strictEqual(
+          expected,
+          TokenSetUtils.areScopesCompatible(
+            { scope: requested },
+            { scope: available },
+          ),
+        );
+      });
     });
   });