Fix queue opening video, tests

Event handler order changed, need to make sure we have priority to avoid
going to video
Tests:
- Add timeouts (Nebula throttels with 429)
- Fix new casing for login button
- Fix default page title

Author: cpiber

.github/workflows/node.js.yml

@@ -108,18 +108,18 @@ jobs:
 
     - name: Clear jest cache
       run: npx jest --clear-cache
-    # - name: Run tests on beta
-    #   run: xvfb-run --auto-servernum npm run test:ee -- --ci
-    #   continue-on-error: ${{ github.event_name != 'schedule' }}
-    #   id: betatest
-    #   env:
-    #     YT_API_KEY: ${{ secrets.YOUTUBE_KEY }}
-    #     NEBULA_PASS: ${{ secrets.NEBULA_PASS }}
-    #     NEBULA_USER: ${{ secrets.NEBULA_USER }}
-    #     NEBULA_BASE: https://beta.nebula.app
-    # - name: Emit warning if beta test failed
-    #   if: ${{ steps.betatest.outcome == 'failure' }}
-    #   run: echo "::warning::Beta tests failed"
+    - name: Run tests on beta
+      run: xvfb-run --auto-servernum npm run test:ee -- --ci
+      continue-on-error: ${{ github.event_name != 'schedule' }}
+      id: betatest
+      env:
+        YT_API_KEY: ${{ secrets.YOUTUBE_KEY }}
+        NEBULA_PASS: ${{ secrets.NEBULA_PASS }}
+        NEBULA_USER: ${{ secrets.NEBULA_USER }}
+        NEBULA_BASE: https://beta.nebula.app
+    - name: Emit warning if beta test failed
+      if: ${{ steps.betatest.outcome == 'failure' }}
+      run: echo "::warning::Beta tests failed"
 
   coverage:
     name: Coverage

src/scripts/content/nebula/index.ts

@@ -29,7 +29,7 @@ export const nebula = async () => {
   document.addEventListener(loadPrefix, doVideoActions);
   document.addEventListener(xhrPrefix, doVideoActions);
   document.body.addEventListener('mouseover', hover);
-  document.body.addEventListener('click', click);
+  document.body.addEventListener('click', click, { capture: true });
   doVideoActions();
 
   // inject web content script

tests/integration/queue.ts

@@ -12,16 +12,18 @@ beforeAll(async () => {
   await page.click('.CookieConsent-Button');
 });
 
-describe('videos page', () => {
-  beforeEach(maybeLogin(async () => {
-    await page.goto(`${__NEBULA_BASE__}/videos`);
-    await page.waitForSelector(videoSelector);
-  }));
-
-  afterEach(async () => {
-    await page.evaluate(() => window.localStorage.clear());
-  });
+beforeEach(maybeLogin(async () => {
+  await page.goto(`${__NEBULA_BASE__}/videos`);
+  await page.waitForSelector(videoSelector);
+  console.log(expect.getState().currentTestName);
+}));
+
+afterEach(async () => {
+  await page.evaluate(() => window.localStorage.removeItem('enhancer-queue'));
+  await page.waitForTimeout(2000);
+});
 
+describe('videos page', () => {
   test('hover video adds queue button', async () => {
     const vid = await page.waitForSelector(videoSelector);
     await (await vid.$('img')).hover();
@@ -68,15 +70,6 @@ describe('videos page', () => {
 });
 
 describe('queue', () => {
-  beforeEach(maybeLogin(async () => {
-    await page.goto(`${__NEBULA_BASE__}/videos`);
-    await page.waitForSelector(videoSelector);
-  }));
-
-  afterEach(async () => {
-    await page.evaluate(() => window.localStorage.clear());
-  });
-
   test('can clear queue', async () => {
     await addToQueue(3);
     await expectQueueLength().toBe(3);
@@ -119,7 +112,7 @@ describe('queue', () => {
       const t = await page.evaluate((sel, n) => document.querySelector(`${sel} .element:nth-child(${n}) .title`).textContent, queueSelector, num);
       // titles in nebula are weird...
       // e.g. https://nebula.app/videos/extra-history-vlad-the-impaler-lies-extra-history contains extra space that is stripped in document title
-      await page.waitForFunction(() => document.title.indexOf('Loading') === -1 && document.title.indexOf('Nebula | Nebula') === -1, { timeout: 5000 });
+      await page.waitForFunction(() => document.title.indexOf('Loading') === -1 && document.title !== 'Nebula', { timeout: 5000 });
       await expect(page.title()).resolves.toContain(t.replace(/\s+/g, ' '));
       await expect(page.evaluate(sel => document.querySelector(`${sel} .top .title`).textContent, queueSelector)).resolves.toBe(t);
       await expect(page.evaluate(sel => document.querySelector(`${sel} .top .no`).textContent, queueSelector)).resolves.toBe(`${num}`);
@@ -165,7 +158,7 @@ describe('queue', () => {
     await page.click(`${queueSelector} .top .share`);
     const url = await page.evaluate(() => document.querySelector<HTMLInputElement>('.enhancer-queue-share input[type="text"]').value);
     const before = await titles();
-    await page.evaluate(() => window.localStorage.clear());
+    await page.evaluate(() => window.localStorage.removeItem('enhancer-queue'));
 
     await page.goto(url);
     await page.waitForSelector(queueSelector);
@@ -178,7 +171,7 @@ describe('queue', () => {
     await page.click(`${queueSelector} .top .share`);
     const url = await page.evaluate(() => document.querySelector<HTMLInputElement>('.enhancer-queue-share input[type="text"]').value);
     const before = await titles();
-    await page.evaluate(() => window.localStorage.clear());
+    await page.evaluate(() => window.localStorage.removeItem('enhancer-queue'));
 
     await page.evaluate(hash => window.location.hash = hash, url.slice(url.indexOf('#')));
     await page.waitForTimeout(100);

tests/shared.ts

@@ -38,8 +38,10 @@ export const login = async (force = false) => {
     email: __NEBULA_USER__,
     password: __NEBULA_PASS__,
   });
-  await expect(page).toClick(`${formSelector} button`, { text: 'Sign In' });
-  await page.waitForSelector('[href="/account"]'); // wait until logged in
+  await expect(page).toClick(`${formSelector} button`, { text: 'Sign in' });
+  await page.waitForResponse('https://api.watchnebula.com/api/v1/authorization/'); // wait until logged in
+  await page.waitForSelector('[href="/account"]');
+  await page.waitForTimeout(1000);
 };
 
 export const maybeLogin = (cb: () => Promise<void>) => async () => {