chore(ci): fix failing e2e tests (#456)

Fixes failing E2E tests (updates dependencies and edits the test
assertions based on the current contents of `crawlee.dev`).

Closes #363

Author: barjin

.github/workflows/test-e2e.yaml

@@ -40,9 +40,6 @@ jobs:
                   restore-keys: |
                       turbo-${{ github.job }}-${{ github.ref_name }}-
 
-            - name: Login to Apify
-              run: npx -y apify-cli login -t ${{ secrets.APIFY_SCRAPER_TESTS_API_TOKEN }}
-
             - name: Install Dependencies
               run: npm ci --force
 
@@ -51,3 +48,5 @@ jobs:
 
             - name: Test
               run: npm run test:e2e
+              env:
+                  APIFY_TOKEN: ${{ secrets.APIFY_SCRAPER_TESTS_API_TOKEN }}

package-lock.json

@@ -67,6 +67,7 @@
         "@apify/consts": "^2.29.0",
         "@apify/eslint-config": "^1.0.0",
         "@apify/input_secrets": "^1.2.0",
+        "@apify/log": "^2.5.22",
         "@apify/tsconfig": "^0.1.0",
         "@commitlint/config-conventional": "^19.2.2",
         "@playwright/browser-chromium": "^1.46.0",

package.json

@@ -4,7 +4,7 @@ import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { isMainThread, Worker, workerData } from 'node:worker_threads';
 
-import { log } from '@apify/log';
+import log from '@apify/log';
 
 import { clearStorage, colors, SKIPPED_TEST_CLOSE_CODE } from './tools.mjs';
 

test/e2e/runScraperTests.mjs

@@ -8,7 +8,7 @@ import { isMainThread, Worker, workerData } from 'node:worker_threads';
 import { ApifyClient } from 'apify-client';
 
 import { ACTOR_SOURCE_TYPES } from '@apify/consts';
-import { log } from '@apify/log';
+import log from '@apify/log';
 import { cryptoRandomObjectId } from '@apify/utilities';
 
 const rootPath = dirname(fileURLToPath(import.meta.url));
@@ -51,6 +51,8 @@ async function runWorker(dirName) {
                 log.info('Captured stderr:');
                 process.stderr.write(err);
             }
+
+            process.exit(exitCode);
         } else {
             log.info(`${dirName} OK`);
         }

test/e2e/runSdkTests.mjs

@@ -13,9 +13,9 @@ const { exit } = process;
 process.exit = () => {};
 
 await run(testDir, 'cheerio-scraper', {
-    startUrls: [{ url: 'https://crawlee.dev' }],
+    startUrls: [{ url: 'https://crawlee.dev/js/docs/guides/request-storage' }],
     keepUrlFragments: false,
-    globs: ['https://crawlee.dev/*/*'],
+    globs: ['https://crawlee.dev/js/docs/guides/**'],
     linkSelector: 'a',
     pageFunction: async function pageFunction(context) {
         const { $, request, log } = context;

test/e2e/scrapers/cheerio-default/test.mjs

@@ -65,10 +65,10 @@ await run(testDir, 'cheerio-scraper', {
 process.exit = exit;
 
 const stats = await getStats(testDir);
-await expect(stats.requestsFinished > 20, 'All requests finished');
+await expect(stats.requestsFinished >= 20, 'All requests finished');
 
 const datasetItems = await getDatasetItems(testDir);
-await expect(datasetItems.length > 20, 'Minimum number of dataset items');
+await expect(datasetItems.length >= 20, 'Minimum number of dataset items');
 await expect(
     validateDataset(datasetItems, ['url', 'title']),
     'Dataset items validation',

test/e2e/scrapers/cheerio-ignoreSslErrors-enabled/test.mjs

@@ -85,7 +85,7 @@ await run(testDir, 'cheerio-scraper', {
 process.exit = exit;
 
 const stats = await getStats(testDir);
-await expect(stats.requestsFinished > 10, 'All requests finished');
+await expect(stats.requestsFinished >= 10, 'All requests finished');
 
 const datasetItems = await getDatasetItems(testDir);
 await expect(

test/e2e/scrapers/cheerio-max-requests/test.mjs

@@ -13,9 +13,9 @@ const { exit } = process;
 process.exit = () => {};
 
 await run(testDir, 'jsdom-scraper', {
-    startUrls: [{ url: 'https://crawlee.dev' }],
+    startUrls: [{ url: 'https://crawlee.dev/js/docs/guides/request-storage' }],
     keepUrlFragments: false,
-    globs: ['https://crawlee.dev/*/*'],
+    globs: ['https://crawlee.dev/js/docs/guides/**'],
     linkSelector: 'a',
     pageFunction: async function pageFunction(context) {
         const { window, request, log } = context;

test/e2e/scrapers/jsdom-default/test.mjs

@@ -89,7 +89,7 @@ await run(testDir, 'jsdom-scraper', {
 process.exit = exit;
 
 const stats = await getStats(testDir);
-await expect(stats.requestsFinished > 10, 'All requests finished');
+await expect(stats.requestsFinished >= 10, 'All requests finished');
 
 const datasetItems = await getDatasetItems(testDir);
 await expect(