Revert debug code

withastro · Jan 9, 2023 · c0ab31b · c0ab31b
1 parent 60c0a01
commit c0ab31b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -110,8 +110,11 @@ jobs:
     needs: build
     strategy:
       matrix:
-        OS: [windows-latest]
+        OS: [ubuntu-latest, windows-latest]
         NODE_VERSION: [16, 18]
+        include:
+          - os: macos-latest
+            NODE_VERSION: 16
       fail-fast: false
     env:
       NODE_VERSION: ${{ matrix.NODE_VERSION }}
@@ -143,7 +146,6 @@ jobs:
         run: pnpm run test
 
   e2e:
-    if: false
     name: "Test (E2E): ${{ matrix.os }} (node@${{ matrix.NODE_VERSION }})"
     runs-on: ${{ matrix.os }}
     timeout-minutes: 25
@@ -178,7 +180,6 @@ jobs:
         run: pnpm run test:e2e
 
   smoke:
-    if: false
     name: "Test (Smoke): ${{ matrix.os }} (node@${{ matrix.NODE_VERSION }})"
     runs-on: ${{ matrix.os }}
     timeout-minutes: 25

diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "format:ci": "pnpm run format:imports && pnpm run format:code",
     "format:code": "prettier -w . --cache --plugin-search-dir=.",
     "format:imports": "organize-imports-cli ./packages/*/tsconfig.json ./packages/*/*/tsconfig.json",
-    "test": "turbo run test --output-logs=new-only --concurrency=1 --filter=\"@astrojs/prefetch\"",
+    "test": "turbo run test --output-logs=new-only --concurrency=1 --filter=astro --filter=create-astro --filter=\"@astrojs/*\"",
     "test:match": "cd packages/astro && pnpm run test:match",
     "test:smoke": "turbo run build --filter=\"@example/*\" --filter=\"docs\" --output-logs=new-only --concurrency=1",
     "test:check-examples": "node ./scripts/smoke/check.js",

diff --git a/packages/integrations/prefetch/test/basic-prefetch.test.js b/packages/integrations/prefetch/test/basic-prefetch.test.js
@@ -18,11 +18,12 @@ test.describe('Basic prefetch', () => {
 		test.describe('prefetches rel="prefetch" links', () => {
 			test('skips /admin', async ({ page, astro }) => {
 				const requests = [];
-				const requestHandler = (request) => requests.push(request.url());
 
-				page.on('request', requestHandler);
+				page.on('request', (request) => requests.push(request.url()));
 
-				await page.goto(astro.resolveUrl('/'), { waitUntil: 'networkidle' });
+				await page.goto(astro.resolveUrl('/'));
+
+				await page.waitForLoadState('networkidle');
 
 				expect(requests.includes(astro.resolveUrl('/about')), '/about was prefetched').toBeTruthy();
 				expect(
@@ -34,8 +35,6 @@ test.describe('Basic prefetch', () => {
 					requests.filter((r) => r === astro.resolveUrl('/')).length === 1,
 					'/ was skipped by prefetch and only queried once'
 				).toBeTruthy();
-
-				page.off('request', requestHandler);
 			});
 		});
 	});
@@ -56,11 +55,12 @@ test.describe('Basic prefetch', () => {
 		test.describe('prefetches rel="prefetch" links', () => {
 			test('skips /admin', async ({ page, astro }) => {
 				const requests = [];
-				const requestHandler = (request) => requests.push(request.url());
 
-				page.on('request', requestHandler);
+				page.on('request', (request) => requests.push(request.url()));
 
-				await page.goto(astro.resolveUrl('/'), { waitUntil: 'networkidle' });
+				await page.goto(astro.resolveUrl('/'));
+
+				await page.waitForLoadState('networkidle');
 
 				expect(requests.includes(astro.resolveUrl('/about')), '/about was prefetched').toBeTruthy();
 				expect(
@@ -72,8 +72,6 @@ test.describe('Basic prefetch', () => {
 					requests.filter((r) => r === astro.resolveUrl('/')).length === 1,
 					'/ was skipped by prefetch and only queried once'
 				).toBeTruthy();
-
-				page.off('request', requestHandler);
 			});
 		});
 	});

diff --git a/packages/integrations/prefetch/test/custom-selectors.test.js b/packages/integrations/prefetch/test/custom-selectors.test.js
@@ -26,11 +26,12 @@ test.describe('Custom prefetch selectors', () => {
 		test.describe('prefetches links by custom selector', () => {
 			test('only prefetches /contact', async ({ page, astro }) => {
 				const requests = [];
-				const requestHandler = (request) => requests.push(request.url());
 
-				page.on('request', requestHandler);
+				page.on('request', (request) => requests.push(request.url()));
 
-				await page.goto(astro.resolveUrl('/'), { waitUntil: 'networkidle' });
+				await page.goto(astro.resolveUrl('/'));
+
+				await page.waitForLoadState('networkidle');
 
 				expect(requests.includes(astro.resolveUrl('/about')), '/about was skipped').toBeFalsy();
 				expect(
@@ -42,8 +43,6 @@ test.describe('Custom prefetch selectors', () => {
 					requests.filter((r) => r === astro.resolveUrl('/')).length === 1,
 					'/ was skipped by prefetch and only queried once'
 				).toBeTruthy();
-
-				page.off('request', requestHandler);
 			});
 		});
 	});
@@ -64,11 +63,12 @@ test.describe('Custom prefetch selectors', () => {
 		test.describe('prefetches links by custom selector', () => {
 			test('only prefetches /contact', async ({ page, astro }) => {
 				const requests = [];
-				const requestHandler = (request) => requests.push(request.url());
 
-				page.on('request', requestHandler);
+				page.on('request', (request) => requests.push(request.url()));
 
-				await page.goto(astro.resolveUrl('/'), { waitUntil: 'networkidle' });
+				await page.goto(astro.resolveUrl('/'));
+
+				await page.waitForLoadState('networkidle');
 
 				expect(requests.includes(astro.resolveUrl('/about')), '/about was skipped').toBeFalsy();
 				expect(
@@ -80,8 +80,6 @@ test.describe('Custom prefetch selectors', () => {
 					requests.filter((r) => r === astro.resolveUrl('/')).length === 1,
 					'/ was skipped by prefetch and only queried once'
 				).toBeTruthy();
-
-				page.off('request', requestHandler);
 			});
 		});
 	});

diff --git a/packages/integrations/prefetch/test/style-prefetch.test.js b/packages/integrations/prefetch/test/style-prefetch.test.js
@@ -38,18 +38,17 @@ test.describe('Style prefetch', () => {
 		test.describe('prefetches rel="prefetch" links', () => {
 			test('style fetching', async ({ page, astro }) => {
 				const requests = [];
-				const requestHandler = (request) => requests.push(request.url());
 
-				page.on('request', requestHandler);
+				page.on('request', (request) => requests.push(request.url()));
 
-				await page.goto(astro.resolveUrl('/'), { waitUntil: 'networkidle' });
+				await page.goto(astro.resolveUrl('/'));
+
+				await page.waitForLoadState('networkidle');
 
 				await expect(requests.filter((req) => req.includes('/style1'))).toBeTruthy();
 				await expect(requests.filter((req) => req.includes('/style2'))).toBeTruthy();
 				const cssRequestCount = requests.filter((req) => req.includes('/main.css')).length;
 				await expect(cssRequestCount).toBe(1);
-
-				page.off('request', requestHandler);
 			});
 		});
 	}