Crawlee—A web scraping and browser automation library for Node.js to build reliable crawlers. In JavaScript and TypeScript. Extract data for AI, LLMs, RAG, or GPTs. Download HTML, PDF, JPG, PNG, and other files from websites. Works with Puppeteer, Playwright, Cheerio, JSDOM, and raw HTTP. Both headful and headless mode. With proxy rotation.
TypeScript apifyautomationcrawlercrawlingheadlessheadless-chromejavascriptnodejsnpmplaywrightpuppeteerscraperscrapingtypescriptweb-crawlerweb-crawlingweb-scraping
Codemod tests
Ondra Urbanecdfe4c2c1c1
diff --git a/test/.eslintrc.json b/__tests__/.eslintrc.jsonsimilarity index 62%rename from test/.eslintrc.jsonrename to __tests__/.eslintrc.jsonindex 2f64929c8..b01f85a25 100644--- a/test/.eslintrc.json+++ b/__tests__/.eslintrc.json@@ -5,7 +5,10 @@"xit": false,"before": false,"after": false,+ "beforeAll": false,+ "afterAll": false,"beforeEach": false,- "afterEach": false+ "afterEach": false,+ "expect": false}}diff --git a/test/_helper.js b/__tests__/_helper.jssimilarity index 100%rename from test/_helper.jsrename to __tests__/_helper.jsdiff --git a/test/actor.js b/__tests__/actor.jssimilarity index 100%rename from test/actor.jsrename to __tests__/actor.jsdiff --git a/test/autoscaling/autoscaled_pool.js b/__tests__/autoscaling/autoscaled_pool.jssimilarity index 100%rename from test/autoscaling/autoscaled_pool.jsrename to __tests__/autoscaling/autoscaled_pool.jsdiff --git a/test/autoscaling/snapshotter.js b/__tests__/autoscaling/snapshotter.jssimilarity index 72%rename from test/autoscaling/snapshotter.jsrename to __tests__/autoscaling/snapshotter.jsindex 3ade2f604..1dcc36cb6 100644--- a/test/autoscaling/snapshotter.js+++ b/__tests__/autoscaling/snapshotter.js@@ -1,7 +1,6 @@/* eslint-disable no-underscore-dangle */import os from 'os';-import { expect } from 'chai';import sinon from 'sinon';import log from 'apify-shared/log';import { ACTOR_EVENT_NAMES, ENV_VARS } from 'apify-shared/consts';@@ -42,36 +41,36 @@ describe('Snapshotter', () => {const cpuSnapshots = snapshotter.getCpuSample();const clientSnapshots = snapshotter.getClientSample();- expect(cpuSnapshots).to.be.an('array');- expect(cpuSnapshots).to.have.lengthOf(2);+ expect(Array.isArray(cpuSnapshots)).toBe(true);+ expect(cpuSnapshots).toHaveLength(2);cpuSnapshots.forEach((ss) => {- expect(ss.createdAt).to.be.a('date');- expect(ss.isOverloaded).to.be.a('boolean');- expect(ss.usedRatio).to.be.a('number');+ expect(ss.createdAt).toBeInstanceOf(Date);+ expect(ss.isOverloaded).toBeInstanceOf(Boolean);+ expect(ss.usedRatio).toBeInstanceOf(Number);});- expect(memorySnapshots).to.be.an('array');- expect(memorySnapshots).to.have.lengthOf(2);+ expect(Array.isArray(memorySnapshots)).toBe(true);+ expect(memorySnapshots).toHaveLength(2);memorySnapshots.forEach((ss) => {- expect(ss.createdAt).to.be.a('date');- expect(ss.isOverloaded).to.be.a('boolean');- expect(ss.usedBytes).to.be.a('number');+ expect(ss.createdAt).toBeInstanceOf(Date);+ expect(ss.isOverloaded).toBeInstanceOf(Boolean);+ expect(ss.usedBytes).toBeInstanceOf(Number);});- expect(eventLoopSnapshots).to.be.an('array');- expect(eventLoopSnapshots).to.have.lengthOf(3);+ expect(Array.isArray(eventLoopSnapshots)).toBe(true);+ expect(eventLoopSnapshots).toHaveLength(3);eventLoopSnapshots.forEach((ss) => {- expect(ss.createdAt).to.be.a('date');- expect(ss.isOverloaded).to.be.a('boolean');- expect(ss.exceededMillis).to.be.a('number');+ expect(ss.createdAt).toBeInstanceOf(Date);+ expect(ss.isOverloaded).toBeInstanceOf(Boolean);+ expect(ss.exceededMillis).toBeInstanceOf(Number);});- expect(clientSnapshots).to.be.an('array');- expect(clientSnapshots).to.have.lengthOf(2);+ expect(Array.isArray(clientSnapshots)).toBe(true);+ expect(clientSnapshots).toHaveLength(2);clientSnapshots.forEach((ss) => {- expect(ss.createdAt).to.be.a('date');- expect(ss.isOverloaded).to.be.a('boolean');- expect(ss.rateLimitErrorCount).to.be.a('number');+ expect(ss.createdAt).toBeInstanceOf(Date);+ expect(ss.isOverloaded).toBeInstanceOf(Boolean);+ expect(ss.rateLimitErrorCount).toBeInstanceOf(Number);});utils.apifyClient.stats = oldStats;@@ -91,9 +90,9 @@ describe('Snapshotter', () => {const eventLoopSnapshots = snapshotter.getEventLoopSample();const cpuSnapshots = snapshotter.getCpuSample();- expect(cpuSnapshots.length).to.be.above(2);- expect(memorySnapshots.length).to.be.above(2);- expect(eventLoopSnapshots.length).to.be.above(4);+ expect(cpuSnapshots.length).toBeGreaterThan(2);+ expect(memorySnapshots.length).toBeGreaterThan(2);+ expect(eventLoopSnapshots.length).toBeGreaterThan(4);});it('correctly marks CPU overloaded using Platform event', async () => {@@ -119,11 +118,11 @@ describe('Snapshotter', () => {await snapshotter.stop();const cpuSnapshots = snapshotter.getCpuSample();- expect(cpuSnapshots).to.have.lengthOf(4);+ expect(cpuSnapshots).toHaveLength(4);cpuSnapshots.forEach((ss, i) => {- expect(ss.createdAt).to.be.a('date');- expect(ss.isOverloaded).to.be.a('boolean');- expect(ss.isOverloaded).to.be.eql(i % 2 === 0);+ expect(ss.createdAt).toBeInstanceOf(Date);+ expect(ss.isOverloaded).toBeInstanceOf(Boolean);+ expect(ss.isOverloaded).toEqual(i % 2 === 0);});} finally {delete process.env[ENV_VARS.IS_AT_HOME];@@ -162,12 +161,12 @@ describe('Snapshotter', () => {const loopSnapshots = snapshotter.getCpuSample();- expect(loopSnapshots.length).to.be.eql(5);- expect(loopSnapshots[0].isOverloaded).to.be.eql(false);- expect(loopSnapshots[1].isOverloaded).to.be.eql(false);- expect(loopSnapshots[2].isOverloaded).to.be.eql(true);- expect(loopSnapshots[3].isOverloaded).to.be.eql(false);- expect(loopSnapshots[4].isOverloaded).to.be.eql(true);+ expect(loopSnapshots.length).toBe(5);+ expect(loopSnapshots[0].isOverloaded).toBe(false);+ expect(loopSnapshots[1].isOverloaded).toBe(false);+ expect(loopSnapshots[2].isOverloaded).toBe(true);+ expect(loopSnapshots[3].isOverloaded).toBe(false);+ expect(loopSnapshots[4].isOverloaded).toBe(true);mock.verify();});@@ -188,12 +187,12 @@ describe('Snapshotter', () => {snapshotter._snapshotEventLoop(noop);const loopSnapshots = snapshotter.getEventLoopSample();- expect(loopSnapshots.length).to.be.eql(5);- expect(loopSnapshots[0].isOverloaded).to.be.eql(false);- expect(loopSnapshots[1].isOverloaded).to.be.eql(false);- expect(loopSnapshots[2].isOverloaded).to.be.eql(false);- expect(loopSnapshots[3].isOverloaded).to.be.eql(true);- expect(loopSnapshots[4].isOverloaded).to.be.eql(false);+ expect(loopSnapshots.length).toBe(5);+ expect(loopSnapshots[0].isOverloaded).toBe(false);+ expect(loopSnapshots[1].isOverloaded).toBe(false);+ expect(loopSnapshots[2].isOverloaded).toBe(false);+ expect(loopSnapshots[3].isOverloaded).toBe(true);+ expect(loopSnapshots[4].isOverloaded).toBe(false);} finally {clock.restore();}@@ -223,12 +222,12 @@ describe('Snapshotter', () => {await snapshotter._snapshotMemoryOnLocal(noop);const memorySnapshots = snapshotter.getMemorySample();- expect(memorySnapshots.length).to.be.eql(5);- expect(memorySnapshots[0].isOverloaded).to.be.eql(false);- expect(memorySnapshots[1].isOverloaded).to.be.eql(false);- expect(memorySnapshots[2].isOverloaded).to.be.eql(false);- expect(memorySnapshots[3].isOverloaded).to.be.eql(true);- expect(memorySnapshots[4].isOverloaded).to.be.eql(false);+ expect(memorySnapshots.length).toBe(5);+ expect(memorySnapshots[0].isOverloaded).toBe(false);+ expect(memorySnapshots[1].isOverloaded).toBe(false);+ expect(memorySnapshots[2].isOverloaded).toBe(false);+ expect(memorySnapshots[3].isOverloaded).toBe(true);+ expect(memorySnapshots[4].isOverloaded).toBe(false);delete process.env[ENV_VARS.MEMORY_MBYTES];});@@ -248,12 +247,12 @@ describe('Snapshotter', () => {const snapshotter = new Snapshotter({ maxUsedMemoryRatio: 0.5 });snapshotter._memoryOverloadWarning(memoryDataOverloaded);- expect(logged).to.be.eql(true);+ expect(logged).toBe(true);logged = false;snapshotter._memoryOverloadWarning(memoryDataNotOverloaded);- expect(logged).to.be.eql(false);+ expect(logged).toBe(false);delete process.env[ENV_VARS.MEMORY_MBYTES];});@@ -276,11 +275,11 @@ describe('Snapshotter', () => {const clientSnapshots = snapshotter.getClientSample();- expect(clientSnapshots.length).to.be.eql(4);- expect(clientSnapshots[0].isOverloaded).to.be.eql(false);- expect(clientSnapshots[1].isOverloaded).to.be.eql(false);- expect(clientSnapshots[2].isOverloaded).to.be.eql(false);- expect(clientSnapshots[3].isOverloaded).to.be.eql(true);+ expect(clientSnapshots.length).toBe(4);+ expect(clientSnapshots[0].isOverloaded).toBe(false);+ expect(clientSnapshots[1].isOverloaded).toBe(false);+ expect(clientSnapshots[2].isOverloaded).toBe(false);+ expect(clientSnapshots[3].isOverloaded).toBe(true);utils.apifyClient.stats = oldStats;});@@ -300,16 +299,16 @@ describe('Snapshotter', () => {const memorySample = snapshotter.getMemorySample(SAMPLE_SIZE_MILLIS);const eventLoopSample = snapshotter.getEventLoopSample(SAMPLE_SIZE_MILLIS);- expect(memorySnapshots.length).to.be.above(memorySample.length);- expect(eventLoopSnapshots.length).to.be.above(eventLoopSample.length);+ expect(memorySnapshots.length).toBeGreaterThan(memorySample.length);+ expect(eventLoopSnapshots.length).toBeGreaterThan(eventLoopSample.length);for (let i = 0; i < eventLoopSample.length; i++) {const sample = eventLoopSample[eventLoopSample.length - 1 - i];const snapshot = eventLoopSnapshots[eventLoopSnapshots.length - 1 - i];- expect(sample).to.be.eql(snapshot);+ expect(sample).toEqual(snapshot);}const diffBetween = eventLoopSample[eventLoopSample.length - 1].createdAt - eventLoopSnapshots[eventLoopSnapshots.length - 1].createdAt;const diffWithin = eventLoopSample[0].createdAt - eventLoopSample[eventLoopSample.length - 1].createdAt;- expect(diffBetween).to.be.below(SAMPLE_SIZE_MILLIS);- expect(diffWithin).to.be.below(SAMPLE_SIZE_MILLIS);+ expect(diffBetween).toBeLessThan(SAMPLE_SIZE_MILLIS);+ expect(diffWithin).toBeLessThan(SAMPLE_SIZE_MILLIS);});});diff --git a/test/autoscaling/system_status.js b/__tests__/autoscaling/system_status.jssimilarity index 76%rename from test/autoscaling/system_status.jsrename to __tests__/autoscaling/system_status.jsindex e10eeb8b5..f4a28d2e9 100644--- a/test/autoscaling/system_status.js+++ b/__tests__/autoscaling/system_status.js@@ -1,4 +1,3 @@-import { expect } from 'chai';import log from 'apify-shared/log';import SystemStatus from '../../build/autoscaling/system_status';import Snapshotter from '../../build/autoscaling/snapshotter';@@ -56,8 +55,8 @@ describe('SystemStatus', () => {const systemStatus = new SystemStatus({snapshotter: new MockSnapshotter(snaps, snaps, snaps, snaps),});- expect(systemStatus.getCurrentStatus().isSystemIdle).to.be.eql(true);- expect(systemStatus.getHistoricalStatus().isSystemIdle).to.be.eql(true);+ expect(systemStatus.getCurrentStatus().isSystemIdle).toBe(true);+ expect(systemStatus.getHistoricalStatus().isSystemIdle).toBe(true);});it('should return overloaded for overloaded snapshots', () => {@@ -65,8 +64,8 @@ describe('SystemStatus', () => {const systemStatus = new SystemStatus({snapshotter: new MockSnapshotter(snaps, snaps, snaps, snaps),});- expect(systemStatus.getCurrentStatus().isSystemIdle).to.be.eql(false);- expect(systemStatus.getHistoricalStatus().isSystemIdle).to.be.eql(false);+ expect(systemStatus.getCurrentStatus().isSystemIdle).toBe(false);+ expect(systemStatus.getHistoricalStatus().isSystemIdle).toBe(false);});it('should work with some samples empty', () => {@@ -74,23 +73,23 @@ describe('SystemStatus', () => {let systemStatus = new SystemStatus({snapshotter: new MockSnapshotter(snaps, [], [], []),});- expect(systemStatus.getCurrentStatus().isSystemIdle).to.be.eql(false);- expect(systemStatus.getHistoricalStatus().isSystemIdle).to.be.eql(false);+ expect(systemStatus.getCurrentStatus().isSystemIdle).toBe(false);+ expect(systemStatus.getHistoricalStatus().isSystemIdle).toBe(false);systemStatus = new SystemStatus({snapshotter: new MockSnapshotter([], snaps, [], []),});- expect(systemStatus.getCurrentStatus().isSystemIdle).to.be.eql(false);- expect(systemStatus.getHistoricalStatus().isSystemIdle).to.be.eql(false);+ expect(systemStatus.getCurrentStatus().isSystemIdle).toBe(false);+ expect(systemStatus.getHistoricalStatus().isSystemIdle).toBe(false);systemStatus = new SystemStatus({snapshotter: new MockSnapshotter([], [], snaps, snaps),});- expect(systemStatus.getCurrentStatus().isSystemIdle).to.be.eql(false);- expect(systemStatus.getHistoricalStatus().isSystemIdle).to.be.eql(false);+ expect(systemStatus.getCurrentStatus().isSystemIdle).toBe(false);+ expect(systemStatus.getHistoricalStatus().isSystemIdle).toBe(false);systemStatus = new SystemStatus({snapshotter: new MockSnapshotter([], [], [], []),});- expect(systemStatus.getCurrentStatus().isSystemIdle).to.be.eql(true);- expect(systemStatus.getHistoricalStatus().isSystemIdle).to.be.eql(true);+ expect(systemStatus.getCurrentStatus().isSystemIdle).toBe(true);+ expect(systemStatus.getHistoricalStatus().isSystemIdle).toBe(true);});it('should overload if only one sample is overloaded', () => {@@ -99,23 +98,23 @@ describe('SystemStatus', () => {let systemStatus = new SystemStatus({snapshotter: new MockSnapshotter(fine, fine, overloaded, fine),});- expect(systemStatus.getCurrentStatus().isSystemIdle).to.be.eql(false);- expect(systemStatus.getHistoricalStatus().isSystemIdle).to.be.eql(false);+ expect(systemStatus.getCurrentStatus().isSystemIdle).toBe(false);+ expect(systemStatus.getHistoricalStatus().isSystemIdle).toBe(false);systemStatus = new SystemStatus({snapshotter: new MockSnapshotter(fine, overloaded, fine, fine),});- expect(systemStatus.getCurrentStatus().isSystemIdle).to.be.eql(false);- expect(systemStatus.getHistoricalStatus().isSystemIdle).to.be.eql(false);+ expect(systemStatus.getCurrentStatus().isSystemIdle).toBe(false);+ expect(systemStatus.getHistoricalStatus().isSystemIdle).toBe(false);systemStatus = new SystemStatus({snapshotter: new MockSnapshotter(overloaded, fine, fine, fine),});- expect(systemStatus.getCurrentStatus().isSystemIdle).to.be.eql(false);- expect(systemStatus.getHistoricalStatus().isSystemIdle).to.be.eql(false);+ expect(systemStatus.getCurrentStatus().isSystemIdle).toBe(false);+ expect(systemStatus.getHistoricalStatus().isSystemIdle).toBe(false);systemStatus = new SystemStatus({snapshotter: new MockSnapshotter(fine, fine, fine, overloaded),});- expect(systemStatus.getCurrentStatus().isSystemIdle).to.be.eql(false);- expect(systemStatus.getHistoricalStatus().isSystemIdle).to.be.eql(false);+ expect(systemStatus.getCurrentStatus().isSystemIdle).toBe(false);+ expect(systemStatus.getHistoricalStatus().isSystemIdle).toBe(false);});it('should overload when threshold is crossed', () => {@@ -127,29 +126,29 @@ describe('SystemStatus', () => {maxCpuOverloadedRatio: 0.5,maxClientOverloadedRatio: 0.5,});- expect(systemStatus.getCurrentStatus().isSystemIdle).to.be.eql(true);- expect(systemStatus.getHistoricalStatus().isSystemIdle).to.be.eql(true);+ expect(systemStatus.getCurrentStatus().isSystemIdle).toBe(true);+ expect(systemStatus.getHistoricalStatus().isSystemIdle).toBe(true);systemStatus.maxMemoryOverloadedRatio = 0.49;systemStatus.maxEventLoopOverloadedRatio = 0.49;systemStatus.maxCpuOverloadedRatio = 0.49;systemStatus.maxClientOverloadedRatio = 0.49;- expect(systemStatus.getCurrentStatus().isSystemIdle).to.be.eql(false);- expect(systemStatus.getHistoricalStatus().isSystemIdle).to.be.eql(false);+ expect(systemStatus.getCurrentStatus().isSystemIdle).toBe(false);+ expect(systemStatus.getHistoricalStatus().isSystemIdle).toBe(false);systemStatus.maxMemoryOverloadedRatio = 0.5;systemStatus.maxEventLoopOverloadedRatio = 0.5;systemStatus.maxCpuOverloadedRatio = 0.49;systemStatus.maxClientOverloadedRatio = 0.49;- expect(systemStatus.getCurrentStatus().isSystemIdle).to.be.eql(false);- expect(systemStatus.getHistoricalStatus().isSystemIdle).to.be.eql(false);+ expect(systemStatus.getCurrentStatus().isSystemIdle).toBe(false);+ expect(systemStatus.getHistoricalStatus().isSystemIdle).toBe(false);systemStatus.maxMemoryOverloadedRatio = 1;systemStatus.maxEventLoopOverloadedRatio = 1;systemStatus.maxCpuOverloadedRatio = 1;systemStatus.maxClientOverloadedRatio = 1;- expect(systemStatus.getCurrentStatus().isSystemIdle).to.be.eql(true);- expect(systemStatus.getHistoricalStatus().isSystemIdle).to.be.eql(true);+ expect(systemStatus.getCurrentStatus().isSystemIdle).toBe(true);+ expect(systemStatus.getHistoricalStatus().isSystemIdle).toBe(true);});it('should show different values for now and lately', () => {@@ -162,16 +161,16 @@ describe('SystemStatus', () => {maxClientOverloadedRatio: 0.5,});systemStatus.currentHistorySecs = 5;- expect(systemStatus.getCurrentStatus().isSystemIdle).to.be.eql(false);- expect(systemStatus.getHistoricalStatus().isSystemIdle).to.be.eql(true);+ expect(systemStatus.getCurrentStatus().isSystemIdle).toBe(false);+ expect(systemStatus.getHistoricalStatus().isSystemIdle).toBe(true);systemStatus.currentHistorySecs = 10;- expect(systemStatus.getCurrentStatus().isSystemIdle).to.be.eql(false);- expect(systemStatus.getHistoricalStatus().isSystemIdle).to.be.eql(true);+ expect(systemStatus.getCurrentStatus().isSystemIdle).toBe(false);+ expect(systemStatus.getHistoricalStatus().isSystemIdle).toBe(true);systemStatus.currentHistorySecs = 12;- expect(systemStatus.getCurrentStatus().isSystemIdle).to.be.eql(true);- expect(systemStatus.getHistoricalStatus().isSystemIdle).to.be.eql(true);+ expect(systemStatus.getCurrentStatus().isSystemIdle).toBe(true);+ expect(systemStatus.getHistoricalStatus().isSystemIdle).toBe(true);snaps = generateSnapsSync(95, true);systemStatus = new SystemStatus({@@ -182,20 +181,20 @@ describe('SystemStatus', () => {maxClientOverloadedRatio: 0.5,});systemStatus.currentHistorySecs = 5;- expect(systemStatus.getCurrentStatus().isSystemIdle).to.be.eql(true);- expect(systemStatus.getHistoricalStatus().isSystemIdle).to.be.eql(false);+ expect(systemStatus.getCurrentStatus().isSystemIdle).toBe(true);+ expect(systemStatus.getHistoricalStatus().isSystemIdle).toBe(false);systemStatus.currentHistorySecs = 10;- expect(systemStatus.getCurrentStatus().isSystemIdle).to.be.eql(true);- expect(systemStatus.getHistoricalStatus().isSystemIdle).to.be.eql(false);+ expect(systemStatus.getCurrentStatus().isSystemIdle).toBe(true);+ expect(systemStatus.getHistoricalStatus().isSystemIdle).toBe(false);systemStatus.currentHistorySecs = 12;- expect(systemStatus.getCurrentStatus().isSystemIdle).to.be.eql(false);- expect(systemStatus.getHistoricalStatus().isSystemIdle).to.be.eql(false);+ expect(systemStatus.getCurrentStatus().isSystemIdle).toBe(false);+ expect(systemStatus.getHistoricalStatus().isSystemIdle).toBe(false);});it('creates a snapshotter when none is passed', () => {const systemStatus = new SystemStatus();- expect(systemStatus.snapshotter).to.be.an.instanceof(Snapshotter);+ expect(systemStatus.snapshotter).toBeInstanceOf(Snapshotter);});});diff --git a/__tests__/constants.js b/__tests__/constants.jsnew file mode 100644index 000000000..89715f651--- /dev/null+++ b/__tests__/constants.js@@ -0,0 +1,15 @@+import { ACTOR_BASE_DOCKER_IMAGES, BUILD_TAG_LATEST, ENV_VARS } from 'apify-shared/consts';+import { ACTOR_EVENT_NAMES_EX } from '../build/constants';++describe('consts', () => {+ it('should contain constants from apify-shared', () => {+ expect(Array.isArray(ACTOR_BASE_DOCKER_IMAGES)).toBe(true);+ expect(typeof BUILD_TAG_LATEST).toBe('string');+ });++ it('should contain local constants', () => {+ expect(ENV_VARS).toBeInstanceOf(Object);+ expect(ACTOR_EVENT_NAMES_EX.CPU_INFO).toBe('cpuInfo');+ expect(ACTOR_EVENT_NAMES_EX.PERSIST_STATE).toBe('persistState');+ });+});diff --git a/test/crawlers/basic_crawler.js b/__tests__/crawlers/basic_crawler.jssimilarity index 83%rename from test/crawlers/basic_crawler.jsrename to __tests__/crawlers/basic_crawler.jsindex ab340eb3a..6831b4f77 100644--- a/test/crawlers/basic_crawler.js+++ b/__tests__/crawlers/basic_crawler.js@@ -1,4 +1,3 @@-import { expect } from 'chai';import _ from 'underscore';import sinon from 'sinon';import log from 'apify-shared/log';@@ -42,10 +41,11 @@ describe('BasicCrawler', () => {await requestList.initialize();await basicCrawler.run();- expect(processed).to.be.eql(sources);- expect(Date.now() - startedAt).to.be.within(200, 1000);- expect(await requestList.isFinished()).to.be.eql(true);- expect(await requestList.isEmpty()).to.be.eql(true);+ expect(processed).toEqual(sources);+ expect(Date.now() - startedAt).toBeGreaterThanOrEqual(200);+ expect(Date.now() - startedAt).toBeLessThanOrEqual(1000);+ expect(await requestList.isFinished()).toBe(true);+ expect(await requestList.isEmpty()).toBe(true);});it('should pause on migration event and persist RequestList state', async () => {@@ -81,10 +81,10 @@ describe('BasicCrawler', () => {runPromise.then(() => { finished = true; });await persistPromise;- expect(finished).to.be.eql(false);- expect(await requestList.isFinished()).to.be.eql(false);- expect(await requestList.isEmpty()).to.be.eql(false);- expect(processed.length).to.be.eql(200);+ expect(finished).toBe(false);+ expect(await requestList.isFinished()).toBe(false);+ expect(await requestList.isEmpty()).toBe(false);+ expect(processed.length).toBe(200);mock.verify();@@ -123,19 +123,19 @@ describe('BasicCrawler', () => {await requestList.initialize();await basicCrawler.run();- expect(processed['http://example.com/1'].userData.foo).to.be.eql('bar');- expect(processed['http://example.com/1'].errorMessages).to.be.a('null');- expect(processed['http://example.com/1'].retryCount).to.be.eql(0);- expect(processed['http://example.com/3'].userData.foo).to.be.eql('bar');- expect(processed['http://example.com/3'].errorMessages).to.be.a('null');- expect(processed['http://example.com/3'].retryCount).to.be.eql(0);+ expect(processed['http://example.com/1'].userData.foo).toBe('bar');+ expect(processed['http://example.com/1'].errorMessages).toBeNull();+ expect(processed['http://example.com/1'].retryCount).toBe(0);+ expect(processed['http://example.com/3'].userData.foo).toBe('bar');+ expect(processed['http://example.com/3'].errorMessages).toBeNull();+ expect(processed['http://example.com/3'].retryCount).toBe(0);- expect(processed['http://example.com/2'].userData.foo).to.be.a('undefined');- expect(processed['http://example.com/2'].errorMessages).to.have.lengthOf(11);- expect(processed['http://example.com/2'].retryCount).to.be.eql(10);+ expect(processed['http://example.com/2'].userData.foo).toBeUndefined();+ expect(processed['http://example.com/2'].errorMessages).toHaveLength(11);+ expect(processed['http://example.com/2'].retryCount).toBe(10);- expect(await requestList.isFinished()).to.be.eql(true);- expect(await requestList.isEmpty()).to.be.eql(true);+ expect(await requestList.isFinished()).toBe(true);+ expect(await requestList.isEmpty()).toBe(true);});it('should not retry requests with noRetry set to true ', async () => {@@ -144,7 +144,7 @@ describe('BasicCrawler', () => {noRetryRequest.doNotRetry('no retry');throw new Error('wrong error');} catch (err) {- expect(err.message).to.be.eql('no retry');+ expect(err.message).toBe('no retry');}const sources = [@@ -179,21 +179,21 @@ describe('BasicCrawler', () => {await requestList.initialize();await basicCrawler.run();- expect(processed['http://example.com/1'].userData.foo).to.be.eql('bar');- expect(processed['http://example.com/1'].errorMessages).to.have.lengthOf(1);- expect(processed['http://example.com/1'].retryCount).to.be.eql(0);- expect(processed['http://example.com/3'].userData.foo).to.be.eql('bar');- expect(processed['http://example.com/3'].errorMessages).to.have.lengthOf(1);- expect(processed['http://example.com/3'].retryCount).to.be.eql(0);+ expect(processed['http://example.com/1'].userData.foo).toBe('bar');+ expect(processed['http://example.com/1'].errorMessages).toHaveLength(1);+ expect(processed['http://example.com/1'].retryCount).toBe(0);+ expect(processed['http://example.com/3'].userData.foo).toBe('bar');+ expect(processed['http://example.com/3'].errorMessages).toHaveLength(1);+ expect(processed['http://example.com/3'].retryCount).toBe(0);- expect(processed['http://example.com/2'].userData.foo).to.be.eql('bar');- expect(processed['http://example.com/2'].errorMessages).to.have.lengthOf(11);- expect(processed['http://example.com/2'].retryCount).to.be.eql(10);+ expect(processed['http://example.com/2'].userData.foo).toBe('bar');+ expect(processed['http://example.com/2'].errorMessages).toHaveLength(11);+ expect(processed['http://example.com/2'].retryCount).toBe(10);- expect(handleFailedRequestFunctionCalls).to.be.eql(3);+ expect(handleFailedRequestFunctionCalls).toBe(3);- expect(await requestList.isFinished()).to.be.eql(true);- expect(await requestList.isEmpty()).to.be.eql(true);+ expect(await requestList.isFinished()).toBe(true);+ expect(await requestList.isEmpty()).toBe(true);});it('should allow to handle failed requests', async () => {@@ -226,17 +226,17 @@ describe('BasicCrawler', () => {await requestList.initialize();await basicCrawler.run();- expect(failed['http://example.com/1'].errorMessages).to.have.lengthOf(4);- expect(failed['http://example.com/1'].retryCount).to.be.eql(3);- expect(failed['http://example.com/2'].errorMessages).to.have.lengthOf(4);- expect(failed['http://example.com/2'].retryCount).to.be.eql(3);- expect(failed['http://example.com/3'].errorMessages).to.have.lengthOf(4);- expect(failed['http://example.com/3'].retryCount).to.be.eql(3);+ expect(failed['http://example.com/1'].errorMessages).toHaveLength(4);+ expect(failed['http://example.com/1'].retryCount).toBe(3);+ expect(failed['http://example.com/2'].errorMessages).toHaveLength(4);+ expect(failed['http://example.com/2'].retryCount).toBe(3);+ expect(failed['http://example.com/3'].errorMessages).toHaveLength(4);+ expect(failed['http://example.com/3'].retryCount).toBe(3);expect(_.values(failed)).to.have.length.of(3);expect(_.values(processed)).to.have.length.of(0);- expect(await requestList.isFinished()).to.be.eql(true);- expect(await requestList.isEmpty()).to.be.eql(true);- errors.forEach(error => expect(error).to.be.an('error'));+ expect(await requestList.isFinished()).toBe(true);+ expect(await requestList.isEmpty()).toBe(true);+ errors.forEach(error => expect(error).toBeInstanceOf(Error));});it('should require at least one of RequestQueue and RequestList', () => {@@ -244,10 +244,10 @@ describe('BasicCrawler', () => {const requestQueue = new RequestQueue('xxx');const handleRequestFunction = () => {};- expect(() => new Apify.BasicCrawler({ handleRequestFunction })).to.throw();- expect(() => new Apify.BasicCrawler({ handleRequestFunction, requestList })).to.not.throw();- expect(() => new Apify.BasicCrawler({ handleRequestFunction, requestQueue })).to.not.throw();- expect(() => new Apify.BasicCrawler({ handleRequestFunction, requestQueue, requestList })).to.not.throw();+ expect(() => new Apify.BasicCrawler({ handleRequestFunction })).toThrowError();+ expect(() => new Apify.BasicCrawler({ handleRequestFunction, requestList })).not.toThrowError();+ expect(() => new Apify.BasicCrawler({ handleRequestFunction, requestQueue })).not.toThrowError();+ expect(() => new Apify.BasicCrawler({ handleRequestFunction, requestQueue, requestList })).not.toThrowError();});it('should also support RequestQueueLocal', () => {@@ -255,8 +255,8 @@ describe('BasicCrawler', () => {const requestQueueLocal = new RequestQueueLocal('xxx', LOCAL_STORAGE_DIR);const handleRequestFunction = () => {};- expect(() => new Apify.BasicCrawler({ handleRequestFunction, requestQueue })).to.not.throw();- expect(() => new Apify.BasicCrawler({ handleRequestFunction, requestQueue: requestQueueLocal })).to.not.throw();+ expect(() => new Apify.BasicCrawler({ handleRequestFunction, requestQueue })).not.toThrowError();+ expect(() => new Apify.BasicCrawler({ handleRequestFunction, requestQueue: requestQueueLocal })).not.toThrowError();});it('should correctly combine RequestList and RequestQueue', async () => {@@ -368,19 +368,19 @@ describe('BasicCrawler', () => {await requestList.initialize();await basicCrawler.run();- expect(processed['http://example.com/0'].userData.foo).to.be.eql('bar');- expect(processed['http://example.com/0'].errorMessages).to.be.a('null');- expect(processed['http://example.com/0'].retryCount).to.be.eql(0);- expect(processed['http://example.com/2'].userData.foo).to.be.eql('bar');- expect(processed['http://example.com/2'].errorMessages).to.be.a('null');- expect(processed['http://example.com/2'].retryCount).to.be.eql(0);+ expect(processed['http://example.com/0'].userData.foo).toBe('bar');+ expect(processed['http://example.com/0'].errorMessages).toBeNull();+ expect(processed['http://example.com/0'].retryCount).toBe(0);+ expect(processed['http://example.com/2'].userData.foo).toBe('bar');+ expect(processed['http://example.com/2'].errorMessages).toBeNull();+ expect(processed['http://example.com/2'].retryCount).toBe(0);- expect(processed['http://example.com/1'].userData.foo).to.be.a('undefined');- expect(processed['http://example.com/1'].errorMessages).to.have.lengthOf(4);- expect(processed['http://example.com/1'].retryCount).to.be.eql(3);+ expect(processed['http://example.com/1'].userData.foo).toBeUndefined();+ expect(processed['http://example.com/1'].errorMessages).toHaveLength(4);+ expect(processed['http://example.com/1'].retryCount).toBe(3);- expect(await requestList.isFinished()).to.be.eql(true);- expect(await requestList.isEmpty()).to.be.eql(true);+ expect(await requestList.isFinished()).toBe(true);+ expect(await requestList.isEmpty()).toBe(true);mock.verify();});@@ -394,7 +394,7 @@ describe('BasicCrawler', () => {handleRequestFunction: () => {},});- expect(await crawler._isTaskReadyFunction()).to.be.eql(false); // eslint-disable-line no-underscore-dangle+ expect(await crawler._isTaskReadyFunction()).toBe(false); // eslint-disable-line no-underscore-dangle});it('should be possible to override isFinishedFunction of underlying AutoscaledPool', async () => {@@ -438,7 +438,7 @@ describe('BasicCrawler', () => {await basicCrawler.run();- expect(processed.includes(request0, request1)).to.be.eql(true);+ expect(processed.includes(request0, request1)).toBe(true);mock.verify();sinon.restore();@@ -479,21 +479,21 @@ describe('BasicCrawler', () => {await requestList.initialize();await basicCrawler.run();- expect(processed['http://example.com/1'].userData.foo).to.be.eql('bar');- expect(processed['http://example.com/1'].errorMessages).to.be.a('null');- expect(processed['http://example.com/1'].retryCount).to.be.eql(0);- expect(processed['http://example.com/3'].userData.foo).to.be.eql('bar');- expect(processed['http://example.com/3'].errorMessages).to.be.a('null');- expect(processed['http://example.com/3'].retryCount).to.be.eql(0);+ expect(processed['http://example.com/1'].userData.foo).toBe('bar');+ expect(processed['http://example.com/1'].errorMessages).toBeNull();+ expect(processed['http://example.com/1'].retryCount).toBe(0);+ expect(processed['http://example.com/3'].userData.foo).toBe('bar');+ expect(processed['http://example.com/3'].errorMessages).toBeNull();+ expect(processed['http://example.com/3'].retryCount).toBe(0);- expect(processed['http://example.com/2'].userData.foo).to.be.eql(undefined);- expect(processed['http://example.com/2'].errorMessages).to.have.lengthOf(4);- expect(processed['http://example.com/2'].retryCount).to.be.eql(3);+ expect(processed['http://example.com/2'].userData.foo).toEqual(undefined);+ expect(processed['http://example.com/2'].errorMessages).toHaveLength(4);+ expect(processed['http://example.com/2'].retryCount).toBe(3);- expect(handleFailedRequestFunctionCalls).to.be.eql(1);+ expect(handleFailedRequestFunctionCalls).toBe(1);- expect(await requestList.isFinished()).to.be.eql(false);- expect(await requestList.isEmpty()).to.be.eql(false);+ expect(await requestList.isFinished()).toBe(false);+ expect(await requestList.isEmpty()).toBe(false);});it('should load handledRequestCount from storages', async () => {@@ -519,7 +519,7 @@ describe('BasicCrawler', () => {await crawler.run();sinon.assert.called(stub);- expect(count).to.be.eql(7);+ expect(count).toBe(7);sinon.restore();const sources = _.range(1, 10).map(i => ({ url: `http://example.com/${i}` }));@@ -542,7 +542,7 @@ describe('BasicCrawler', () => {await crawler.run();sinon.assert.called(stub);- expect(count).to.be.eql(7);+ expect(count).toBe(7);sinon.restore();requestList = new Apify.RequestList({ sources });@@ -575,7 +575,7 @@ describe('BasicCrawler', () => {sinon.assert.called(queueStub);sinon.assert.notCalled(listStub);sinon.assert.callCount(addRequestStub, 7);- expect(count).to.be.eql(7);+ expect(count).toBe(7);sinon.restore();});@@ -594,8 +594,8 @@ describe('BasicCrawler', () => {});await crawler.run();- expect(results).to.have.lengthOf(1);- expect(results[0].url).to.be.eql(url);- results[0].errorMessages.forEach(msg => expect(msg).to.include('handleRequestFunction timed out'));+ expect(results).toHaveLength(1);+ expect(results[0].url).toEqual(url);+ results[0].errorMessages.forEach(msg => expect(msg).toEqual(expect.arrayContaining(['handleRequestFunction timed out'])));});});diff --git a/test/crawlers/cheerio_crawler.js b/__tests__/crawlers/cheerio_crawler.jssimilarity index 82%rename from test/crawlers/cheerio_crawler.jsrename to __tests__/crawlers/cheerio_crawler.jsindex 51e7d974c..e3773f50c 100644--- a/test/crawlers/cheerio_crawler.js+++ b/__tests__/crawlers/cheerio_crawler.js@@ -3,7 +3,6 @@ import EventEmitter from 'events';import rqst from 'request';import fs from 'fs';import path from 'path';-import { expect } from 'chai';import log from 'apify-shared/log';import { delayPromise } from 'apify-shared/utilities';import { ENV_VARS } from 'apify-shared/consts';@@ -179,15 +178,15 @@ describe('CheerioCrawler', () => {await requestList.initialize();await cheerioCrawler.run();- expect(processed).to.have.lengthOf(6);- expect(failed).to.have.lengthOf(0);+ expect(processed).toHaveLength(6);+ expect(failed).toHaveLength(0);processed.sort(comparator);processed.forEach((request, id) => {- expect(request.url).to.be.eql(sources[id].url);- expect(request.userData.title).to.be.eql('Example Domain');- expect(request.userData.html).to.be.a('string');- expect(request.userData.html.length).not.to.be.eql(0);+ expect(request.url).toEqual(sources[id].url);+ expect(request.userData.title).toBe('Example Domain');+ expect(typeof request.userData.html).toBe('string');+ expect(request.userData.html.length).not.toBe(0);});});@@ -217,8 +216,8 @@ describe('CheerioCrawler', () => {},});await cheerioCrawler.run();- expect(failed).to.be.eql(null);- expect(success.url).to.be.eql(MODIFIED_URL);+ expect(failed).toBe(null);+ expect(success.url).toEqual(MODIFIED_URL);});describe('should timeout', () => {@@ -263,13 +262,13 @@ describe('CheerioCrawler', () => {await requestList.initialize();await cheerioCrawler.run();- expect(processed).to.have.lengthOf(0);- expect(failed).to.have.lengthOf(3);+ expect(processed).toHaveLength(0);+ expect(failed).toHaveLength(3);failed.forEach((request) => {- expect(request.errorMessages).to.have.lengthOf(2);- expect(request.errorMessages[0]).to.include('request timed out');- expect(request.errorMessages[1]).to.include('request timed out');+ expect(request.errorMessages).toHaveLength(2);+ expect(request.errorMessages[0]).toEqual(expect.arrayContaining(['request timed out']));+ expect(request.errorMessages[1]).toEqual(expect.arrayContaining(['request timed out']));});});@@ -303,13 +302,13 @@ describe('CheerioCrawler', () => {await requestList.initialize();await cheerioCrawler.run();- expect(processed).to.have.lengthOf(0);- expect(failed).to.have.lengthOf(3);+ expect(processed).toHaveLength(0);+ expect(failed).toHaveLength(3);failed.forEach((request) => {- expect(request.errorMessages).to.have.lengthOf(2);- expect(request.errorMessages[0]).to.include('handlePageFunction timed out');- expect(request.errorMessages[1]).to.include('handlePageFunction timed out');+ expect(request.errorMessages).toHaveLength(2);+ expect(request.errorMessages[0]).toEqual(expect.arrayContaining(['handlePageFunction timed out']));+ expect(request.errorMessages[1]).toEqual(expect.arrayContaining(['handlePageFunction timed out']));});});});@@ -341,8 +340,8 @@ describe('CheerioCrawler', () => {await requestList.initialize();await cheerioCrawler.run();- expect(processed).to.have.lengthOf(2);- expect(failed).to.have.lengthOf(0);+ expect(processed).toHaveLength(2);+ expect(failed).toHaveLength(0);});});@@ -358,7 +357,7 @@ describe('CheerioCrawler', () => {});await crawler.run();- headers.forEach(h => expect(h.Accept).to.be.eql('text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'));+ headers.forEach(h => expect(h.Accept).toBe('text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'));});describe('by throwing', () => {@@ -404,12 +403,13 @@ describe('CheerioCrawler', () => {await crawler.run();- expect(handlePageInvocationCount).to.be.eql(0);- expect(errorMessages).to.have.lengthOf(4);- errorMessages.forEach(msg => expect(msg)- .to.include('Content-Type application/json, but only text/html, '- + 'application/xhtml+xml are allowed. Skipping resource.'));- expect(chunkReadCount).to.be.eql(0);+ expect(handlePageInvocationCount).toBe(0);+ expect(errorMessages).toHaveLength(4);+ errorMessages.forEach(msg => expect(msg).toEqual(+ expect.arrayContaining(['Content-Type application/json, but only text/html, '+ + 'application/xhtml+xml are allowed. Skipping resource.'])+ ));+ expect(chunkReadCount).toBe(0);});xit('when response stream emits an error event', async () => {@@ -429,9 +429,9 @@ describe('CheerioCrawler', () => {});await crawler.run();- expect(handlePageInvocationCount).to.be.eql(0);- expect(errorMessages).to.have.lengthOf(4);- errorMessages.forEach(msg => expect(msg).to.include('Error in stream.'));+ expect(handlePageInvocationCount).toBe(0);+ expect(errorMessages).toHaveLength(4);+ errorMessages.forEach(msg => expect(msg).toEqual(expect.arrayContaining(['Error in stream.'])));});xit('when request stream emits an error event', async () => {@@ -461,9 +461,9 @@ describe('CheerioCrawler', () => {await crawler.run();- expect(handlePageInvocationCount).to.be.eql(0);- expect(errorMessages).to.have.lengthOf(8);- errorMessages.forEach(msg => expect(msg).to.include('Request Error.'));+ expect(handlePageInvocationCount).toBe(0);+ expect(errorMessages).toHaveLength(8);+ errorMessages.forEach(msg => expect(msg).toEqual(expect.arrayContaining(['Request Error.'])));});it('when statusCode >= 500 and text/html is received', async () => {@@ -486,9 +486,9 @@ describe('CheerioCrawler', () => {});await crawler.run();- expect(handlePageInvocationCount).to.be.eql(0);- expect(errorMessages).to.have.lengthOf(8);- errorMessages.forEach(msg => expect(msg).to.include('Internal Server Error'));+ expect(handlePageInvocationCount).toBe(0);+ expect(errorMessages).toHaveLength(8);+ errorMessages.forEach(msg => expect(msg).toEqual(expect.arrayContaining(['Internal Server Error'])));});it('when statusCode >= 500 and application/json is received', async () => {@@ -504,9 +504,9 @@ describe('CheerioCrawler', () => {});await crawler.run();- expect(handlePageInvocationCount).to.be.eql(0);- expect(errorMessages).to.have.lengthOf(8);- errorMessages.forEach(msg => expect(msg).to.include('CUSTOM_ERROR'));+ expect(handlePageInvocationCount).toBe(0);+ expect(errorMessages).toHaveLength(8);+ errorMessages.forEach(msg => expect(msg).toEqual(expect.arrayContaining(['CUSTOM_ERROR'])));});it('when 406 is received', async () => {@@ -528,9 +528,11 @@ describe('CheerioCrawler', () => {});await crawler.run();- expect(handlePageInvocationCount).to.be.eql(0);- expect(errorMessages).to.have.lengthOf(4);- errorMessages.forEach(msg => expect(msg).to.include('is not available in HTML format. Skipping resource.'));+ expect(handlePageInvocationCount).toBe(0);+ expect(errorMessages).toHaveLength(4);+ errorMessages.forEach(msg => expect(msg).toEqual(+ expect.arrayContaining(['is not available in HTML format. Skipping resource.'])+ ));});xit('when status is ok, but a wrong content type is received', async () => {@@ -559,10 +561,12 @@ describe('CheerioCrawler', () => {await crawler.run();- expect(handlePageInvocationCount).to.be.eql(0);- expect(errorMessages).to.have.lengthOf(4);- errorMessages.forEach(msg => expect(msg).to.include('served Content-Type application/json instead of text/html'));- expect(chunkReadCount).to.be.eql(0);+ expect(handlePageInvocationCount).toBe(0);+ expect(errorMessages).toHaveLength(4);+ errorMessages.forEach(msg => expect(msg).toEqual(+ expect.arrayContaining(['served Content-Type application/json instead of text/html'])+ ));+ expect(chunkReadCount).toBe(0);});});});@@ -587,7 +591,7 @@ describe('CheerioCrawler', () => {},});await crawler.run();- expect(handledRequests).to.be.eql(contentTypes.length);+ expect(handledRequests).toEqual(contentTypes.length);});describe('should works with all content types from options.additionalMimeTypes', () => {@@ -614,27 +618,27 @@ describe('CheerioCrawler', () => {});await crawler.run();- expect(handleFailedInvocationCount).to.be.eql(0);- expect(handlePageInvocationParams.length).to.be.eql(sources.length);+ expect(handleFailedInvocationCount).toBe(0);+ expect(handlePageInvocationParams.length).toEqual(sources.length);});it('when response is application/json', async () => {const jsonRequestParams = handlePageInvocationParams[0];- expect(jsonRequestParams.json).to.be.an('object');- expect(jsonRequestParams.body).to.be.eql(Buffer.from(JSON.stringify(responseSamples.json)));- expect(jsonRequestParams.contentType.type).to.be.eql('application/json');+ expect(jsonRequestParams.json).toBeInstanceOf(Object);+ expect(jsonRequestParams.body).toEqual(Buffer.from(JSON.stringify(responseSamples.json)));+ expect(jsonRequestParams.contentType.type).toBe('application/json');});it('when response is application/xml', async () => {const xmlRequestParams = handlePageInvocationParams[1];- expect(xmlRequestParams.body).to.be.an('string');- expect(xmlRequestParams.body).to.be.eql(responseSamples.xml);- expect(xmlRequestParams.$).to.be.an('function');- expect(xmlRequestParams.contentType.type).to.be.eql('application/xml');+ expect(typeof xmlRequestParams.body).toBe('string');+ expect(xmlRequestParams.body).toEqual(responseSamples.xml);+ expect(xmlRequestParams.$).toBeInstanceOf(Function);+ expect(xmlRequestParams.contentType.type).toBe('application/xml');});it('when response is image/png', async () => {const imageRequestParams = handlePageInvocationParams[2];- expect(imageRequestParams.body).to.be.instanceof(Buffer);- expect(imageRequestParams.body).to.be.eql(responseSamples.image);- expect(imageRequestParams.contentType.type).to.be.eql('image/png');+ expect(imageRequestParams.body).toBeInstanceOf(Buffer);+ expect(imageRequestParams.body).toEqual(responseSamples.image);+ expect(imageRequestParams.contentType.type).toBe('image/png');});});@@ -675,11 +679,11 @@ describe('CheerioCrawler', () => {const shuffled = crawler.proxyUrls;await crawler.run();- expect(proxies).to.have.lengthOf(4);- expect(proxies[0]).to.be.eql(shuffled[0]);- expect(proxies[1]).to.be.eql(shuffled[1]);- expect(proxies[2]).to.be.eql(shuffled[2]);- expect(proxies[3]).to.be.eql(shuffled[0]);+ expect(proxies).toHaveLength(4);+ expect(proxies[0]).toEqual(shuffled[0]);+ expect(proxies[1]).toEqual(shuffled[1]);+ expect(proxies[2]).toEqual(shuffled[2]);+ expect(proxies[3]).toEqual(shuffled[0]);});it('should work with useApifyProxy', async () => {@@ -707,10 +711,10 @@ describe('CheerioCrawler', () => {delete process.env[ENV_VARS.PROXY_PASSWORD];// expect(proxies).to.have.lengthOf(1);- expect(proxies[0]).to.be.eql(proxy);- expect(proxies[1]).to.be.eql(proxy);- expect(proxies[2]).to.be.eql(proxy);- expect(proxies[3]).to.be.eql(proxy);+ expect(proxies[0]).toEqual(proxy);+ expect(proxies[1]).toEqual(proxy);+ expect(proxies[2]).toEqual(proxy);+ expect(proxies[3]).toEqual(proxy);});it('should work with useApifyProxy and other opts', async () => {@@ -745,10 +749,10 @@ describe('CheerioCrawler', () => {delete process.env[ENV_VARS.PROXY_PASSWORD];// expect(proxies).to.have.lengthOf(1);- expect(proxies[0]).to.be.eql(proxy);- expect(proxies[1]).to.be.eql(proxy);- expect(proxies[2]).to.be.eql(proxy);- expect(proxies[3]).to.be.eql(proxy);+ expect(proxies[0]).toEqual(proxy);+ expect(proxies[1]).toEqual(proxy);+ expect(proxies[2]).toEqual(proxy);+ expect(proxies[3]).toEqual(proxy);});describe('throws', () => {@@ -771,7 +775,7 @@ describe('CheerioCrawler', () => {});throw new Error('Invalid error.');} catch (err) {- expect(err.message).to.include('useApifyProxy');+ expect(err.message).toEqual(expect.arrayContaining(['useApifyProxy']));}});@@ -785,7 +789,7 @@ describe('CheerioCrawler', () => {});throw new Error('Invalid error.');} catch (err) {- expect(err.message).to.include('must not be empty');+ expect(err.message).toEqual(expect.arrayContaining(['must not be empty']));}});});diff --git a/test/crawlers/data/apify.png b/__tests__/crawlers/data/apify.pngsimilarity index 100%rename from test/crawlers/data/apify.pngrename to __tests__/crawlers/data/apify.pngdiff --git a/test/crawlers/data/sample.html b/__tests__/crawlers/data/sample.htmlsimilarity index 100%rename from test/crawlers/data/sample.htmlrename to __tests__/crawlers/data/sample.htmldiff --git a/test/crawlers/puppeteer_crawler.js b/__tests__/crawlers/puppeteer_crawler.jssimilarity index 88%rename from test/crawlers/puppeteer_crawler.jsrename to __tests__/crawlers/puppeteer_crawler.jsindex 259997a0e..367c8ccaa 100644--- a/test/crawlers/puppeteer_crawler.js+++ b/__tests__/crawlers/puppeteer_crawler.js@@ -1,4 +1,3 @@-import { expect } from 'chai';import log from 'apify-shared/log';import { ENV_VARS } from 'apify-shared/consts';import * as Apify from '../../build';@@ -34,7 +33,7 @@ describe('PuppeteerCrawler', () => {const handlePageFunction = async ({ page, request, response }) => {await page.waitFor('title');- expect(await response.status()).to.be.eql(200);+ expect(await response.status()).toBe(200);request.userData.title = await page.title();processed.push(request);};@@ -50,12 +49,12 @@ describe('PuppeteerCrawler', () => {await requestList.initialize();await puppeteerCrawler.run();- expect(processed).to.have.lengthOf(6);- expect(failed).to.have.lengthOf(0);+ expect(processed).toHaveLength(6);+ expect(failed).toHaveLength(0);processed.forEach((request, id) => {- expect(request.url).to.be.eql(sources[id].url);- expect(request.userData.title).to.be.eql('Example Domain');+ expect(request.url).toEqual(sources[id].url);+ expect(request.userData.title).toBe('Example Domain');});});@@ -88,7 +87,7 @@ describe('PuppeteerCrawler', () => {await requestList.initialize();await puppeteerCrawler.run();- expect(failedCalled).to.eql(false);+ expect(failedCalled).toBe(false);}});});diff --git a/test/crawlers/statistics.js b/__tests__/crawlers/statistics.jssimilarity index 86%rename from test/crawlers/statistics.jsrename to __tests__/crawlers/statistics.jsindex 0af610c0b..59b221242 100644--- a/test/crawlers/statistics.js+++ b/__tests__/crawlers/statistics.js@@ -1,4 +1,3 @@-import { expect } from 'chai';import sinon from 'sinon';import log from 'apify-shared/log';import Statistics from '../../build/crawlers/statistics';@@ -28,7 +27,7 @@ describe('Statistics', () => {stats.finishJob(0);clock.tick(1);const current = stats.getCurrent();- expect(current).to.be.eql({+ expect(current).toEqual({avgDurationMillis: 1,perMinute: getPerMinute(1, 2),finished: 1,@@ -43,7 +42,7 @@ describe('Statistics', () => {stats.failJob(0);clock.tick(1);const current = stats.getCurrent();- expect(current).to.be.eql({+ expect(current).toEqual({avgDurationMillis: Infinity,perMinute: 0,finished: 0,@@ -63,7 +62,7 @@ describe('Statistics', () => {stats.startJob(2);stats.finishJob(2);const current = stats.getCurrent();- expect(current).to.be.eql({+ expect(current).toEqual({avgDurationMillis: Infinity,perMinute: Infinity,finished: 3,@@ -87,7 +86,7 @@ describe('Statistics', () => {clock.tick(10); // since startedAt: 25msconst current = stats.getCurrent();- expect(current).to.be.eql({+ expect(current).toEqual({avgDurationMillis: (13 + 3) / 2,perMinute: getPerMinute(2, 25),finished: 2,@@ -107,11 +106,11 @@ describe('Statistics', () => {stats.finishJob(0);stats.startLogging();clock.tick(50000);- expect(logged).to.have.lengthOf(0);+ expect(logged).toHaveLength(0);clock.tick(10001);- expect(logged).to.have.lengthOf(1);- expect(logged[0][0]).to.eql('Statistics');- expect(logged[0][1]).to.eql({+ expect(logged).toHaveLength(1);+ expect(logged[0][0]).toBe('Statistics');+ expect(logged[0][1]).toEqual({avgDurationMillis: 1,perMinute: 1,finished: 1,@@ -120,9 +119,9 @@ describe('Statistics', () => {});stats.stopLogging();clock.tick(60001);- expect(logged).to.have.lengthOf(1);- expect(logged[0][0]).to.eql('Statistics');- expect(logged[0][1]).to.eql({+ expect(logged).toHaveLength(1);+ expect(logged[0][0]).toBe('Statistics');+ expect(logged[0][1]).toEqual({avgDurationMillis: 1,perMinute: 1,finished: 1,diff --git a/test/data/html_to_text_test.html b/__tests__/data/html_to_text_test.htmlsimilarity index 100%rename from test/data/html_to_text_test.htmlrename to __tests__/data/html_to_text_test.htmldiff --git a/test/data/html_to_text_test.txt b/__tests__/data/html_to_text_test.txtsimilarity index 100%rename from test/data/html_to_text_test.txtrename to __tests__/data/html_to_text_test.txtdiff --git a/test/data/inject_file.txt b/__tests__/data/inject_file.txtsimilarity index 100%rename from test/data/inject_file.txtrename to __tests__/data/inject_file.txtdiff --git a/test/data/invalid_url_list.txt b/__tests__/data/invalid_url_list.txtsimilarity index 100%rename from test/data/invalid_url_list.txtrename to __tests__/data/invalid_url_list.txtdiff --git a/test/data/lipsum.txt b/__tests__/data/lipsum.txtsimilarity index 100%rename from test/data/lipsum.txtrename to __tests__/data/lipsum.txtdiff --git a/test/data/simple_url_list.txt b/__tests__/data/simple_url_list.txtsimilarity index 100%rename from test/data/simple_url_list.txtrename to __tests__/data/simple_url_list.txtdiff --git a/test/data/tricky_url_list.txt b/__tests__/data/tricky_url_list.txtsimilarity index 100%rename from test/data/tricky_url_list.txtrename to __tests__/data/tricky_url_list.txtdiff --git a/test/data/unicode+comma_url_list.txt b/__tests__/data/unicode+comma_url_list.txtsimilarity index 100%rename from test/data/unicode+comma_url_list.txtrename to __tests__/data/unicode+comma_url_list.txtdiff --git a/test/data/unicode_url_list.txt b/__tests__/data/unicode_url_list.txtsimilarity index 100%rename from test/data/unicode_url_list.txtrename to __tests__/data/unicode_url_list.txtdiff --git a/test/dataset.js b/__tests__/dataset.jssimilarity index 84%rename from test/dataset.jsrename to __tests__/dataset.jsindex e117722e2..9ec9c60cc 100644--- a/test/dataset.js+++ b/__tests__/dataset.js@@ -1,4 +1,3 @@-import { expect } from 'chai';import fs from 'fs-extra';import path from 'path';import sinon from 'sinon';@@ -37,15 +36,15 @@ describe('dataset', () => {{ foo: 'from-array-1', arr: [1, 2, 3] },]);- expect(read('my-dataset', 1)).to.be.eql({ foo: 'bar' });- expect(read('my-dataset', 2)).to.be.eql({ foo: 'hotel' });- expect(read('my-dataset', 3)).to.be.eql({ foo: 'from-array-1', arr: [1, 2, 3] });- expect(read('my-dataset', 4)).to.be.eql({ foo: 'from-array-1', arr: [1, 2, 3] });+ expect(read('my-dataset', 1)).toEqual({ foo: 'bar' });+ expect(read('my-dataset', 2)).toEqual({ foo: 'hotel' });+ expect(read('my-dataset', 3)).toEqual({ foo: 'from-array-1', arr: [1, 2, 3] });+ expect(read('my-dataset', 4)).toEqual({ foo: 'from-array-1', arr: [1, 2, 3] });// Correctly initializes the state.const newDataset = new DatasetLocal('my-dataset', LOCAL_STORAGE_DIR);await newDataset.pushData({ foo2: 'bar2' });- expect(read('my-dataset', 5)).to.be.eql({ foo2: 'bar2' });+ expect(read('my-dataset', 5)).toEqual({ foo2: 'bar2' });// Drop works.const datasetDir = path.join(LOCAL_STORAGE_DIR, LOCAL_STORAGE_SUBDIR, 'my-dataset');@@ -69,7 +68,7 @@ describe('dataset', () => {{ foo: 'd' },]);- expect(await dataset.getData()).to.be.eql({+ expect(await dataset.getData()).toEqual({items: [{ foo: 'a' },{ foo: 'b' },@@ -82,7 +81,7 @@ describe('dataset', () => {limit: LOCAL_GET_ITEMS_DEFAULT_LIMIT,});- expect(await dataset.getData({ offset: 2 })).to.be.eql({+ expect(await dataset.getData({ offset: 2 })).toEqual({items: [{ foo: 'c' },{ foo: 'd' },@@ -93,7 +92,7 @@ describe('dataset', () => {limit: LOCAL_GET_ITEMS_DEFAULT_LIMIT,});- expect(await dataset.getData({ offset: 1, limit: 2 })).to.be.eql({+ expect(await dataset.getData({ offset: 1, limit: 2 })).toEqual({items: [{ foo: 'b' },{ foo: 'c' },@@ -104,7 +103,7 @@ describe('dataset', () => {limit: 2,});- expect(await dataset.getData({ offset: 10 })).to.be.eql({+ expect(await dataset.getData({ offset: 10 })).toEqual({items: [],total: 4,offset: 10,@@ -124,16 +123,16 @@ describe('dataset', () => {delete process.env[ENV_VARS.USER_ID];let info = await dataset.getInfo();- expect(info).to.be.an('object');- expect(info.id).to.be.eql(datasetName);- expect(info.name).to.be.eql(datasetName);- expect(info.userId).to.be.eql(null);- expect(info.itemCount).to.be.eql(0);- expect(info.cleanItemCount).to.be.eql(0);+ expect(info).toBeInstanceOf(Object);+ expect(info.id).toEqual(datasetName);+ expect(info.name).toEqual(datasetName);+ expect(info.userId).toBe(null);+ expect(info.itemCount).toBe(0);+ expect(info.cleanItemCount).toBe(0);const cTime = info.createdAt.getTime();let mTime = info.modifiedAt.getTime();- expect(cTime).to.be.below(Date.now() + 1);- expect(cTime).to.be.eql(mTime);+ expect(cTime).toBeLessThan(Date.now() + 1);+ expect(cTime).toEqual(mTime);await dataset.pushData([{ foo: 'a' },@@ -144,17 +143,17 @@ describe('dataset', () => {await Apify.utils.sleep(2);info = await dataset.getInfo();- expect(info).to.be.an('object');- expect(info.id).to.be.eql(datasetName);- expect(info.name).to.be.eql(datasetName);- expect(info.userId).to.be.eql(null);- expect(info.itemCount).to.be.eql(4);- expect(info.cleanItemCount).to.be.eql(4);+ expect(info).toBeInstanceOf(Object);+ expect(info.id).toEqual(datasetName);+ expect(info.name).toEqual(datasetName);+ expect(info.userId).toBe(null);+ expect(info.itemCount).toBe(4);+ expect(info.cleanItemCount).toBe(4);mTime = info.modifiedAt.getTime();let aTime = info.accessedAt.getTime();- expect(cTime).to.be.below(Date.now());- expect(cTime).to.be.below(mTime);- expect(mTime).to.be.eql(aTime);+ expect(cTime).toBeLessThan(Date.now());+ expect(cTime).toBeLessThan(mTime);+ expect(mTime).toEqual(aTime);await dataset.getData();await Apify.utils.sleep(2);@@ -166,19 +165,19 @@ describe('dataset', () => {process.env[ENV_VARS.USER_ID] = userId;info = await dataset.getInfo();- expect(info).to.be.an('object');- expect(info.id).to.be.eql(datasetName);- expect(info.name).to.be.eql(datasetName);- expect(info.userId).to.be.eql(userId);- expect(info.itemCount).to.be.eql(4);- expect(info.cleanItemCount).to.be.eql(4);+ expect(info).toBeInstanceOf(Object);+ expect(info.id).toEqual(datasetName);+ expect(info.name).toEqual(datasetName);+ expect(info.userId).toEqual(userId);+ expect(info.itemCount).toBe(4);+ expect(info.cleanItemCount).toBe(4);const cTime2 = info.createdAt.getTime();mTime = info.modifiedAt.getTime();aTime = info.accessedAt.getTime();- expect(cTime).to.be.eql(cTime2);- expect(mTime).to.be.below(aTime);- expect(mTime).to.be.below(now);- expect(aTime).to.be.below(now);+ expect(cTime).toEqual(cTime2);+ expect(mTime).toBeLessThan(aTime);+ expect(mTime).toBeLessThan(now);+ expect(aTime).toBeLessThan(now);// Restore.delete process.env[ENV_VARS.USER_ID];@@ -200,14 +199,14 @@ describe('dataset', () => {items.push(item);indexes.push(index);});- expect(result).to.be.eql(undefined);- expect(items).to.be.eql([+ expect(result).toEqual(undefined);+ expect(items).toEqual([{ foo: 'a' },{ foo: 'b' },{ foo: 'c' },{ foo: 'd' },]);- expect(indexes).to.be.eql([0, 1, 2, 3]);+ expect(indexes).toEqual([0, 1, 2, 3]);});it('map() should work', async () => {@@ -222,7 +221,7 @@ describe('dataset', () => {return Object.assign({ index, bar: 'xxx' }, item);});- expect(result).to.be.eql([+ expect(result).toEqual([{ foo: 'a', index: 0, bar: 'xxx' },{ foo: 'b', index: 1, bar: 'xxx' },{ foo: 'c', index: 2, bar: 'xxx' },@@ -243,7 +242,7 @@ describe('dataset', () => {return Promise.resolve(res);});- expect(result).to.be.eql([+ expect(result).toEqual([{ foo: 'a', index: 0, bar: 'xxx' },{ foo: 'b', index: 1, bar: 'xxx' },{ foo: 'c', index: 2, bar: 'xxx' },@@ -266,7 +265,7 @@ describe('dataset', () => {return memo.concat(item);}, []);- expect(result).to.be.eql([+ expect(result).toEqual([{ foo: 'a', index: 0, bar: 'xxx' },{ foo: 'b', index: 1, bar: 'xxx' },{ foo: 'c', index: 2, bar: 'xxx' },@@ -289,7 +288,7 @@ describe('dataset', () => {return Promise.resolve(memo.concat(item));}, []);- expect(result).to.be.eql([+ expect(result).toEqual([{ foo: 'a', index: 0, bar: 'xxx' },{ foo: 'b', index: 1, bar: 'xxx' },{ foo: 'c', index: 2, bar: 'xxx' },@@ -312,8 +311,8 @@ describe('dataset', () => {return Promise.resolve(memo.foo > item.foo ? memo : item);});- expect(result.foo).to.be.eql(5);- expect(calledForIndexes).to.be.eql([1, 2, 3]);+ expect(result.foo).toBe(5);+ expect(calledForIndexes).toEqual([1, 2, 3]);});it('deprecated delete() still works', async () => {@@ -432,8 +431,8 @@ describe('dataset', () => {await dataset.pushData({ foo: full });throw new Error('Should fail!');} catch (err) {- expect(err).to.be.an('error');- expect(err.message).to.include('Data item is too large');+ expect(err).toBeInstanceOf(Error);+ expect(err.message).toEqual(expect.arrayContaining(['Data item is too large']));}mock.expects('deleteDataset').once()@@ -457,8 +456,8 @@ describe('dataset', () => {]);throw new Error('Should fail!');} catch (err) {- expect(err).to.be.an('error');- expect(err.message).to.include('Data item at index 3 is too large');+ expect(err).toBeInstanceOf(Error);+ expect(err.message).toEqual(expect.arrayContaining(['Data item at index 3 is too large']));}mock.expects('deleteDataset').once()@@ -495,7 +494,7 @@ describe('dataset', () => {const result = await dataset.getData({ limit: 2, offset: 3 });- expect(result).to.be.eql(expected);+ expect(result).toEqual(expected);mock.verify();mock.restore();@@ -522,7 +521,7 @@ describe('dataset', () => {const result = await dataset.getInfo();- expect(result).to.be.eql(expected);+ expect(result).toEqual(expected);mock.verify();mock.restore();@@ -586,14 +585,14 @@ describe('dataset', () => {}, {limit: 2,});- expect(result).to.be.eql(undefined);- expect(items).to.be.eql([+ expect(result).toEqual(undefined);+ expect(items).toEqual([{ foo: 'a' },{ foo: 'b' },{ foo: 'c' },{ foo: 'd' },]);- expect(indexes).to.be.eql([0, 1, 2, 3]);+ expect(indexes).toEqual([0, 1, 2, 3]);restoreAndVerify();});@@ -607,7 +606,7 @@ describe('dataset', () => {limit: 2,});- expect(result).to.be.eql([+ expect(result).toEqual([{ foo: 'a', index: 0, bar: 'xxx' },{ foo: 'b', index: 1, bar: 'xxx' },{ foo: 'c', index: 2, bar: 'xxx' },@@ -627,7 +626,7 @@ describe('dataset', () => {limit: 2,});- expect(result).to.be.eql([+ expect(result).toEqual([{ foo: 'a', index: 0, bar: 'xxx' },{ foo: 'b', index: 1, bar: 'xxx' },{ foo: 'c', index: 2, bar: 'xxx' },@@ -649,7 +648,7 @@ describe('dataset', () => {limit: 2,});- expect(result).to.be.eql([+ expect(result).toEqual([{ foo: 'a', index: 0, bar: 'xxx' },{ foo: 'b', index: 1, bar: 'xxx' },{ foo: 'c', index: 2, bar: 'xxx' },@@ -671,7 +670,7 @@ describe('dataset', () => {limit: 2,});- expect(result).to.be.eql([+ expect(result).toEqual([{ foo: 'a', index: 0, bar: 'xxx' },{ foo: 'b', index: 1, bar: 'xxx' },{ foo: 'c', index: 2, bar: 'xxx' },@@ -729,8 +728,8 @@ describe('dataset', () => {limit: 2,});- expect(result.foo).to.be.eql(5);- expect(calledForIndexes).to.be.eql([1, 2, 3]);+ expect(result.foo).toBe(5);+ expect(calledForIndexes).toEqual([1, 2, 3]);});it('deprecated delete() still works', async () => {@@ -816,8 +815,8 @@ describe('dataset', () => {await Apify.pushData({ foo: 'bar' });await Apify.pushData({ foo: 'hotel' });- expect(read('some-id-9', 1)).to.be.eql({ foo: 'bar' });- expect(read('some-id-9', 2)).to.be.eql({ foo: 'hotel' });+ expect(read('some-id-9', 1)).toEqual({ foo: 'bar' });+ expect(read('some-id-9', 2)).toEqual({ foo: 'hotel' });delete process.env[ENV_VARS.DEFAULT_DATASET_ID];delete process.env[ENV_VARS.LOCAL_STORAGE_DIR];@@ -829,22 +828,22 @@ describe('dataset', () => {// Basicconst obj = { foo: 'bar' };const json = JSON.stringify(obj);- expect(checkAndSerialize({}, 100)).to.be.eql('{}');- expect(checkAndSerialize(obj, 100)).to.be.eql(json);+ expect(checkAndSerialize({}, 100)).toBe('{}');+ expect(checkAndSerialize(obj, 100)).toEqual(json);// With index- expect(checkAndSerialize(obj, 100, 1)).to.be.eql(json);+ expect(checkAndSerialize(obj, 100, 1)).toEqual(json);// Too large- expect(() => checkAndSerialize(obj, 5)).to.throw(Error, 'Data item is too large');- expect(() => checkAndSerialize(obj, 5, 7)).to.throw(Error, 'at index 7');+ expect(() => checkAndSerialize(obj, 5)).toThrowError(Error);+ expect(() => checkAndSerialize(obj, 5, 7)).toThrowError(Error);// Bad JSONconst bad = {};bad.bad = bad;- expect(() => checkAndSerialize(bad, 100)).to.throw(Error, 'not serializable');+ expect(() => checkAndSerialize(bad, 100)).toThrowError(Error);// Bad dataconst str = 'hello';- expect(() => checkAndSerialize(str, 100)).to.throw(Error, 'not serializable');- expect(() => checkAndSerialize([], 100)).to.throw(Error, 'not serializable');- expect(() => checkAndSerialize([str, str], 100)).to.throw(Error, 'not serializable');+ expect(() => checkAndSerialize(str, 100)).toThrowError(Error);+ expect(() => checkAndSerialize([], 100)).toThrowError(Error);+ expect(() => checkAndSerialize([str, str], 100)).toThrowError(Error);});it('chunkBySize', () => {const obj = { foo: 'bar' };@@ -856,22 +855,22 @@ describe('dataset', () => {const tripleChunk = `[${json},${json},${json}]`;const tripleSize = Buffer.byteLength(tripleChunk);// Empty array- expect(chunkBySize([], 10)).to.be.eql([]);+ expect(chunkBySize([], 10)).toEqual([]);// Fits easily- expect(chunkBySize([json], size + 10)).to.be.eql([json]);- expect(chunkBySize(triple, tripleSize + 10)).to.be.eql([tripleChunk]);+ expect(chunkBySize([json], size + 10)).toEqual([json]);+ expect(chunkBySize(triple, tripleSize + 10)).toEqual([tripleChunk]);// Parses back to original objects- expect(originalTriple).to.be.eql(JSON.parse(tripleChunk));+ expect(originalTriple).toEqual(JSON.parse(tripleChunk));// Fits exactly- expect(chunkBySize([json], size)).to.be.eql([json]);- expect(chunkBySize(triple, tripleSize)).to.be.eql([tripleChunk]);+ expect(chunkBySize([json], size)).toEqual([json]);+ expect(chunkBySize(triple, tripleSize)).toEqual([tripleChunk]);// Chunks large items individually- expect(chunkBySize(triple, size)).to.be.eql(triple);- expect(chunkBySize(triple, size + 1)).to.be.eql(triple);- expect(chunkBySize(triple, size + 2)).to.be.eql([chunk, chunk, chunk]);+ expect(chunkBySize(triple, size)).toEqual(triple);+ expect(chunkBySize(triple, size + 1)).toEqual(triple);+ expect(chunkBySize(triple, size + 2)).toEqual([chunk, chunk, chunk]);// Chunks smaller items together- expect(chunkBySize(triple, (2 * size) + 3)).to.be.eql([`[${json},${json}]`, chunk]);- expect(chunkBySize([...triple, ...triple], (2 * size) + 3)).to.be.eql([`[${json},${json}]`, `[${json},${json}]`, `[${json},${json}]`]);+ expect(chunkBySize(triple, (2 * size) + 3)).toEqual([`[${json},${json}]`, chunk]);+ expect(chunkBySize([...triple, ...triple], (2 * size) + 3)).toEqual([`[${json},${json}]`, `[${json},${json}]`, `[${json},${json}]`]);});});});diff --git a/test/enqueue_links/click_elements.js b/__tests__/enqueue_links/click_elements.jssimilarity index 79%rename from test/enqueue_links/click_elements.jsrename to __tests__/enqueue_links/click_elements.jsindex 9871f16ff..020769352 100644--- a/test/enqueue_links/click_elements.js+++ b/__tests__/enqueue_links/click_elements.js@@ -1,4 +1,3 @@-import { expect } from 'chai';import Apify from '../../build';import { RequestQueue } from '../../build/request_queue';import { clickElements, clickElementsAndInterceptNavigationRequests, isTargetRelevant } from '../../build/enqueue_links/click_elements';@@ -47,10 +46,10 @@ describe('enqueueLinksByClickingElements()', () => {waitForPageIdleSecs: 0.025,maxWaitForPageIdleSecs: 0.250,});- expect(addedRequests).to.have.lengthOf(1);- expect(addedRequests[0].url).to.match(/https:\/\/example\.com\/?$/);- expect(addedRequests[0].uniqueKey).to.be.eql('key');- expect(page.url()).to.be.eql('about:blank');+ expect(addedRequests).toHaveLength(1);+ expect(addedRequests[0].url).toMatch(/https:\/\/example\.com\/?$/);+ expect(addedRequests[0].uniqueKey).toBe('key');+ expect(page.url()).toBe('about:blank');});describe('clickElements()', () => {@@ -65,7 +64,7 @@ describe('enqueueLinksByClickingElements()', () => {await page.setContent(html);await clickElements(page, 'div');const wasClicked = await page.evaluate(() => window.clicked);- expect(wasClicked).to.be.eql(true);+ expect(wasClicked).toBe(true);});it('should click an empty element', async () => {@@ -79,7 +78,7 @@ describe('enqueueLinksByClickingElements()', () => {await page.setContent(html);await clickElements(page, 'div');const wasClicked = await page.evaluate(() => window.clicked);- expect(wasClicked).to.be.eql(true);+ expect(wasClicked).toBe(true);});it('should click multiple elements', async () => {const html = `@@ -99,7 +98,7 @@ describe('enqueueLinksByClickingElements()', () => {await page.setContent(html);await clickElements(page, 'header, div, p, footer');const clickedElements = await page.evaluate(() => window.clickedElements);- expect(clickedElements).to.be.eql(['HEADER', 'DIV', 'P', 'FOOTER']);+ expect(clickedElements).toEqual(['HEADER', 'DIV', 'P', 'FOOTER']);});it('should click hidden elements', async () => {@@ -113,7 +112,7 @@ describe('enqueueLinksByClickingElements()', () => {await page.setContent(html);await clickElements(page, 'div');const wasClicked = await page.evaluate(() => window.clicked);- expect(wasClicked).to.be.eql(true);+ expect(wasClicked).toBe(true);});it('should click elements stacked on top of each other', async () => {@@ -134,7 +133,7 @@ describe('enqueueLinksByClickingElements()', () => {await page.setContent(html);await clickElements(page, 'header, div, main, footer');const clickedElements = await page.evaluate(() => window.clickedElements);- expect(clickedElements).to.be.eql(['HEADER', 'DIV', 'MAIN', 'FOOTER']);+ expect(clickedElements).toEqual(['HEADER', 'DIV', 'MAIN', 'FOOTER']);});});@@ -161,9 +160,9 @@ describe('enqueueLinksByClickingElements()', () => {const interceptedRequests = await clickElementsAndInterceptNavigationRequests(getOpts({selector: 'a',}));- expect(interceptedRequests).to.have.lengthOf(1);- expect(interceptedRequests[0].url).to.match(/https:\/\/example\.com\/?$/);- expect(page.url()).to.be.eql('about:blank');+ expect(interceptedRequests).toHaveLength(1);+ expect(interceptedRequests[0].url).toMatch(/https:\/\/example\.com\/?$/);+ expect(page.url()).toBe('about:blank');});it('should intercept navigation with window.location', async () => {@@ -177,10 +176,10 @@ describe('enqueueLinksByClickingElements()', () => {await page.goto('https://example.com');await page.setContent(html);const interceptedRequests = await clickElementsAndInterceptNavigationRequests(getOpts());- expect(interceptedRequests).to.have.lengthOf(1);- expect(interceptedRequests[0].url).to.match(/https:\/\/example\.com\/?$/);+ expect(interceptedRequests).toHaveLength(1);+ expect(interceptedRequests[0].url).toMatch(/https:\/\/example\.com\/?$/);const pageContent = await page.content();- expect(pageContent).to.include('onclick="return window.location = ');+ expect(pageContent).toEqual(expect.arrayContaining(['onclick="return window.location = ']));});it('should save the hash when changing it with window.location', async () => {@@ -194,10 +193,10 @@ describe('enqueueLinksByClickingElements()', () => {await page.goto('https://example.com');await page.setContent(html);const interceptedRequests = await clickElementsAndInterceptNavigationRequests(getOpts());- expect(interceptedRequests).to.have.lengthOf(1);- expect(interceptedRequests[0].url).be.eql('https://example.com/#foo');+ expect(interceptedRequests).toHaveLength(1);+ expect(interceptedRequests[0].url).toBe('https://example.com/#foo');const pageContent = await page.content();- expect(pageContent).to.include('onclick="return window.location = ');+ expect(pageContent).toEqual(expect.arrayContaining(['onclick="return window.location = ']));});it('should prevent reload from cache with window.reload()', async () => {@@ -211,10 +210,10 @@ describe('enqueueLinksByClickingElements()', () => {await page.goto('https://example.com');await page.setContent(html);const interceptedRequests = await clickElementsAndInterceptNavigationRequests(getOpts());- expect(interceptedRequests).to.have.lengthOf(1);- expect(interceptedRequests[0].url).to.match(/https:\/\/example\.com\/?$/);+ expect(interceptedRequests).toHaveLength(1);+ expect(interceptedRequests[0].url).toMatch(/https:\/\/example\.com\/?$/);const pageContent = await page.content();- expect(pageContent).to.include('onclick="return window.location.reload()');+ expect(pageContent).toEqual(expect.arrayContaining(['onclick="return window.location.reload()']));});it('should prevent forced reload with window.reload(true)', async () => {@@ -228,10 +227,10 @@ describe('enqueueLinksByClickingElements()', () => {await page.goto('https://example.com');await page.setContent(html);const interceptedRequests = await clickElementsAndInterceptNavigationRequests(getOpts());- expect(interceptedRequests).to.have.lengthOf(1);- expect(interceptedRequests[0].url).to.match(/https:\/\/example\.com\/?$/);+ expect(interceptedRequests).toHaveLength(1);+ expect(interceptedRequests[0].url).toMatch(/https:\/\/example\.com\/?$/);const pageContent = await page.content();- expect(pageContent).to.include('onclick="return window.location.reload(true)');+ expect(pageContent).toEqual(expect.arrayContaining(['onclick="return window.location.reload(true)']));});it('should prevent manipulation with window.history', async () => {@@ -255,9 +254,9 @@ describe('enqueueLinksByClickingElements()', () => {await page.goto('https://example.com');await page.setContent(html);const interceptedRequests = await clickElementsAndInterceptNavigationRequests(getOpts());- expect(interceptedRequests).to.have.lengthOf(0);+ expect(interceptedRequests).toHaveLength(0);const pageContent = await page.content();- expect(pageContent).to.include('onclick="return handleClick();');+ expect(pageContent).toEqual(expect.arrayContaining(['onclick="return handleClick();']));});it('should save urls pushed to window.history', async () => {@@ -271,10 +270,10 @@ describe('enqueueLinksByClickingElements()', () => {await page.goto('https://example.com/bar/');await page.setContent(html);const interceptedRequests = await clickElementsAndInterceptNavigationRequests(getOpts());- expect(interceptedRequests).to.have.lengthOf(1);- expect(interceptedRequests[0].url).to.be.eql('https://example.com/bar/foo');+ expect(interceptedRequests).toHaveLength(1);+ expect(interceptedRequests[0].url).toBe('https://example.com/bar/foo');const pageContent = await page.content();- expect(pageContent).to.include('onclick="return window.history.pushState');+ expect(pageContent).toEqual(expect.arrayContaining(['onclick="return window.history.pushState']));});it('should close newly opened tabs', async () => {@@ -306,10 +305,10 @@ describe('enqueueLinksByClickingElements()', () => {})).catch(() => { /* will throw because afterEach will close the page */ });});- expect(callCounts.create).to.be.eql(1);- expect(callCounts.destroy).to.be.eql(1);+ expect(callCounts.create).toBe(1);+ expect(callCounts.destroy).toBe(1);const pageContent = await page.content();- expect(pageContent).to.include('onclick="return window.open(');+ expect(pageContent).toEqual(expect.arrayContaining(['onclick="return window.open(']));});it('should save urls from newly opened tabs', async () => {@@ -326,10 +325,10 @@ describe('enqueueLinksByClickingElements()', () => {maxWaitForPageIdleMillis: 5000,}));await new Promise(r => setTimeout(r, 1000));- expect(interceptedRequests).to.have.lengthOf(1);- expect(interceptedRequests[0].url).to.be.eql('https://example.com/');+ expect(interceptedRequests).toHaveLength(1);+ expect(interceptedRequests[0].url).toBe('https://example.com/');const pageContent = await page.content();- expect(pageContent).to.include('onclick="return window.open(');+ expect(pageContent).toEqual(expect.arrayContaining(['onclick="return window.open(']));});});});diff --git a/test/enqueue_links/enqueue_links.js b/__tests__/enqueue_links/enqueue_links.jssimilarity index 50%rename from test/enqueue_links/enqueue_links.jsrename to __tests__/enqueue_links/enqueue_links.jsindex 3f129496d..35e9311f9 100644--- a/test/enqueue_links/enqueue_links.js+++ b/__tests__/enqueue_links/enqueue_links.js@@ -1,5 +1,4 @@import cheerio from 'cheerio';-import { expect } from 'chai';import Apify from '../../build';import { enqueueLinks } from '../../build/enqueue_links/enqueue_links';import { RequestQueue } from '../../build/request_queue';@@ -71,19 +70,19 @@ describe('enqueueLinks()', () => {await enqueueLinks({ page, selector: '.click', requestQueue, pseudoUrls });- expect(enqueued).to.have.lengthOf(3);+ expect(enqueued).toHaveLength(3);- expect(enqueued[0].url).to.be.eql('https://example.com/a/b/first');- expect(enqueued[0].method).to.be.eql('POST');- expect(enqueued[0].userData).to.be.eql({});+ expect(enqueued[0].url).toBe('https://example.com/a/b/first');+ expect(enqueued[0].method).toBe('POST');+ expect(enqueued[0].userData).toEqual({});- expect(enqueued[1].url).to.be.eql('https://example.com/a/b/third');- expect(enqueued[1].method).to.be.eql('POST');- expect(enqueued[1].userData).to.be.eql({});+ expect(enqueued[1].url).toBe('https://example.com/a/b/third');+ expect(enqueued[1].method).toBe('POST');+ expect(enqueued[1].userData).toEqual({});- expect(enqueued[2].url).to.be.eql('http://cool.com/');- expect(enqueued[2].method).to.be.eql('GET');- expect(enqueued[2].userData.foo).to.be.eql('bar');+ expect(enqueued[2].url).toBe('http://cool.com/');+ expect(enqueued[2].method).toBe('GET');+ expect(enqueued[2].userData.foo).toBe('bar');});it('works with Actor UI output object', async () => {@@ -99,19 +98,19 @@ describe('enqueueLinks()', () => {await enqueueLinks({ page, selector: '.click', requestQueue, pseudoUrls });- expect(enqueued).to.have.lengthOf(3);+ expect(enqueued).toHaveLength(3);- expect(enqueued[0].url).to.be.eql('https://example.com/a/b/first');- expect(enqueued[0].method).to.be.eql('POST');- expect(enqueued[0].userData).to.be.eql({});+ expect(enqueued[0].url).toBe('https://example.com/a/b/first');+ expect(enqueued[0].method).toBe('POST');+ expect(enqueued[0].userData).toEqual({});- expect(enqueued[1].url).to.be.eql('https://example.com/a/b/third');- expect(enqueued[1].method).to.be.eql('POST');- expect(enqueued[1].userData).to.be.eql({});+ expect(enqueued[1].url).toBe('https://example.com/a/b/third');+ expect(enqueued[1].method).toBe('POST');+ expect(enqueued[1].userData).toEqual({});- expect(enqueued[2].url).to.be.eql('http://cool.com/');- expect(enqueued[2].method).to.be.eql('GET');- expect(enqueued[2].userData.foo).to.be.eql('bar');+ expect(enqueued[2].url).toBe('http://cool.com/');+ expect(enqueued[2].method).toBe('GET');+ expect(enqueued[2].userData.foo).toBe('bar');});it('works with string pseudoUrls', async () => {@@ -127,19 +126,19 @@ describe('enqueueLinks()', () => {await enqueueLinks({ page, selector: '.click', requestQueue, pseudoUrls });- expect(enqueued).to.have.lengthOf(3);+ expect(enqueued).toHaveLength(3);- expect(enqueued[0].url).to.be.eql('https://example.com/a/b/first');- expect(enqueued[0].method).to.be.eql('GET');- expect(enqueued[0].userData).to.be.eql({});+ expect(enqueued[0].url).toBe('https://example.com/a/b/first');+ expect(enqueued[0].method).toBe('GET');+ expect(enqueued[0].userData).toEqual({});- expect(enqueued[1].url).to.be.eql('https://example.com/a/b/third');- expect(enqueued[1].method).to.be.eql('GET');- expect(enqueued[1].userData).to.be.eql({});+ expect(enqueued[1].url).toBe('https://example.com/a/b/third');+ expect(enqueued[1].method).toBe('GET');+ expect(enqueued[1].userData).toEqual({});- expect(enqueued[2].url).to.be.eql('http://cool.com/');- expect(enqueued[2].method).to.be.eql('GET');- expect(enqueued[2].userData).to.be.eql({});+ expect(enqueued[2].url).toBe('http://cool.com/');+ expect(enqueued[2].method).toBe('GET');+ expect(enqueued[2].userData).toEqual({});});it('works with RegExp pseudoUrls', async () => {@@ -155,19 +154,19 @@ describe('enqueueLinks()', () => {await enqueueLinks({ page, selector: '.click', requestQueue, pseudoUrls });- expect(enqueued).to.have.lengthOf(3);+ expect(enqueued).toHaveLength(3);- expect(enqueued[0].url).to.be.eql('https://example.com/a/b/first');- expect(enqueued[0].method).to.be.eql('GET');- expect(enqueued[0].userData).to.be.eql({});+ expect(enqueued[0].url).toBe('https://example.com/a/b/first');+ expect(enqueued[0].method).toBe('GET');+ expect(enqueued[0].userData).toEqual({});- expect(enqueued[1].url).to.be.eql('https://example.com/a/b/third');- expect(enqueued[1].method).to.be.eql('GET');- expect(enqueued[1].userData).to.be.eql({});+ expect(enqueued[1].url).toBe('https://example.com/a/b/third');+ expect(enqueued[1].method).toBe('GET');+ expect(enqueued[1].userData).toEqual({});- expect(enqueued[2].url).to.be.eql('http://cool.com/');- expect(enqueued[2].method).to.be.eql('GET');- expect(enqueued[2].userData).to.be.eql({});+ expect(enqueued[2].url).toBe('http://cool.com/');+ expect(enqueued[2].method).toBe('GET');+ expect(enqueued[2].userData).toEqual({});});it('works with undefined pseudoUrls[]', async () => {@@ -179,23 +178,23 @@ describe('enqueueLinks()', () => {await enqueueLinks({ page, selector: '.click', requestQueue });- expect(enqueued).to.have.lengthOf(4);+ expect(enqueued).toHaveLength(4);- expect(enqueued[0].url).to.be.eql('https://example.com/a/b/first');- expect(enqueued[0].method).to.be.eql('GET');- expect(enqueued[0].userData).to.be.eql({});+ expect(enqueued[0].url).toBe('https://example.com/a/b/first');+ expect(enqueued[0].method).toBe('GET');+ expect(enqueued[0].userData).toEqual({});- expect(enqueued[1].url).to.be.eql('https://example.com/a/b/third');- expect(enqueued[1].method).to.be.eql('GET');- expect(enqueued[1].userData).to.be.eql({});+ expect(enqueued[1].url).toBe('https://example.com/a/b/third');+ expect(enqueued[1].method).toBe('GET');+ expect(enqueued[1].userData).toEqual({});- expect(enqueued[2].url).to.be.eql('https://another.com/a/fifth');- expect(enqueued[2].method).to.be.eql('GET');- expect(enqueued[2].userData).to.be.eql({});+ expect(enqueued[2].url).toBe('https://another.com/a/fifth');+ expect(enqueued[2].method).toBe('GET');+ expect(enqueued[2].userData).toEqual({});- expect(enqueued[3].url).to.be.eql('http://cool.com/');- expect(enqueued[3].method).to.be.eql('GET');- expect(enqueued[3].userData).to.be.eql({});+ expect(enqueued[3].url).toBe('http://cool.com/');+ expect(enqueued[3].method).toBe('GET');+ expect(enqueued[3].userData).toEqual({});});it('works with null pseudoUrls[]', async () => {@@ -207,23 +206,23 @@ describe('enqueueLinks()', () => {await enqueueLinks({ page, selector: '.click', requestQueue, pseudoUrls: null });- expect(enqueued).to.have.lengthOf(4);+ expect(enqueued).toHaveLength(4);- expect(enqueued[0].url).to.be.eql('https://example.com/a/b/first');- expect(enqueued[0].method).to.be.eql('GET');- expect(enqueued[0].userData).to.be.eql({});+ expect(enqueued[0].url).toBe('https://example.com/a/b/first');+ expect(enqueued[0].method).toBe('GET');+ expect(enqueued[0].userData).toEqual({});- expect(enqueued[1].url).to.be.eql('https://example.com/a/b/third');- expect(enqueued[1].method).to.be.eql('GET');- expect(enqueued[1].userData).to.be.eql({});+ expect(enqueued[1].url).toBe('https://example.com/a/b/third');+ expect(enqueued[1].method).toBe('GET');+ expect(enqueued[1].userData).toEqual({});- expect(enqueued[2].url).to.be.eql('https://another.com/a/fifth');- expect(enqueued[2].method).to.be.eql('GET');- expect(enqueued[2].userData).to.be.eql({});+ expect(enqueued[2].url).toBe('https://another.com/a/fifth');+ expect(enqueued[2].method).toBe('GET');+ expect(enqueued[2].userData).toEqual({});- expect(enqueued[3].url).to.be.eql('http://cool.com/');- expect(enqueued[3].method).to.be.eql('GET');- expect(enqueued[3].userData).to.be.eql({});+ expect(enqueued[3].url).toBe('http://cool.com/');+ expect(enqueued[3].method).toBe('GET');+ expect(enqueued[3].userData).toEqual({});});it('works with empty pseudoUrls[]', async () => {@@ -235,23 +234,23 @@ describe('enqueueLinks()', () => {await enqueueLinks({ page, selector: '.click', requestQueue, pseudoUrls: [] });- expect(enqueued).to.have.lengthOf(4);+ expect(enqueued).toHaveLength(4);- expect(enqueued[0].url).to.be.eql('https://example.com/a/b/first');- expect(enqueued[0].method).to.be.eql('GET');- expect(enqueued[0].userData).to.be.eql({});+ expect(enqueued[0].url).toBe('https://example.com/a/b/first');+ expect(enqueued[0].method).toBe('GET');+ expect(enqueued[0].userData).toEqual({});- expect(enqueued[1].url).to.be.eql('https://example.com/a/b/third');- expect(enqueued[1].method).to.be.eql('GET');- expect(enqueued[1].userData).to.be.eql({});+ expect(enqueued[1].url).toBe('https://example.com/a/b/third');+ expect(enqueued[1].method).toBe('GET');+ expect(enqueued[1].userData).toEqual({});- expect(enqueued[2].url).to.be.eql('https://another.com/a/fifth');- expect(enqueued[2].method).to.be.eql('GET');- expect(enqueued[2].userData).to.be.eql({});+ expect(enqueued[2].url).toBe('https://another.com/a/fifth');+ expect(enqueued[2].method).toBe('GET');+ expect(enqueued[2].userData).toEqual({});- expect(enqueued[3].url).to.be.eql('http://cool.com/');- expect(enqueued[3].method).to.be.eql('GET');- expect(enqueued[3].userData).to.be.eql({});+ expect(enqueued[3].url).toBe('http://cool.com/');+ expect(enqueued[3].method).toBe('GET');+ expect(enqueued[3].userData).toEqual({});});it('throws with sparse pseudoUrls[]', async () => {@@ -270,8 +269,8 @@ describe('enqueueLinks()', () => {await enqueueLinks({ page, selector: '.click', requestQueue, pseudoUrls });throw new Error('Wrong error.');} catch (err) {- expect(err.message).to.include('pseudoUrls[1]');- expect(enqueued).to.have.lengthOf(0);+ expect(err.message).toEqual(expect.arrayContaining(['pseudoUrls[1]']));+ expect(enqueued).toHaveLength(0);}});@@ -279,7 +278,7 @@ describe('enqueueLinks()', () => {const enqueuedUrls = [];const queue = new RequestQueue('xxx');queue.addRequest = (request) => {- expect(request.method).to.be.eql('POST');+ expect(request.method).toBe('POST');enqueuedUrls.push(request.url);return Promise.resolve();@@ -291,7 +290,7 @@ describe('enqueueLinks()', () => {await Apify.utils.puppeteer.enqueueRequestsFromClickableElements(page, '.click', purls, queue, { method: 'POST' });- expect(enqueuedUrls).to.be.eql([+ expect(enqueuedUrls).toEqual(['https://example.com/a/b/first','https://example.com/a/b/third','http://cool.com/',@@ -323,19 +322,19 @@ describe('enqueueLinks()', () => {await Apify.utils.enqueueLinks({ $, selector: '.click', requestQueue, pseudoUrls });- expect(enqueued).to.have.lengthOf(3);+ expect(enqueued).toHaveLength(3);- expect(enqueued[0].url).to.be.eql('https://example.com/a/b/first');- expect(enqueued[0].method).to.be.eql('POST');- expect(enqueued[0].userData).to.be.eql({});+ expect(enqueued[0].url).toBe('https://example.com/a/b/first');+ expect(enqueued[0].method).toBe('POST');+ expect(enqueued[0].userData).toEqual({});- expect(enqueued[1].url).to.be.eql('https://example.com/a/b/third');- expect(enqueued[1].method).to.be.eql('POST');- expect(enqueued[1].userData).to.be.eql({});+ expect(enqueued[1].url).toBe('https://example.com/a/b/third');+ expect(enqueued[1].method).toBe('POST');+ expect(enqueued[1].userData).toEqual({});- expect(enqueued[2].url).to.be.eql('http://cool.com/');- expect(enqueued[2].method).to.be.eql('GET');- expect(enqueued[2].userData.foo).to.be.eql('bar');+ expect(enqueued[2].url).toBe('http://cool.com/');+ expect(enqueued[2].method).toBe('GET');+ expect(enqueued[2].userData.foo).toBe('bar');});it('works with PseudoUrl instances', async () => {@@ -351,19 +350,19 @@ describe('enqueueLinks()', () => {await enqueueLinks({ $, selector: '.click', requestQueue, pseudoUrls });- expect(enqueued).to.have.lengthOf(3);+ expect(enqueued).toHaveLength(3);- expect(enqueued[0].url).to.be.eql('https://example.com/a/b/first');- expect(enqueued[0].method).to.be.eql('POST');- expect(enqueued[0].userData).to.be.eql({});+ expect(enqueued[0].url).toBe('https://example.com/a/b/first');+ expect(enqueued[0].method).toBe('POST');+ expect(enqueued[0].userData).toEqual({});- expect(enqueued[1].url).to.be.eql('https://example.com/a/b/third');- expect(enqueued[1].method).to.be.eql('POST');- expect(enqueued[1].userData).to.be.eql({});+ expect(enqueued[1].url).toBe('https://example.com/a/b/third');+ expect(enqueued[1].method).toBe('POST');+ expect(enqueued[1].userData).toEqual({});- expect(enqueued[2].url).to.be.eql('http://cool.com/');- expect(enqueued[2].method).to.be.eql('GET');- expect(enqueued[2].userData.foo).to.be.eql('bar');+ expect(enqueued[2].url).toBe('http://cool.com/');+ expect(enqueued[2].method).toBe('GET');+ expect(enqueued[2].userData.foo).toBe('bar');});it('works with Actor UI output object', async () => {@@ -379,19 +378,19 @@ describe('enqueueLinks()', () => {await enqueueLinks({ $, selector: '.click', requestQueue, pseudoUrls });- expect(enqueued).to.have.lengthOf(3);+ expect(enqueued).toHaveLength(3);- expect(enqueued[0].url).to.be.eql('https://example.com/a/b/first');- expect(enqueued[0].method).to.be.eql('POST');- expect(enqueued[0].userData).to.be.eql({});+ expect(enqueued[0].url).toBe('https://example.com/a/b/first');+ expect(enqueued[0].method).toBe('POST');+ expect(enqueued[0].userData).toEqual({});- expect(enqueued[1].url).to.be.eql('https://example.com/a/b/third');- expect(enqueued[1].method).to.be.eql('POST');- expect(enqueued[1].userData).to.be.eql({});+ expect(enqueued[1].url).toBe('https://example.com/a/b/third');+ expect(enqueued[1].method).toBe('POST');+ expect(enqueued[1].userData).toEqual({});- expect(enqueued[2].url).to.be.eql('http://cool.com/');- expect(enqueued[2].method).to.be.eql('GET');- expect(enqueued[2].userData.foo).to.be.eql('bar');+ expect(enqueued[2].url).toBe('http://cool.com/');+ expect(enqueued[2].method).toBe('GET');+ expect(enqueued[2].userData.foo).toBe('bar');});it('works with string pseudoUrls', async () => {@@ -407,19 +406,19 @@ describe('enqueueLinks()', () => {await enqueueLinks({ $, selector: '.click', requestQueue, pseudoUrls });- expect(enqueued).to.have.lengthOf(3);+ expect(enqueued).toHaveLength(3);- expect(enqueued[0].url).to.be.eql('https://example.com/a/b/first');- expect(enqueued[0].method).to.be.eql('GET');- expect(enqueued[0].userData).to.be.eql({});+ expect(enqueued[0].url).toBe('https://example.com/a/b/first');+ expect(enqueued[0].method).toBe('GET');+ expect(enqueued[0].userData).toEqual({});- expect(enqueued[1].url).to.be.eql('https://example.com/a/b/third');- expect(enqueued[1].method).to.be.eql('GET');- expect(enqueued[1].userData).to.be.eql({});+ expect(enqueued[1].url).toBe('https://example.com/a/b/third');+ expect(enqueued[1].method).toBe('GET');+ expect(enqueued[1].userData).toEqual({});- expect(enqueued[2].url).to.be.eql('http://cool.com/');- expect(enqueued[2].method).to.be.eql('GET');- expect(enqueued[2].userData).to.be.eql({});+ expect(enqueued[2].url).toBe('http://cool.com/');+ expect(enqueued[2].method).toBe('GET');+ expect(enqueued[2].userData).toEqual({});});it('works with RegExp pseudoUrls', async () => {@@ -435,19 +434,19 @@ describe('enqueueLinks()', () => {await enqueueLinks({ $, selector: '.click', requestQueue, pseudoUrls });- expect(enqueued).to.have.lengthOf(3);+ expect(enqueued).toHaveLength(3);- expect(enqueued[0].url).to.be.eql('https://example.com/a/b/first');- expect(enqueued[0].method).to.be.eql('GET');- expect(enqueued[0].userData).to.be.eql({});+ expect(enqueued[0].url).toBe('https://example.com/a/b/first');+ expect(enqueued[0].method).toBe('GET');+ expect(enqueued[0].userData).toEqual({});- expect(enqueued[1].url).to.be.eql('https://example.com/a/b/third');- expect(enqueued[1].method).to.be.eql('GET');- expect(enqueued[1].userData).to.be.eql({});+ expect(enqueued[1].url).toBe('https://example.com/a/b/third');+ expect(enqueued[1].method).toBe('GET');+ expect(enqueued[1].userData).toEqual({});- expect(enqueued[2].url).to.be.eql('http://cool.com/');- expect(enqueued[2].method).to.be.eql('GET');- expect(enqueued[2].userData).to.be.eql({});+ expect(enqueued[2].url).toBe('http://cool.com/');+ expect(enqueued[2].method).toBe('GET');+ expect(enqueued[2].userData).toEqual({});});it('works with undefined pseudoUrls[]', async () => {@@ -459,23 +458,23 @@ describe('enqueueLinks()', () => {await enqueueLinks({ $, selector: '.click', requestQueue });- expect(enqueued).to.have.lengthOf(4);+ expect(enqueued).toHaveLength(4);- expect(enqueued[0].url).to.be.eql('https://example.com/a/b/first');- expect(enqueued[0].method).to.be.eql('GET');- expect(enqueued[0].userData).to.be.eql({});+ expect(enqueued[0].url).toBe('https://example.com/a/b/first');+ expect(enqueued[0].method).toBe('GET');+ expect(enqueued[0].userData).toEqual({});- expect(enqueued[1].url).to.be.eql('https://example.com/a/b/third');- expect(enqueued[1].method).to.be.eql('GET');- expect(enqueued[1].userData).to.be.eql({});+ expect(enqueued[1].url).toBe('https://example.com/a/b/third');+ expect(enqueued[1].method).toBe('GET');+ expect(enqueued[1].userData).toEqual({});- expect(enqueued[2].url).to.be.eql('https://another.com/a/fifth');- expect(enqueued[2].method).to.be.eql('GET');- expect(enqueued[2].userData).to.be.eql({});+ expect(enqueued[2].url).toBe('https://another.com/a/fifth');+ expect(enqueued[2].method).toBe('GET');+ expect(enqueued[2].userData).toEqual({});- expect(enqueued[3].url).to.be.eql('http://cool.com/');- expect(enqueued[3].method).to.be.eql('GET');- expect(enqueued[3].userData).to.be.eql({});+ expect(enqueued[3].url).toBe('http://cool.com/');+ expect(enqueued[3].method).toBe('GET');+ expect(enqueued[3].userData).toEqual({});});it('works with null pseudoUrls[]', async () => {@@ -487,23 +486,23 @@ describe('enqueueLinks()', () => {await enqueueLinks({ $, selector: '.click', requestQueue, pseudoUrls: null });- expect(enqueued).to.have.lengthOf(4);+ expect(enqueued).toHaveLength(4);- expect(enqueued[0].url).to.be.eql('https://example.com/a/b/first');- expect(enqueued[0].method).to.be.eql('GET');- expect(enqueued[0].userData).to.be.eql({});+ expect(enqueued[0].url).toBe('https://example.com/a/b/first');+ expect(enqueued[0].method).toBe('GET');+ expect(enqueued[0].userData).toEqual({});- expect(enqueued[1].url).to.be.eql('https://example.com/a/b/third');- expect(enqueued[1].method).to.be.eql('GET');- expect(enqueued[1].userData).to.be.eql({});+ expect(enqueued[1].url).toBe('https://example.com/a/b/third');+ expect(enqueued[1].method).toBe('GET');+ expect(enqueued[1].userData).toEqual({});- expect(enqueued[2].url).to.be.eql('https://another.com/a/fifth');- expect(enqueued[2].method).to.be.eql('GET');- expect(enqueued[2].userData).to.be.eql({});+ expect(enqueued[2].url).toBe('https://another.com/a/fifth');+ expect(enqueued[2].method).toBe('GET');+ expect(enqueued[2].userData).toEqual({});- expect(enqueued[3].url).to.be.eql('http://cool.com/');- expect(enqueued[3].method).to.be.eql('GET');- expect(enqueued[3].userData).to.be.eql({});+ expect(enqueued[3].url).toBe('http://cool.com/');+ expect(enqueued[3].method).toBe('GET');+ expect(enqueued[3].userData).toEqual({});});it('works with empty pseudoUrls[]', async () => {@@ -515,23 +514,23 @@ describe('enqueueLinks()', () => {await enqueueLinks({ $, selector: '.click', requestQueue, pseudoUrls: [] });- expect(enqueued).to.have.lengthOf(4);+ expect(enqueued).toHaveLength(4);- expect(enqueued[0].url).to.be.eql('https://example.com/a/b/first');- expect(enqueued[0].method).to.be.eql('GET');- expect(enqueued[0].userData).to.be.eql({});+ expect(enqueued[0].url).toBe('https://example.com/a/b/first');+ expect(enqueued[0].method).toBe('GET');+ expect(enqueued[0].userData).toEqual({});- expect(enqueued[1].url).to.be.eql('https://example.com/a/b/third');- expect(enqueued[1].method).to.be.eql('GET');- expect(enqueued[1].userData).to.be.eql({});+ expect(enqueued[1].url).toBe('https://example.com/a/b/third');+ expect(enqueued[1].method).toBe('GET');+ expect(enqueued[1].userData).toEqual({});- expect(enqueued[2].url).to.be.eql('https://another.com/a/fifth');- expect(enqueued[2].method).to.be.eql('GET');- expect(enqueued[2].userData).to.be.eql({});+ expect(enqueued[2].url).toBe('https://another.com/a/fifth');+ expect(enqueued[2].method).toBe('GET');+ expect(enqueued[2].userData).toEqual({});- expect(enqueued[3].url).to.be.eql('http://cool.com/');- expect(enqueued[3].method).to.be.eql('GET');- expect(enqueued[3].userData).to.be.eql({});+ expect(enqueued[3].url).toBe('http://cool.com/');+ expect(enqueued[3].method).toBe('GET');+ expect(enqueued[3].userData).toEqual({});});it('throws with sparse pseudoUrls[]', async () => {@@ -550,8 +549,8 @@ describe('enqueueLinks()', () => {await enqueueLinks({ $, selector: '.click', requestQueue, pseudoUrls });throw new Error('Wrong error.');} catch (err) {- expect(err.message).to.include('pseudoUrls[1]');- expect(enqueued).to.have.lengthOf(0);+ expect(err.message).toEqual(expect.arrayContaining(['pseudoUrls[1]']));+ expect(enqueued).toHaveLength(0);}});@@ -564,35 +563,35 @@ describe('enqueueLinks()', () => {await enqueueLinks({ $, requestQueue, baseUrl: 'http://www.absolute.com/removethis/' });- expect(enqueued).to.have.lengthOf(7);+ expect(enqueued).toHaveLength(7);- expect(enqueued[0].url).to.be.eql('https://example.com/a/b/first');- expect(enqueued[0].method).to.be.eql('GET');- expect(enqueued[0].userData).to.be.eql({});+ expect(enqueued[0].url).toBe('https://example.com/a/b/first');+ expect(enqueued[0].method).toBe('GET');+ expect(enqueued[0].userData).toEqual({});- expect(enqueued[1].url).to.be.eql('https://example.com/a/second');- expect(enqueued[1].method).to.be.eql('GET');- expect(enqueued[1].userData).to.be.eql({});+ expect(enqueued[1].url).toBe('https://example.com/a/second');+ expect(enqueued[1].method).toBe('GET');+ expect(enqueued[1].userData).toEqual({});- expect(enqueued[2].url).to.be.eql('https://example.com/a/b/third');- expect(enqueued[2].method).to.be.eql('GET');- expect(enqueued[2].userData).to.be.eql({});+ expect(enqueued[2].url).toBe('https://example.com/a/b/third');+ expect(enqueued[2].method).toBe('GET');+ expect(enqueued[2].userData).toEqual({});- expect(enqueued[3].url).to.be.eql('https://another.com/a/fifth');- expect(enqueued[3].method).to.be.eql('GET');- expect(enqueued[3].userData).to.be.eql({});+ expect(enqueued[3].url).toBe('https://another.com/a/fifth');+ expect(enqueued[3].method).toBe('GET');+ expect(enqueued[3].userData).toEqual({});- expect(enqueued[4].url).to.be.eql('http://cool.com/');- expect(enqueued[4].method).to.be.eql('GET');- expect(enqueued[4].userData).to.be.eql({});+ expect(enqueued[4].url).toBe('http://cool.com/');+ expect(enqueued[4].method).toBe('GET');+ expect(enqueued[4].userData).toEqual({});- expect(enqueued[5].url).to.be.eql('http://www.absolute.com/x/absolutepath');- expect(enqueued[5].method).to.be.eql('GET');- expect(enqueued[5].userData).to.be.eql({});+ expect(enqueued[5].url).toBe('http://www.absolute.com/x/absolutepath');+ expect(enqueued[5].method).toBe('GET');+ expect(enqueued[5].userData).toEqual({});- expect(enqueued[6].url).to.be.eql('http://www.absolute.com/removethis/y/relativepath');- expect(enqueued[6].method).to.be.eql('GET');- expect(enqueued[6].userData).to.be.eql({});+ expect(enqueued[6].url).toBe('http://www.absolute.com/removethis/y/relativepath');+ expect(enqueued[6].method).toBe('GET');+ expect(enqueued[6].userData).toEqual({});});it('throws on finding a relative link with no baseUrl set', async () => {@@ -605,9 +604,9 @@ describe('enqueueLinks()', () => {await enqueueLinks({ $, requestQueue });throw new Error('wrong error');} catch (err) {- expect(err.message).to.include('/x/absolutepath');+ expect(err.message).toEqual(expect.arrayContaining(['/x/absolutepath']));}- expect(enqueued).to.have.lengthOf(0);+ expect(enqueued).toHaveLength(0);});});});diff --git a/test/enqueue_links/shared.js b/__tests__/enqueue_links/shared.jssimilarity index 79%rename from test/enqueue_links/shared.jsrename to __tests__/enqueue_links/shared.jsindex d646863c3..a68aa7691 100644--- a/test/enqueue_links/shared.js+++ b/__tests__/enqueue_links/shared.js@@ -1,4 +1,3 @@-import { expect } from 'chai';import PseudoUrl from '../../build/pseudo_url';import * as shared from '../../build/enqueue_links/shared';@@ -12,20 +11,20 @@ describe('Enqueue links shared functions', () => {{ purl: 'http[s?]://example.com[.*]', userData: { foo: 'bar' } },];const pseudoUrls = shared.constructPseudoUrlInstances(pseudoUrlSources);- expect(pseudoUrls).to.have.lengthOf(4);+ expect(pseudoUrls).toHaveLength(4);pseudoUrls.forEach((purl) => {- expect(purl.matches('https://example.com/foo')).to.be.eql(true);+ expect(purl.matches('https://example.com/foo')).toBe(true);});let request = pseudoUrls[0].createRequest('https://example.com/foo');- expect(request.userData).to.be.eql({ foo: 'bar' });+ expect(request.userData).toEqual({ foo: 'bar' });request = pseudoUrls[3].createRequest('https://example.com/bar');- expect(request.userData).to.be.eql({ foo: 'bar' });+ expect(request.userData).toEqual({ foo: 'bar' });});it('should cache items', () => {const pseudoUrls = shared.constructPseudoUrlInstances(['http[s?]://example.com/[.*]']);const pseudoUrls2 = shared.constructPseudoUrlInstances(['http[s?]://example.com/[.*]']);- expect(pseudoUrls[0] === pseudoUrls2[0]).to.be.eql(true);+ expect(pseudoUrls[0] === pseudoUrls2[0]).toBe(true);});});@@ -44,12 +43,12 @@ describe('Enqueue links shared functions', () => {const requestOptions = shared.createRequestOptions(sources, userData);const requests = shared.createRequests(requestOptions, pseudoUrls);- expect(requests).to.have.lengthOf(2);+ expect(requests).toHaveLength(2);requests.forEach((r) => {- expect(r.url).to.match(/^https?:\/\/example\.com\//);- expect(r.userData).to.include({ bar: 'foo', one: 1 });+ expect(r.url).toMatch(/^https?:\/\/example\.com\//);+ expect(r.userData).toMatchObject({ bar: 'foo', one: 1 });});- expect(requests[1].method).to.be.eql('POST');+ expect(requests[1].method).toBe('POST');});});@@ -73,9 +72,9 @@ describe('Enqueue links shared functions', () => {await finished;const results = fakeRequestQueue.requests;- expect(results).to.have.lengthOf(6);- expect(results[2]).to.be.eql(1000);- expect(results.reduce((sum, num) => sum + num)).to.be.eql(1010);+ expect(results).toHaveLength(6);+ expect(results[2]).toBe(1000);+ expect(results.reduce((sum, num) => sum + num)).toBe(1010);});});});diff --git a/test/events.js b/__tests__/events.jssimilarity index 83%rename from test/events.jsrename to __tests__/events.jsindex 3f32a9441..0dd4368c3 100644--- a/test/events.js+++ b/__tests__/events.js@@ -1,6 +1,5 @@import WebSocket from 'ws';import sinon from 'sinon';-import { expect } from 'chai';import { delayPromise } from 'apify-shared/utilities';import { ENV_VARS } from 'apify-shared/consts';import { ACTOR_EVENT_NAMES_EX } from '../build/constants';@@ -18,7 +17,7 @@ describe('Apify.events', () => {}}).then((arg) => {- expect(arg).to.eql('test event');+ expect(arg).toBe('test event');});});@@ -35,7 +34,7 @@ describe('Apify.events', () => {isWsConnected = false;});- expect(req.url).to.be.eql('/someRunId');+ expect(req.url).toBe('/someRunId');const send = obj => ws.send(JSON.stringify(obj));@@ -49,10 +48,10 @@ describe('Apify.events', () => {process.env[ENV_VARS.TOKEN] = 'dummy';// Run main and store received events- expect(isWsConnected).to.be.eql(false);+ expect(isWsConnected).toBe(false);Apify.main(async () => {await delayPromise(10); // Here must be short sleep to get following line to later tick- expect(isWsConnected).to.be.eql(true);+ expect(isWsConnected).toBe(true);Apify.events.on('name-1', data => eventsReceived.push(data));await delayPromise(1000);});@@ -61,8 +60,8 @@ describe('Apify.events', () => {const stubbedExit = sinon.stub(process, 'exit').callsFake(async (code) => {- expect(code).to.be.eql(0);- expect(eventsReceived).to.be.eql([[1, 2, 3], { foo: 'bar' }]);+ expect(code).toBe(0);+ expect(eventsReceived).toEqual([[1, 2, 3], { foo: 'bar' }]);// Cleanup.stubbedExit.restore();@@ -70,7 +69,7 @@ describe('Apify.events', () => {delete process.env[ENV_VARS.ACTOR_EVENTS_WS_URL];delete process.env[ENV_VARS.TOKEN];await delayPromise(10); // Here must be short sleep to get following line to later tick- expect(isWsConnected).to.be.eql(false);+ expect(isWsConnected).toBe(false);done();});});@@ -87,7 +86,7 @@ describe('Apify.events', () => {isWsConnected = false;});- expect(req.url).to.be.eql('/someRunId');+ expect(req.url).toBe('/someRunId');const send = obj => ws.send(JSON.stringify(obj));@@ -100,19 +99,19 @@ describe('Apify.events', () => {process.env[ENV_VARS.ACTOR_EVENTS_WS_URL] = 'ws://localhost:9099/someRunId';// Connect to websocket and receive events.- expect(isWsConnected).to.be.eql(false);+ expect(isWsConnected).toBe(false);await Apify.initializeEvents();await delayPromise(10); // Here must be short sleep to get following line to later tick- expect(isWsConnected).to.be.eql(true);+ expect(isWsConnected).toBe(true);Apify.events.on('name-1', data => eventsReceived.push(data));await delayPromise(1000);- expect(eventsReceived).to.be.eql([[1, 2, 3], { foo: 'bar' }]);+ expect(eventsReceived).toEqual([[1, 2, 3], { foo: 'bar' }]);- expect(isWsConnected).to.be.eql(true);+ expect(isWsConnected).toBe(true);Apify.stopEvents();await delayPromise(10); // Here must be short sleep to get following line to later tick- expect(isWsConnected).to.be.eql(false);+ expect(isWsConnected).toBe(false);// Cleanup.wss.close();@@ -128,9 +127,9 @@ describe('Apify.events', () => {await delayPromise(10);await Apify.stopEvents();const eventCount = eventsReceived.length;- expect(eventCount).to.be.above(2);+ expect(eventCount).toBeGreaterThan(2);await delayPromise(10);- expect(eventsReceived.length).to.be.eql(eventCount);+ expect(eventsReceived.length).toEqual(eventCount);delete process.env.APIFY_TEST_PERSIST_INTERVAL_MILLIS;});diff --git a/test/integration_tests/utils.js b/__tests__/integration_tests/utils.jssimilarity index 100%rename from test/integration_tests/utils.jsrename to __tests__/integration_tests/utils.jsdiff --git a/test/key_value_store.js b/__tests__/key_value_store.jssimilarity index 90%rename from test/key_value_store.jsrename to __tests__/key_value_store.jsindex dbb66fe5a..dec607346 100644--- a/test/key_value_store.js+++ b/__tests__/key_value_store.js@@ -1,4 +1,3 @@-import { expect } from 'chai';import sinon from 'sinon';import path from 'path';import { ENV_VARS, KEY_VALUE_STORE_KEYS } from 'apify-shared/consts';@@ -17,16 +16,17 @@ describe('KeyValueStore', () => {describe('maybeStringify()', () => {it('should work', () => {- expect(maybeStringify({ foo: 'bar' }, { contentType: null })).to.be.eql('{\n "foo": "bar"\n}');- expect(maybeStringify({ foo: 'bar' }, { contentType: undefined })).to.be.eql('{\n "foo": "bar"\n}');+ expect(maybeStringify({ foo: 'bar' }, { contentType: null })).toBe('{\n "foo": "bar"\n}');+ expect(maybeStringify({ foo: 'bar' }, { contentType: undefined })).toBe('{\n "foo": "bar"\n}');- expect(maybeStringify('xxx', { contentType: undefined })).to.be.eql('"xxx"');- expect(maybeStringify('xxx', { contentType: 'something' })).to.be.eql('xxx');+ expect(maybeStringify('xxx', { contentType: undefined })).toBe('"xxx"');+ expect(maybeStringify('xxx', { contentType: 'something' })).toBe('xxx');const obj = {};obj.self = obj;- expect(() => maybeStringify(obj, { contentType: null }))- .to.throw('The "value" parameter cannot be stringified to JSON: Converting circular structure to JSON');+ expect(() => maybeStringify(obj, { contentType: null })).toThrowError(+ 'The "value" parameter cannot be stringified to JSON: Converting circular structure to JSON'+ );});});@@ -46,7 +46,7 @@ describe('KeyValueStore', () => {'helXlo.bin',];const matched = filenames.reduce((count, name) => (getFileNameRegexp(key).test(name) ? ++count : count), 0);- expect(matched).to.be.eql(3);+ expect(matched).toBe(3);});});@@ -65,33 +65,33 @@ describe('KeyValueStore', () => {await store2.setValue('key-badctype', buffer, { contentType: 'nonexistent/content-type' });// Try to read store2/key-string.- expect(await store2.getValue('key-string')).to.be.eql('yyyy');+ expect(await store2.getValue('key-string')).toBe('yyyy');// Try to delete store2/key-string with an error.try {await store2.setValue('key-string', null, { contentType: 'text/plain' });throw new Error('This should throw!!!');} catch (err) {- expect(err).to.be.an('error');- expect(err.message).not.to.include('This should throw!!!');+ expect(err).toBeInstanceOf(Error);+ expect(err.message).toEqual(expect.arrayContaining(['This should throw!!!']));}// Check that it still exists.- expect(await store2.getValue('key-string')).to.be.eql('yyyy');+ expect(await store2.getValue('key-string')).toBe('yyyy');// Try to delete store2/key-string again.await store2.setValue('key-string', null);// Check that it doesn't exist.- expect(await store2.getValue('key-string')).to.be.eql(null);+ expect(await store2.getValue('key-string')).toBe(null);- expect(await store.getValue('key-obj')).to.be.eql({ foo: 'bar' });- expect(await store.getValue('key-string')).to.be.eql('xxxx');- expect(await store.getValue('key-buffer')).to.be.eql(buffer);- expect(await store.getValue('key-nonexist')).to.be.eql(null);- expect(await store2.getValue('key-obj')).to.be.eql({ foo: 'hotel' });- expect(await store2.getValue('key-ctype')).to.be.eql(buffer);- expect(await store2.getValue('key-badctype')).to.be.eql(buffer);+ expect(await store.getValue('key-obj')).toEqual({ foo: 'bar' });+ expect(await store.getValue('key-string')).toBe('xxxx');+ expect(await store.getValue('key-buffer')).toEqual(buffer);+ expect(await store.getValue('key-nonexist')).toBe(null);+ expect(await store2.getValue('key-obj')).toEqual({ foo: 'hotel' });+ expect(await store2.getValue('key-ctype')).toEqual(buffer);+ expect(await store2.getValue('key-badctype')).toEqual(buffer);// Drop works.const storeDir = path.join(LOCAL_STORAGE_DIR, LOCAL_STORAGE_SUBDIR, 'my-store-id');@@ -139,7 +139,7 @@ describe('KeyValueStore', () => {}).returns(Promise.resolve({ body: record, contentType: 'application/json; charset=utf-8' }));const response = await store.getValue('key-1');- expect(response).to.be.eql(record);+ expect(response).toEqual(record);// Delete.mock.expects('deleteRecord')@@ -287,7 +287,7 @@ describe('KeyValueStore', () => {}}- expect(counter).to.be.eql(INVALID_CHARACTERS.length);+ expect(counter).toEqual(INVALID_CHARACTERS.length);// TODO: This throws "ENAMETOOLONG: name too long, unlink" !!!// await store.setValue('X'.repeat(256), 'value');@@ -392,7 +392,7 @@ describe('KeyValueStore', () => {it('should return the local url of a file', () => {process.env[ENV_VARS.LOCAL_STORAGE_DIR] = LOCAL_STORAGE_DIR;const store = new KeyValueStoreLocal('my-store-id', LOCAL_STORAGE_DIR);- expect(store.getPublicUrl('file.txt')).to.equal(`file://${store.localStoragePath}/file.txt`);+ expect(store.getPublicUrl('file.txt')).toBe(`file://${store.localStoragePath}/file.txt`);delete process.env[ENV_VARS.LOCAL_STORAGE_DIR];});@@ -401,7 +401,7 @@ describe('KeyValueStore', () => {const publicUrl = 'https://api.apify.com/v2/key-value-stores';const store = new KeyValueStore('my-store-id');- expect(store.getPublicUrl('file')).to.equal(`${publicUrl}/my-store-id/records/file`);+ expect(store.getPublicUrl('file')).toBe(`${publicUrl}/my-store-id/records/file`);delete process.env[ENV_VARS.TOKEN];});});@@ -457,11 +457,11 @@ describe('KeyValueStore', () => {results.push([key, index, info]);}, { exclusiveStartKey: 'key0' });- expect(results).to.have.lengthOf(5);+ expect(results).toHaveLength(5);results.forEach((r, i) => {- expect(r[2]).to.be.eql({ size: i + 1 });- expect(r[1]).to.be.eql(i);- expect(r[0]).to.be.eql(`key${i + 1}`);+ expect(r[2]).toEqual({ size: i + 1 });+ expect(r[1]).toEqual(i);+ expect(r[0]).toEqual(`key${i + 1}`);});mock.verify();@@ -480,11 +480,11 @@ describe('KeyValueStore', () => {results.push([key, index, info]);}, { exclusiveStartKey: 'key3' });- expect(results).to.have.lengthOf(6);+ expect(results).toHaveLength(6);results.forEach((r, i) => {- expect(r[2]).to.be.eql({ size: 2 });- expect(r[1]).to.be.eql(i);- expect(r[0]).to.be.eql(`key${i + 4}`);+ expect(r[2]).toEqual({ size: 2 });+ expect(r[1]).toEqual(i);+ expect(r[0]).toEqual(`key${i + 4}`);});// Drop works.@@ -501,12 +501,12 @@ describe('KeyValueStore', () => {const defaultStore = await Apify.openKeyValueStore();// Uses default value.const oldGet = defaultStore.getValue;- defaultStore.getValue = async key => expect(key).to.be.eql(KEY_VALUE_STORE_KEYS.INPUT);+ defaultStore.getValue = async key => expect(key).toEqual(KEY_VALUE_STORE_KEYS.INPUT);await Apify.getInput();// Uses value from env var.process.env[ENV_VARS.INPUT_KEY] = 'some-value';- defaultStore.getValue = async key => expect(key).to.be.eql('some-value');+ defaultStore.getValue = async key => expect(key).toBe('some-value');await Apify.getInput();delete process.env[ENV_VARS.LOCAL_STORAGE_DIR];diff --git a/test/live_view/live_view_server.js b/__tests__/live_view/live_view_server.jssimilarity index 83%rename from test/live_view/live_view_server.jsrename to __tests__/live_view/live_view_server.jsindex 58016d928..b26585311 100644--- a/test/live_view/live_view_server.js+++ b/__tests__/live_view/live_view_server.js@@ -2,7 +2,6 @@ import path from 'path';import { promisify } from 'util';import rqst from 'request-promise-native';import fs from 'fs-extra';-import { expect } from 'chai';import io from 'socket.io-client';import { ENV_VARS, LOCAL_ENV_VARS } from 'apify-shared/consts';import Apify from '../../build/index';@@ -51,35 +50,35 @@ describe('LiveViewServer', () => {});it('should construct', async () => {- expect(lvs).to.be.instanceOf(LiveViewServer);+ expect(lvs).toBeInstanceOf(LiveViewServer);});it('should start and stop', async () => {await lvs.start();- expect(lvs.isRunning()).to.be.eql(true);+ expect(lvs.isRunning()).toBe(true);await lvs.stop();- expect(lvs.isRunning()).to.be.eql(false);+ expect(lvs.isRunning()).toBe(false);});it('should connect over websocket', async () => {const socket = io(BASE_URL);await lvs.start();await new Promise(resolve => socket.on('connect', resolve));- expect(lvs.hasClients()).to.be.eql(true);+ expect(lvs.hasClients()).toBe(true);socket.close();await lvs.stop();});it('should make one snapshot even without clients', async () => {await lvs.start();- expect(lvs.hasClients()).to.be.eql(true);+ expect(lvs.hasClients()).toBe(true);await lvs.serve(fakePage);let files = await readdir(LOCAL_STORAGE_SUBDIR);- expect(files.length).to.be.eql(1);- expect(lvs.hasClients()).to.be.eql(false);+ expect(files.length).toBe(1);+ expect(lvs.hasClients()).toBe(false);await lvs.serve(fakePage);files = await readdir(LOCAL_STORAGE_SUBDIR);- expect(files.length).to.be.eql(1);+ expect(files.length).toBe(1);await lvs.stop();});@@ -100,19 +99,19 @@ describe('LiveViewServer', () => {it('should serve snapshot', async () => {await lvs.serve(fakePage);const snapshot = await new Promise(resolve => socket.on('snapshot', resolve));- expect(snapshot).to.include({ pageUrl: 'url', htmlContent: 'content', screenshotIndex: 0 });- expect(`"${snapshot.createdAt}"`).to.be.eql(JSON.stringify(new Date(snapshot.createdAt)));+ expect(snapshot).toMatchObject({ pageUrl: 'url', htmlContent: 'content', screenshotIndex: 0 });+ expect(`"${snapshot.createdAt}"`).toEqual(JSON.stringify(new Date(snapshot.createdAt)));});it('should return screenshots', async () => {const snapshot0 = new Promise(resolve => socket.on('snapshot', resolve));await lvs.serve(fakePage);const response0 = await rqst(`${BASE_URL}/screenshot/${((await snapshot0).screenshotIndex)}`);- expect(response0).to.be.eql('screenshot0');+ expect(response0).toBe('screenshot0');const snapshot1 = new Promise(resolve => socket.on('snapshot', resolve));await lvs.serve(fakePage);const response1 = await rqst(`${BASE_URL}/screenshot/${(await snapshot1).screenshotIndex}`);- expect(response1).to.be.eql('screenshot1');+ expect(response1).toBe('screenshot1');});it('should not store more than maxScreenshotFiles screenshots', async () => {@@ -134,7 +133,7 @@ describe('LiveViewServer', () => {reject(new Error('Files were not deleted in 2000ms.'));}, 2000);});- files.forEach((f, idx) => expect(f).to.be.eql(`${idx + 3}.jpeg`));+ files.forEach((f, idx) => expect(f).toEqual(`${idx + 3}.jpeg`));});});});diff --git a/test/pseudo_url.js b/__tests__/pseudo_url.jssimilarity index 65%rename from test/pseudo_url.jsrename to __tests__/pseudo_url.jsindex b75f9843f..c6573f2e2 100644--- a/test/pseudo_url.js+++ b/__tests__/pseudo_url.js@@ -1,29 +1,28 @@-import { expect } from 'chai';import Apify from '../build/index';describe('Apify.PseudoUrl', () => {it('matches() should work', () => {let purl = new Apify.PseudoUrl('http://www.example.com/PAGES/[(\\w|-)*]'); // eslint-disable-line- expect(purl.matches('http://www.example.com/PAGES/')).to.be.eql(true);- expect(purl.matches('http://www.example.com/pages/my-awesome-page')).to.be.eql(true);- expect(purl.matches('http://www.example.com/PAGES/not@working')).to.be.eql(false);+ expect(purl.matches('http://www.example.com/PAGES/')).toBe(true);+ expect(purl.matches('http://www.example.com/pages/my-awesome-page')).toBe(true);+ expect(purl.matches('http://www.example.com/PAGES/not@working')).toBe(false);purl = new Apify.PseudoUrl(/example\.com\/pages/);- expect(purl.matches('http://www.example.com/PAGES/')).to.be.eql(false);- expect(purl.matches('http://www.example.com/pages/my-awesome-page')).to.be.eql(true);- expect(purl.matches('http://www.example.com/pages/not@working')).to.be.eql(true);+ expect(purl.matches('http://www.example.com/PAGES/')).toBe(false);+ expect(purl.matches('http://www.example.com/pages/my-awesome-page')).toBe(true);+ expect(purl.matches('http://www.example.com/pages/not@working')).toBe(true);});it('createRequest() should work with a string', () => {const purl = new Apify.PseudoUrl('something', { method: 'POST', userData: { foo: 'bar' } });const request = purl.createRequest('http://example.com');- expect(request).to.be.an.instanceof(Apify.Request);- expect(request.url).to.be.eql('http://example.com');- expect(request.method).to.be.eql('POST');- expect(request.userData).to.be.eql({ foo: 'bar' });+ expect(request).toBeInstanceOf(Apify.Request);+ expect(request.url).toBe('http://example.com');+ expect(request.method).toBe('POST');+ expect(request.userData).toEqual({ foo: 'bar' });});it('createRequest() should work with an object', () => {@@ -35,9 +34,9 @@ describe('Apify.PseudoUrl', () => {},});- expect(request).to.be.an.instanceof(Apify.Request);- expect(request.url).to.be.eql('http://example.com');- expect(request.method).to.be.eql('POST');- expect(request.userData).to.be.eql({ foo: 'bar', bar: 'foo' });+ expect(request).toBeInstanceOf(Apify.Request);+ expect(request.url).toBe('http://example.com');+ expect(request.method).toBe('POST');+ expect(request.userData).toEqual({ foo: 'bar', bar: 'foo' });});});diff --git a/test/puppeteer.js b/__tests__/puppeteer.jssimilarity index 100%rename from test/puppeteer.jsrename to __tests__/puppeteer.jsdiff --git a/test/puppeteer_pool.js b/__tests__/puppeteer_pool.jssimilarity index 71%rename from test/puppeteer_pool.jsrename to __tests__/puppeteer_pool.jsindex 25c8c5c8f..f57923dfe 100644--- a/test/puppeteer_pool.js+++ b/__tests__/puppeteer_pool.js@@ -1,4 +1,3 @@-import { expect } from 'chai';import fs from 'fs';import _ from 'underscore';import log from 'apify-shared/log';@@ -44,46 +43,46 @@ describe('PuppeteerPool', () => {browsers.push(pool.newPage());await Promise.all(browsers);- expect(_.values(pool.activeInstances).length).to.be.eql(2);- expect(pool.activeInstances[0].activePages).to.be.eql(3);- expect(pool.activeInstances[0].totalPages).to.be.eql(3);- expect(pool.activeInstances[1].activePages).to.be.eql(3);- expect(pool.activeInstances[1].totalPages).to.be.eql(3);+ expect(_.values(pool.activeInstances).length).toBe(2);+ expect(pool.activeInstances[0].activePages).toBe(3);+ expect(pool.activeInstances[0].totalPages).toBe(3);+ expect(pool.activeInstances[1].activePages).toBe(3);+ expect(pool.activeInstances[1].totalPages).toBe(3);// Close 2 pages in a first browser.await (await browsers[0]).close();await (await browsers[1]).close();await shortSleep();- expect(_.values(pool.activeInstances).length).to.be.eql(2);- expect(pool.activeInstances[0].activePages).to.be.eql(1);- expect(pool.activeInstances[0].totalPages).to.be.eql(3);- expect(pool.activeInstances[1].activePages).to.be.eql(3);- expect(pool.activeInstances[1].totalPages).to.be.eql(3);+ expect(_.values(pool.activeInstances).length).toBe(2);+ expect(pool.activeInstances[0].activePages).toBe(1);+ expect(pool.activeInstances[0].totalPages).toBe(3);+ expect(pool.activeInstances[1].activePages).toBe(3);+ expect(pool.activeInstances[1].totalPages).toBe(3);// Open two more pages in first browser so it reaches 5 and gets retired.browsers.push(pool.newPage());browsers.push(pool.newPage());await Promise.all(browsers);- expect(_.values(pool.activeInstances).length).to.be.eql(1);- expect(_.values(pool.retiredInstances).length).to.be.eql(1);- expect(pool.activeInstances[1].activePages).to.be.eql(3);- expect(pool.activeInstances[1].totalPages).to.be.eql(3);- expect(pool.retiredInstances[0].activePages).to.be.eql(3);- expect(pool.retiredInstances[0].totalPages).to.be.eql(5);+ expect(_.values(pool.activeInstances).length).toBe(1);+ expect(_.values(pool.retiredInstances).length).toBe(1);+ expect(pool.activeInstances[1].activePages).toBe(3);+ expect(pool.activeInstances[1].totalPages).toBe(3);+ expect(pool.retiredInstances[0].activePages).toBe(3);+ expect(pool.retiredInstances[0].totalPages).toBe(5);// Open one more page to see that 3rd browser gets started.browsers.push(pool.newPage());await Promise.all(browsers);- expect(_.values(pool.activeInstances).length).to.be.eql(2);- expect(_.values(pool.retiredInstances).length).to.be.eql(1);- expect(pool.activeInstances[1].activePages).to.be.eql(3);- expect(pool.activeInstances[1].totalPages).to.be.eql(3);- expect(pool.activeInstances[2].activePages).to.be.eql(1);- expect(pool.activeInstances[2].totalPages).to.be.eql(1);- expect(pool.retiredInstances[0].activePages).to.be.eql(3);- expect(pool.retiredInstances[0].totalPages).to.be.eql(5);+ expect(_.values(pool.activeInstances).length).toBe(2);+ expect(_.values(pool.retiredInstances).length).toBe(1);+ expect(pool.activeInstances[1].activePages).toBe(3);+ expect(pool.activeInstances[1].totalPages).toBe(3);+ expect(pool.activeInstances[2].activePages).toBe(1);+ expect(pool.activeInstances[2].totalPages).toBe(1);+ expect(pool.retiredInstances[0].activePages).toBe(3);+ expect(pool.retiredInstances[0].totalPages).toBe(5);// Kill the remaining 3 pages from the 1st browser to see that it gets closed.await (await browsers[2]).close();@@ -91,7 +90,7 @@ describe('PuppeteerPool', () => {await (await browsers[7]).close();await shortSleep(2000);- expect(_.values(pool.retiredInstances).length).to.be.eql(0);+ expect(_.values(pool.retiredInstances).length).toBe(0);// Cleanup everything.await pool.destroy();@@ -118,15 +117,15 @@ describe('PuppeteerPool', () => {browsers.push(pool.newPage());browsers.push(pool.newPage());await Promise.all(browsers);- expect(_.values(pool.activeInstances).length).to.be.eql(1);- expect(_.values(pool.retiredInstances).length).to.be.eql(0);+ expect(_.values(pool.activeInstances).length).toBe(1);+ expect(_.values(pool.retiredInstances).length).toBe(0);// Close 2.await (await browsers[0]).close();await (await browsers[1]).close();await shortSleep();- expect(_.values(pool.activeInstances).length).to.be.eql(1);- expect(_.values(pool.retiredInstances).length).to.be.eql(0);+ expect(_.values(pool.activeInstances).length).toBe(1);+ expect(_.values(pool.retiredInstances).length).toBe(0);// Open 2 more so that the browser gets retired.browsers.push(pool.newPage());@@ -134,15 +133,15 @@ describe('PuppeteerPool', () => {await Promise.all(browsers);// Check that it's retired.- expect(_.values(pool.activeInstances).length).to.be.eql(0);- expect(_.values(pool.retiredInstances).length).to.be.eql(1);- expect(pool.retiredInstances[0].activePages).to.be.eql(3);- expect(pool.retiredInstances[0].totalPages).to.be.eql(5);+ expect(_.values(pool.activeInstances).length).toBe(0);+ expect(_.values(pool.retiredInstances).length).toBe(1);+ expect(pool.retiredInstances[0].activePages).toBe(3);+ expect(pool.retiredInstances[0].totalPages).toBe(5);// Sleep and check that it has been killed.await shortSleep(2100);- expect(_.values(pool.activeInstances).length).to.be.eql(0);- expect(_.values(pool.retiredInstances).length).to.be.eql(0);+ expect(_.values(pool.activeInstances).length).toBe(0);+ expect(_.values(pool.retiredInstances).length).toBe(0);// Cleanup everything.await pool.destroy();@@ -169,23 +168,23 @@ describe('PuppeteerPool', () => {pages.push(pool.newPage());pages.push(pool.newPage());await Promise.all(pages);- expect(_.values(pool.activeInstances).length).to.be.eql(3);- expect(_.values(pool.retiredInstances).length).to.be.eql(0);+ expect(_.values(pool.activeInstances).length).toBe(3);+ expect(_.values(pool.retiredInstances).length).toBe(0);// Retire 1.await pool.retire((await pages[0]).browser());- expect(_.values(pool.activeInstances).length).to.be.eql(2);- expect(_.values(pool.retiredInstances).length).to.be.eql(1);+ expect(_.values(pool.activeInstances).length).toBe(2);+ expect(_.values(pool.retiredInstances).length).toBe(1);// Retire 2.await pool.retire((await pages[1]).browser());- expect(_.values(pool.activeInstances).length).to.be.eql(1);- expect(_.values(pool.retiredInstances).length).to.be.eql(2);+ expect(_.values(pool.activeInstances).length).toBe(1);+ expect(_.values(pool.retiredInstances).length).toBe(2);// Sleep and check that two have been killed.await shortSleep(2100);- expect(_.values(pool.activeInstances).length).to.be.eql(1);- expect(_.values(pool.retiredInstances).length).to.be.eql(0);+ expect(_.values(pool.activeInstances).length).toBe(1);+ expect(_.values(pool.retiredInstances).length).toBe(0);// Cleanup everything.await pool.destroy();@@ -218,9 +217,9 @@ describe('PuppeteerPool', () => {await page3.close();// Ensure we spawned 3 different processes- expect(pid1).not.to.be.eql(pid2);- expect(pid2).not.to.be.eql(pid3);- expect(pid3).not.to.be.eql(pid1);+ expect(pid1).not.toEqual(pid2);+ expect(pid2).not.toEqual(pid3);+ expect(pid3).not.toEqual(pid1);// Cleanup everything.await pool.destroy();@@ -243,7 +242,7 @@ describe('PuppeteerPool', () => {console.log(dir1);- expect(fs.existsSync(dir1)).to.be.eql(true);+ expect(fs.existsSync(dir1)).toBe(true);// First time, nothing can come from disk cachelet fromDiskCache1 = 0;@@ -253,16 +252,16 @@ describe('PuppeteerPool', () => {});const cookies1before = await page1.cookies(url);- expect(cookies1before.length).to.be.eql(0);+ expect(cookies1before.length).toBe(0);await page1.goto(url);- expect(fromDiskCache1).to.be.eql(0);+ expect(fromDiskCache1).toBe(0);await Apify.utils.sleep(1000);const cookies1after = await page1.cookies();- expect(cookies1after.length).to.be.at.least(1);+ expect(cookies1after.length).toBeGreaterThanOrEqual(1);await page1.close();@@ -272,8 +271,8 @@ describe('PuppeteerPool', () => {// User directory must be the sameconst page2 = await pool.newPage();const dir2 = page2.browser().recycleDiskCacheDir;- expect(dir1).to.be.eql(dir2);- expect(fs.existsSync(dir2)).to.be.eql(true);+ expect(dir1).toEqual(dir2);+ expect(fs.existsSync(dir2)).toBe(true);// Ensure at least few assets are loaded from disk cachelet fromDiskCache2 = 0;@@ -282,17 +281,17 @@ describe('PuppeteerPool', () => {});const cookies2before = await page2.cookies(url);- expect(cookies2before.length).to.be.eql(0);+ expect(cookies2before.length).toBe(0);await page2.goto(url);- expect(fromDiskCache2).to.be.at.least(1);+ expect(fromDiskCache2).toBeGreaterThanOrEqual(1);// Open third browser while second is still open, it should use a new cache directoryconst page3 = await pool.newPage();const dir3 = page3.browser().recycleDiskCacheDir;- expect(dir3).not.to.be.eql(dir2);- expect(fs.existsSync(dir3)).to.be.eql(true);+ expect(dir3).not.toEqual(dir2);+ expect(fs.existsSync(dir3)).toBe(true);await page2.close();@@ -300,8 +299,8 @@ describe('PuppeteerPool', () => {await pool.destroy();// Check cache dirs were deleted- expect(fs.existsSync(dir1)).to.be.eql(false);- expect(fs.existsSync(dir3)).to.be.eql(false);+ expect(fs.existsSync(dir1)).toBe(false);+ expect(fs.existsSync(dir3)).toBe(false);});describe('reuse of browser tabs', () => {@@ -319,19 +318,19 @@ describe('PuppeteerPool', () => {const recycledThirdPage = await pool.newPage();const recycledSecondPage = await pool.newPage();- expect(recycledFirstPage === firstPage).to.be.eql(true);- expect(recycledSecondPage === secondPage).to.be.eql(true);- expect(recycledThirdPage === thirdPage).to.be.eql(true);+ expect(recycledFirstPage === firstPage).toBe(true);+ expect(recycledSecondPage === secondPage).toBe(true);+ expect(recycledThirdPage === thirdPage).toBe(true);- expect(firstPage === secondPage).to.be.eql(false);- expect(firstPage === thirdPage).to.be.eql(false);- expect(firstPage === recycledSecondPage).to.be.eql(false);- expect(firstPage === recycledThirdPage).to.be.eql(false);- expect(secondPage === thirdPage).to.be.eql(false);- expect(secondPage === recycledFirstPage).to.be.eql(false);- expect(secondPage === recycledThirdPage).to.be.eql(false);- expect(thirdPage === recycledFirstPage).to.be.eql(false);- expect(thirdPage === recycledSecondPage).to.be.eql(false);+ expect(firstPage === secondPage).toBe(false);+ expect(firstPage === thirdPage).toBe(false);+ expect(firstPage === recycledSecondPage).toBe(false);+ expect(firstPage === recycledThirdPage).toBe(false);+ expect(secondPage === thirdPage).toBe(false);+ expect(secondPage === recycledFirstPage).toBe(false);+ expect(secondPage === recycledThirdPage).toBe(false);+ expect(thirdPage === recycledFirstPage).toBe(false);+ expect(thirdPage === recycledSecondPage).toBe(false);await pool.destroy();});@@ -344,26 +343,26 @@ describe('PuppeteerPool', () => {const pageOne = await pool.newPage();await pool.recyclePage(pageOne);- expect(Object.keys(pool.activeInstances).length).to.be.eql(1);+ expect(Object.keys(pool.activeInstances).length).toBe(1);const pageTwo = await pool.newPage();- expect(pageOne === pageTwo).to.be.eql(true);+ expect(pageOne === pageTwo).toBe(true);await pool.recyclePage(pageTwo);- expect(Object.keys(pool.activeInstances).length).to.be.eql(1);+ expect(Object.keys(pool.activeInstances).length).toBe(1);const pageThree = await pool.newPage();- expect(pageTwo === pageThree).to.be.eql(true);- expect(Object.keys(pool.activeInstances).length).to.be.eql(1);+ expect(pageTwo === pageThree).toBe(true);+ expect(Object.keys(pool.activeInstances).length).toBe(1);const pageFour = await pool.newPage();- expect(pageFour === pageThree).to.be.eql(false);- expect(Object.keys(pool.activeInstances).length).to.be.eql(2);+ expect(pageFour === pageThree).toBe(false);+ expect(Object.keys(pool.activeInstances).length).toBe(2);await pool.recyclePage(pageThree);await pool.recyclePage(pageFour);await pool.newPage();await pool.newPage();- expect(Object.keys(pool.activeInstances).length).to.be.eql(2);+ expect(Object.keys(pool.activeInstances).length).toBe(2);await pool.destroy();});@@ -378,25 +377,25 @@ describe('PuppeteerPool', () => {let page = await pool.newPage();await pool.recyclePage(page);- expect(len(pool.activeInstances)).to.be.eql(1);+ expect(len(pool.activeInstances)).toBe(1);page = await pool.newPage();await pool.recyclePage(page);- expect(len(pool.activeInstances)).to.be.eql(0);+ expect(len(pool.activeInstances)).toBe(0);page = await pool.newPage();- expect(len(pool.activeInstances)).to.be.eql(1);+ expect(len(pool.activeInstances)).toBe(1);const pageTwo = await pool.newPage();- expect(len(pool.activeInstances)).to.be.eql(0);+ expect(len(pool.activeInstances)).toBe(0);await pool.recyclePage(page);await pool.recyclePage(pageTwo);- expect(len(pool.activeInstances)).to.be.eql(0);+ expect(len(pool.activeInstances)).toBe(0);await pool.newPage();- expect(len(pool.activeInstances)).to.be.eql(1);+ expect(len(pool.activeInstances)).toBe(1);await pool.newPage();- expect(len(pool.activeInstances)).to.be.eql(0);+ expect(len(pool.activeInstances)).toBe(0);await pool.destroy();});@@ -430,7 +429,7 @@ describe('PuppeteerPool', () => {// they are in retired instances.await pool.newPage();- expect(closeCounter).to.be.eql(3);+ expect(closeCounter).toBe(3);await pool.destroy();});@@ -456,17 +455,17 @@ describe('PuppeteerPool', () => {await fourthPage.close();const recycledFifthPage = await pool.newPage();- expect(recycledSecondPage === secondPage).to.be.eql(true);- expect(recycledFifthPage === fifthPage).to.be.eql(true);+ expect(recycledSecondPage === secondPage).toBe(true);+ expect(recycledFifthPage === fifthPage).toBe(true);const all = [firstPage, secondPage, thirdPage, fourthPage, fifthPage, recycledSecondPage, recycledFifthPage];const matches = page => all.filter(x => page === x).length;- expect(matches(firstPage)).to.be.eql(1);- expect(matches(secondPage)).to.be.eql(2);- expect(matches(thirdPage)).to.be.eql(1);- expect(matches(fourthPage)).to.be.eql(1);- expect(matches(fifthPage)).to.be.eql(2);+ expect(matches(firstPage)).toBe(1);+ expect(matches(secondPage)).toBe(2);+ expect(matches(thirdPage)).toBe(1);+ expect(matches(fourthPage)).toBe(1);+ expect(matches(fifthPage)).toBe(2);await pool.destroy();});@@ -480,11 +479,11 @@ describe('PuppeteerPool', () => {const page = await pool.newPage();const browser = page.browser();const context = page.browserContext();- expect(context.isIncognito()).to.be.eql(true);+ expect(context.isIncognito()).toBe(true);await page.close();const contexts = browser.browserContexts();- expect(contexts).to.have.lengthOf(1);- expect(contexts[0].isIncognito()).to.be.eql(false);+ expect(contexts).toHaveLength(1);+ expect(contexts[0].isIncognito()).toBe(false);await pool.destroy();});});@@ -508,11 +507,11 @@ describe('PuppeteerPool', () => {await pool.newPage();await pool.destroy();- expect(optionsLog).to.have.lengthOf(4);- expect(optionsLog[0].proxyUrl).to.be.eql(proxies[0]);- expect(optionsLog[1].proxyUrl).to.be.eql(proxies[1]);- expect(optionsLog[2].proxyUrl).to.be.eql(proxies[2]);- expect(optionsLog[3].proxyUrl).to.be.eql(proxies[0]);+ expect(optionsLog).toHaveLength(4);+ expect(optionsLog[0].proxyUrl).toEqual(proxies[0]);+ expect(optionsLog[1].proxyUrl).toEqual(proxies[1]);+ expect(optionsLog[2].proxyUrl).toEqual(proxies[2]);+ expect(optionsLog[3].proxyUrl).toEqual(proxies[0]);});describe('throws', () => {@@ -539,7 +538,7 @@ describe('PuppeteerPool', () => {await pool.newPage();throw new Error('Invalid error.');} catch (err) {- expect(err.stack).to.include('useApifyProxy');+ expect(err.stack).toEqual(expect.arrayContaining(['useApifyProxy']));}});@@ -551,7 +550,7 @@ describe('PuppeteerPool', () => {});throw new Error('Invalid error.');} catch (err) {- expect(err.message).to.include('must not be empty');+ expect(err.message).toEqual(expect.arrayContaining(['must not be empty']));}});});@@ -580,7 +579,7 @@ describe('PuppeteerPool', () => {await pool._openNewTab(); // eslint-disable-line no-underscore-danglethrow new Error('invalid error');} catch (err) {- expect(err.stack).to.include('PuppeteerPool: browser.newPage() timed out.');+ expect(err.stack).toEqual(expect.arrayContaining(['PuppeteerPool: browser.newPage() timed out.']));}});});@@ -614,12 +613,12 @@ describe('PuppeteerPool', () => {await pool.recyclePage(page);}- expect(started).to.be.eql(1);- expect(serveCalledWith).to.have.lengthOf(3);+ expect(started).toBe(1);+ expect(serveCalledWith).toHaveLength(3);serveCalledWith.forEach(item => expect(item.constructor.name === 'Page'));await pool.destroy();- expect(stopped).to.be.eql(1);+ expect(stopped).toBe(1);});});});diff --git a/test/puppeteer_request_interception.js b/__tests__/puppeteer_request_interception.jssimilarity index 91%rename from test/puppeteer_request_interception.jsrename to __tests__/puppeteer_request_interception.jsindex 753ed36fb..eca97d66f 100644--- a/test/puppeteer_request_interception.js+++ b/__tests__/puppeteer_request_interception.js@@ -1,4 +1,3 @@-import { expect } from 'chai';import Apify from '../build/index';const { addInterceptRequestHandler, removeInterceptRequestHandler } = Apify.utils.puppeteer;@@ -46,15 +45,15 @@ describe('Apify.utils.puppeteer.addInterceptRequestHandler|removeInterceptRequesawait browser.close();}- expect(allUrls).to.have.members([+ expect(allUrls).toEqual(expect.arrayContaining(['https://example.com/script.js','https://example.com/style.css','https://example.com/image.png',- ]);+ ]));- expect(loadedUrls).to.have.members([+ expect(loadedUrls).toEqual(expect.arrayContaining(['https://example.com/style.css',- ]);+ ]));});it('should not propagate aborted/responded requests to following handlers', async () => {@@ -90,9 +89,9 @@ describe('Apify.utils.puppeteer.addInterceptRequestHandler|removeInterceptRequesawait browser.close();}- expect(propagatedUrls).to.have.members([+ expect(propagatedUrls).toEqual(expect.arrayContaining(['https://example.com/style.css',- ]);+ ]));});it('should allow to modify request', async () => {@@ -124,9 +123,9 @@ describe('Apify.utils.puppeteer.addInterceptRequestHandler|removeInterceptReques// Check response that it's correct.const response = await page.goto('https://api.apify.com/v2/browser-info', { waitUntil: 'networkidle0' });const { method, headers, bodyLength } = JSON.parse(await response.text());- expect(method).to.be.eql('POST');- expect(bodyLength).to.be.eql(16);- expect(headers['content-type']).to.be.eql('application/json; charset=utf-8');+ expect(method).toBe('POST');+ expect(bodyLength).toBe(16);+ expect(headers['content-type']).toBe('application/json; charset=utf-8');} finally {await browser.close();}@@ -159,17 +158,17 @@ describe('Apify.utils.puppeteer.removeInterceptRequestHandler()', () => {// Load with scripts and images disabled.await page.setContent('<html><body></body></html>');await page.setContent(HTML_PAGE, { waitUntil: 'networkidle0' });- expect(loadedUrls).to.have.members([+ expect(loadedUrls).toEqual(expect.arrayContaining(['https://example.com/style.css',- ]);+ ]));// Try it once again.await page.setContent('<html><body></body></html>');await page.setContent(HTML_PAGE, { waitUntil: 'networkidle0' });- expect(loadedUrls).to.have.members([+ expect(loadedUrls).toEqual(expect.arrayContaining(['https://example.com/style.css','https://example.com/style.css',- ]);+ ]));// Enable images.await removeInterceptRequestHandler(page, abortImagesHandler);@@ -177,12 +176,12 @@ describe('Apify.utils.puppeteer.removeInterceptRequestHandler()', () => {// Try to load once again if images appear there.await page.setContent('<html><body></body></html>');await page.setContent(HTML_PAGE, { waitUntil: 'networkidle0' });- expect(loadedUrls).to.have.members([+ expect(loadedUrls).toEqual(expect.arrayContaining(['https://example.com/style.css','https://example.com/style.css','https://example.com/style.css','https://example.com/image.png',- ]);+ ]));} finally {await browser.close();}diff --git a/test/puppeteer_utils.js b/__tests__/puppeteer_utils.jssimilarity index 88%rename from test/puppeteer_utils.jsrename to __tests__/puppeteer_utils.jsindex 928f36f1f..7e3b87ddb 100644--- a/test/puppeteer_utils.js+++ b/__tests__/puppeteer_utils.js@@ -1,4 +1,3 @@-import { expect } from 'chai';import path from 'path';import Apify from '../build/index';@@ -21,31 +20,31 @@ describe('Apify.utils.puppeteer', () => {// Survive navigationsconst page = await browser.newPage();let result = await page.evaluate(() => window.injectedVariable === 42);- expect(result).to.be.eql(false);+ expect(result).toBe(false);await Apify.utils.puppeteer.injectFile(page, path.join(__dirname, 'data', 'inject_file.txt'), { surviveNavigations: true });result = await page.evaluate(() => window.injectedVariable);- expect(result).to.be.eql(42);+ expect(result).toBe(42);await page.goto('about:chrome');result = await page.evaluate(() => window.injectedVariable);- expect(result).to.be.eql(42);+ expect(result).toBe(42);await page.goto('https://www.example.com');result = await page.evaluate(() => window.injectedVariable);- expect(result).to.be.eql(42);+ expect(result).toBe(42);};const remove = async (browser) => {// Remove with navigationsconst page = await browser.newPage();let result = await page.evaluate(() => window.injectedVariable === 42);- expect(result).to.be.eql(false);+ expect(result).toBe(false);await page.goto('about:chrome');result = await page.evaluate(() => window.injectedVariable === 42);- expect(result).to.be.eql(false);+ expect(result).toBe(false);await Apify.utils.puppeteer.injectFile(page, path.join(__dirname, 'data', 'inject_file.txt'));result = await page.evaluate(() => window.injectedVariable);- expect(result).to.be.eql(42);+ expect(result).toBe(42);await page.goto('https://www.example.com');result = await page.evaluate(() => window.injectedVariable === 42);- expect(result).to.be.eql(false);+ expect(result).toBe(false);};try {await Promise.all([survive(browser), remove(browser)]);@@ -68,7 +67,7 @@ describe('Apify.utils.puppeteer', () => {isDefined: window.jQuery !== undefined,};});- expect(result1).to.eql({+ expect(result1).toEqual({isDefined: false,});@@ -80,7 +79,7 @@ describe('Apify.utils.puppeteer', () => {text: $('h1').text(),};});- expect(result2).to.eql({+ expect(result2).toEqual({isDefined: true,text: '',});@@ -99,14 +98,14 @@ describe('Apify.utils.puppeteer', () => {const result1 = await page.evaluate(() => {return { isDefined: window._ !== undefined };});- expect(result1).to.eql({ isDefined: false });+ expect(result1).toEqual({ isDefined: false });await Apify.utils.puppeteer.injectUnderscore(page);const result2 = await page.evaluate(() => {/* global _ */return { isDefined: _.isEmpty({}) };});- expect(result2).to.eql({ isDefined: true });+ expect(result2).toEqual({ isDefined: true });} finally {browser.close();}@@ -139,11 +138,13 @@ describe('Apify.utils.puppeteer', () => {// TODO Remove with 1.0.0. This is here as a backwards comp for moving// the function from utils.puppeteer to utils.it('enqueueLinks() exists in this namespace', async () => {- expect(Apify.utils.puppeteer.enqueueLinks).to.be.a('function');+ expect(Apify.utils.puppeteer.enqueueLinks).toBeInstanceOf(Function);try {await Apify.utils.puppeteer.enqueueLinks({ page: {}, $: () => {} });} catch (err) {- expect(err.message).to.be.eql('Only one of the parameters "options.page" or "options.$" must be provided!');+ expect(err.message).toBe(+ 'Only one of the parameters "options.page" or "options.$" must be provided!'+ );}});@@ -164,9 +165,9 @@ describe('Apify.utils.puppeteer', () => {} finally {await browser.close();}- expect(loadedUrls).to.have.members([+ expect(loadedUrls).toEqual(expect.arrayContaining(['https://example.com/script.js',- ]);+ ]));});it('blockRequests() works with overridden values', async () => {@@ -188,11 +189,11 @@ describe('Apify.utils.puppeteer', () => {} finally {await browser.close();}- expect(loadedUrls).to.have.members([+ expect(loadedUrls).toEqual(expect.arrayContaining(['https://example.com/image.png','https://example.com/script.js','https://example.com/image.gif',- ]);+ ]));});it('supports blockResources() with default values', async () => {@@ -212,9 +213,9 @@ describe('Apify.utils.puppeteer', () => {await browser.close();}- expect(loadedUrls).to.have.members([+ expect(loadedUrls).toEqual(expect.arrayContaining(['https://example.com/script.js',- ]);+ ]));});it('supports blockResources() with nondefault values', async () => {@@ -234,10 +235,10 @@ describe('Apify.utils.puppeteer', () => {await browser.close();}- expect(loadedUrls).to.have.members([+ expect(loadedUrls).toEqual(expect.arrayContaining(['https://example.com/style.css','https://example.com/image.png',- ]);+ ]));});it('supports cacheResponses()', async () => {@@ -266,7 +267,7 @@ describe('Apify.utils.puppeteer', () => {try {const bytesDownloadedOnFirstRun = await getResourcesLoadedFromWiki();const bytesDownloadedOnSecondRun = await getResourcesLoadedFromWiki();- expect(bytesDownloadedOnSecondRun).to.be.below(bytesDownloadedOnFirstRun);+ expect(bytesDownloadedOnSecondRun).toBeLessThan(bytesDownloadedOnFirstRun);} finally {await browser.close();}@@ -286,7 +287,7 @@ describe('Apify.utils.puppeteer', () => {return;}- expect(`Rule '${value}' should have thrown error`).to.be.equal('');+ expect(`Rule '${value}' should have thrown error`).toBe('');};await testRuleType(0);await testRuleType(1);@@ -302,22 +303,22 @@ describe('Apify.utils.puppeteer', () => {const scriptStringBad = 'for const while';const script = compileScript(scriptStringGood);- expect(script).to.be.a('function');- expect(script.toString()).to.be.eql(`async ({ page, request }) => {${scriptStringGood}}`);+ expect(script).toBeInstanceOf(Function);+ expect(script.toString()).toEqual(`async ({ page, request }) => {${scriptStringGood}}`);try {compileScript(scriptStringBad);throw new Error('Should fail.');} catch (err) {// TODO figure out why the err.message comes out empty in the logs.- expect(err.message).to.include('Unexpected token const');+ expect(err.message).toEqual(expect.arrayContaining(['Unexpected token const']));}const browser = await Apify.launchPuppeteer({ headless: true });try {const page = await browser.newPage();const content = await script({ page });- expect(content).to.be.a('string');- expect(content).to.be.eql('<html><head></head><body></body></html>');+ expect(typeof content).toBe('string');+ expect(content).toBe('<html><head></head><body></body></html>');} finally {browser.close();}@@ -340,9 +341,9 @@ describe('Apify.utils.puppeteer', () => {const response = await Apify.utils.puppeteer.gotoExtended(page, request);const { method, headers, bodyLength } = JSON.parse(await response.text());- expect(method).to.be.eql('POST');- expect(bodyLength).to.be.eql(16);- expect(headers['content-type']).to.be.eql('application/json; charset=utf-8');+ expect(method).toBe('POST');+ expect(bodyLength).toBe(16);+ expect(headers['content-type']).toBe('application/json; charset=utf-8');} finally {await browser.close();}@@ -363,12 +364,12 @@ describe('Apify.utils.puppeteer', () => {await page.setContent(contentHTML);const before = await page.evaluate(isAtBottom);- expect(before).to.be.eql(false);+ expect(before).toBe(false);await Apify.utils.puppeteer.infiniteScroll(page, { waitForSecs: 0 });const after = await page.evaluate(isAtBottom);- expect(after).to.be.eql(true);+ expect(after).toBe(true);} finally {await browser.close();}diff --git a/test/request.js b/__tests__/request.jssimilarity index 79%rename from test/request.jsrename to __tests__/request.jsindex 5fa95ab45..c65049825 100644--- a/test/request.js+++ b/__tests__/request.js@@ -1,13 +1,12 @@import util from 'util';-import { expect } from 'chai';import { normalizeUrl } from 'apify-shared/utilities';import { hashPayload } from '../build/request';import Apify from '../build/index';describe('Apify.Request', () => {it('should not accept invalid values', () => {- expect(() => new Apify.Request({ url: 1 })).to.throw();- expect(() => new Apify.Request({ url: 'xxx' })).to.not.throw();+ expect(() => new Apify.Request({ url: 1 })).toThrowError();+ expect(() => new Apify.Request({ url: 'xxx' })).not.toThrowError();});it('should create unique key based on url for GET requests', () => {@@ -15,8 +14,8 @@ describe('Apify.Request', () => {const normalizedUrl = normalizeUrl(url);const request = new Apify.Request({ url });- expect(request.uniqueKey).to.be.eql(normalizedUrl);- expect(request.uniqueKey).to.not.eql(request.url);+ expect(request.uniqueKey).toEqual(normalizedUrl);+ expect(request.uniqueKey).not.toEqual(request.url);});it('should create unique key based on url, method and payload for POST requests', () => {@@ -28,7 +27,7 @@ describe('Apify.Request', () => {const uniqueKey = `POST(${payloadHash}):${normalizedUrl}`;- expect(request.uniqueKey).to.be.eql(uniqueKey);+ expect(request.uniqueKey).toEqual(uniqueKey);});it('works', () => {@@ -51,16 +50,16 @@ describe('Apify.Request', () => {},handledAt: new Date(),};- expect(new Apify.Request(data)).to.include(data);+ expect(new Apify.Request(data)).toEqual(expect.arrayContaining([data]));data.handledAt = (new Date()).toISOString();- expect((new Apify.Request(data)).handledAt).to.be.a('date');+ expect((new Apify.Request(data)).handledAt).toBeInstanceOf(Date);});it('should allow to push error messages', () => {const request = new Apify.Request({ url: 'http://example.com' });- expect(request.errorMessages).to.be.eql(null);+ expect(request.errorMessages).toBe(null);// Make a circular, unstringifiable object.const circularObj = { prop: 1 };@@ -90,7 +89,7 @@ describe('Apify.Request', () => {request.pushErrorMessage(toStr);request.pushErrorMessage(circularObj);- expect(request.errorMessages).to.be.eql([+ expect(request.errorMessages).toEqual(['undefined','false','5',@@ -108,13 +107,13 @@ describe('Apify.Request', () => {request.pushErrorMessage(new Error('error message.'));const last = request.errorMessages.pop();- expect(last).to.include('error message.');- expect(last).to.include(' at ');- expect(last).to.include(__filename.split(/[\\/]/g).pop());+ expect(last).toEqual(expect.arrayContaining(['error message.']));+ expect(last).toEqual(expect.arrayContaining([' at ']));+ expect(last).toEqual(expect.arrayContaining([__filename.split(/[\\/]/g).pop()]));});it('should not allow to have a GET request with payload', () => {- expect(() => new Apify.Request({ url: 'http://example.com', payload: 'foo' })).to.throw();- expect(() => new Apify.Request({ url: 'http://example.com', payload: 'foo', method: 'POST' })).to.not.throw();+ expect(() => new Apify.Request({ url: 'http://example.com', payload: 'foo' })).toThrowError();+ expect(() => new Apify.Request({ url: 'http://example.com', payload: 'foo', method: 'POST' })).not.toThrowError();});});diff --git a/test/request_list.js b/__tests__/request_list.jssimilarity index 73%rename from test/request_list.jsrename to __tests__/request_list.jsindex e31f080ec..2679dedbf 100644--- a/test/request_list.js+++ b/__tests__/request_list.js@@ -1,5 +1,4 @@import _ from 'underscore';-import { expect } from 'chai';import request from 'request-promise-native';import sinon from 'sinon';import log from 'apify-shared/log';@@ -30,19 +29,19 @@ describe('Apify.RequestList', () => {await requestList.initialize();- expect(await requestList.isEmpty()).to.be.eql(false);+ expect(await requestList.isEmpty()).toBe(false);const req = await requestList.fetchNextRequest();- expect(req.url).to.be.eql('https://example.com/1');- expect(await requestList.isEmpty()).to.be.eql(true);- expect(await requestList.isFinished()).to.be.eql(false);- expect(await requestList.fetchNextRequest()).to.be.eql(null);+ expect(req.url).toBe('https://example.com/1');+ expect(await requestList.isEmpty()).toBe(true);+ expect(await requestList.isFinished()).toBe(false);+ expect(await requestList.fetchNextRequest()).toBe(null);await requestList.markRequestHandled(req);- expect(await requestList.isEmpty()).to.be.eql(true);- expect(await requestList.isFinished()).to.be.eql(true);+ expect(await requestList.isEmpty()).toBe(true);+ expect(await requestList.isFinished()).toBe(true);});it('must be initialized before using any of the methods', async () => {@@ -51,7 +50,7 @@ describe('Apify.RequestList', () => {await expect(requestList.isEmpty()).to.be.rejectedWith();await expect(requestList.isFinished()).to.be.rejectedWith();- expect(() => requestList.getState()).to.throw();+ expect(() => requestList.getState()).toThrowError();await expect(requestList.markRequestHandled(requestObj)).to.be.rejectedWith();await expect(requestList.reclaimRequest(requestObj)).to.be.rejectedWith();await expect(requestList.fetchNextRequest()).to.be.rejectedWith();@@ -60,7 +59,7 @@ describe('Apify.RequestList', () => {await expect(requestList.isEmpty()).to.not.be.rejectedWith();await expect(requestList.isFinished()).to.not.be.rejectedWith();- expect(() => requestList.getState()).to.not.throw();+ expect(() => requestList.getState()).not.toThrowError();await expect(requestList.fetchNextRequest()).to.not.be.rejectedWith();await expect(requestList.reclaimRequest(requestObj)).to.not.be.rejectedWith();await expect(requestList.fetchNextRequest()).to.not.be.rejectedWith();@@ -100,13 +99,13 @@ describe('Apify.RequestList', () => {});await newList.initialize();- expect(await newList.isEmpty()).to.be.eql(false);- expect((await newList.fetchNextRequest()).url).to.be.eql('https://example.com/3');- expect((await newList.fetchNextRequest()).url).to.be.eql('https://example.com/5');- expect((await newList.fetchNextRequest()).url).to.be.eql('https://example.com/6');- expect((await newList.fetchNextRequest()).url).to.be.eql('https://example.com/7');- expect((await newList.fetchNextRequest()).url).to.be.eql('https://example.com/8');- expect(await newList.isEmpty()).to.be.eql(true);+ expect(await newList.isEmpty()).toBe(false);+ expect((await newList.fetchNextRequest()).url).toBe('https://example.com/3');+ expect((await newList.fetchNextRequest()).url).toBe('https://example.com/5');+ expect((await newList.fetchNextRequest()).url).toBe('https://example.com/6');+ expect((await newList.fetchNextRequest()).url).toBe('https://example.com/7');+ expect((await newList.fetchNextRequest()).url).toBe('https://example.com/8');+ expect(await newList.isEmpty()).toBe(true);});it('should correctly load list from hosted files in correct order', async () => {@@ -140,11 +139,11 @@ describe('Apify.RequestList', () => {await requestList.initialize();- expect(await requestList.fetchNextRequest()).to.include({ method: 'GET', url: list1[0] });- expect(await requestList.fetchNextRequest()).to.include({ method: 'GET', url: list1[1] });- expect(await requestList.fetchNextRequest()).to.include({ method: 'GET', url: list1[2] });- expect(await requestList.fetchNextRequest()).to.include({ method: 'POST', url: list2[0] });- expect(await requestList.fetchNextRequest()).to.include({ method: 'POST', url: list2[1] });+ expect(await requestList.fetchNextRequest()).toMatchObject({ method: 'GET', url: list1[0] });+ expect(await requestList.fetchNextRequest()).toMatchObject({ method: 'GET', url: list1[1] });+ expect(await requestList.fetchNextRequest()).toMatchObject({ method: 'GET', url: list1[2] });+ expect(await requestList.fetchNextRequest()).toMatchObject({ method: 'POST', url: list2[0] });+ expect(await requestList.fetchNextRequest()).toMatchObject({ method: 'POST', url: list2[1] });mock.verify();mock.restore();@@ -173,8 +172,8 @@ describe('Apify.RequestList', () => {await requestList.initialize();- expect(await requestList.fetchNextRequest()).to.include({ method: 'GET', url: listArr[0] });- expect(await requestList.fetchNextRequest()).to.include({ method: 'GET', url: listArr[1] });+ expect(await requestList.fetchNextRequest()).toMatchObject({ method: 'GET', url: listArr[0] });+ expect(await requestList.fetchNextRequest()).toMatchObject({ method: 'GET', url: listArr[1] });mock.verify();mock.restore();@@ -198,7 +197,7 @@ describe('Apify.RequestList', () => {await requestList.initialize();- expect(await requestList.fetchNextRequest()).to.eql(null);+ expect(await requestList.fetchNextRequest()).toBe(null);mock.verify();mock.restore();@@ -228,12 +227,12 @@ describe('Apify.RequestList', () => {const request4 = await requestList.fetchNextRequest();const request5 = await requestList.fetchNextRequest();- expect(request1.url).to.be.eql('https://example.com/1');- expect(request2.url).to.be.eql('https://example.com/2');- expect(request3.url).to.be.eql('https://example.com/3');- expect(request4.url).to.be.eql('https://example.com/4');- expect(request5.url).to.be.eql('https://example.com/5');- expect(requestList.getState()).to.be.eql({+ expect(request1.url).toBe('https://example.com/1');+ expect(request2.url).toBe('https://example.com/2');+ expect(request3.url).toBe('https://example.com/3');+ expect(request4.url).toBe('https://example.com/4');+ expect(request5.url).toBe('https://example.com/5');+ expect(requestList.getState()).toEqual({inProgress: {'https://example.com/1': true,'https://example.com/2': true,@@ -244,9 +243,9 @@ describe('Apify.RequestList', () => {nextIndex: 5,nextUniqueKey: 'https://example.com/6',});- expect(await requestList.isEmpty()).to.be.eql(false);- expect(await requestList.isFinished()).to.be.eql(false);- expect(requestList.inProgress).to.include(requestList.reclaimed);+ expect(await requestList.isEmpty()).toBe(false);+ expect(await requestList.isFinished()).toBe(false);+ expect(requestList.inProgress).toEqual(expect.arrayContaining([requestList.reclaimed]));//// Mark 1st, 2nd handled@@ -258,7 +257,7 @@ describe('Apify.RequestList', () => {await requestList.reclaimRequest(request3);await requestList.reclaimRequest(request4);- expect(requestList.getState()).to.be.eql({+ expect(requestList.getState()).toEqual({inProgress: {'https://example.com/3': true,'https://example.com/4': true,@@ -267,9 +266,9 @@ describe('Apify.RequestList', () => {nextIndex: 5,nextUniqueKey: 'https://example.com/6',});- expect(await requestList.isEmpty()).to.be.eql(false);- expect(await requestList.isFinished()).to.be.eql(false);- expect(requestList.inProgress).to.include(requestList.reclaimed);+ expect(await requestList.isEmpty()).toBe(false);+ expect(await requestList.isFinished()).toBe(false);+ expect(requestList.inProgress).toEqual(expect.arrayContaining([requestList.reclaimed]));//// Mark 5th handled@@ -277,7 +276,7 @@ describe('Apify.RequestList', () => {await requestList.markRequestHandled(request5);- expect(requestList.getState()).to.be.eql({+ expect(requestList.getState()).toEqual({inProgress: {'https://example.com/3': true,'https://example.com/4': true,@@ -285,9 +284,9 @@ describe('Apify.RequestList', () => {nextIndex: 5,nextUniqueKey: 'https://example.com/6',});- expect(await requestList.isEmpty()).to.be.eql(false);- expect(await requestList.isFinished()).to.be.eql(false);- expect(requestList.inProgress).to.include(requestList.reclaimed);+ expect(await requestList.isEmpty()).toBe(false);+ expect(await requestList.isFinished()).toBe(false);+ expect(requestList.inProgress).toEqual(expect.arrayContaining([requestList.reclaimed]));//// Fetch 3rd and 4th@@ -295,21 +294,21 @@ describe('Apify.RequestList', () => {//const reclaimed3 = await requestList.fetchNextRequest();- expect(reclaimed3.url).to.be.eql('https://example.com/3');+ expect(reclaimed3.url).toBe('https://example.com/3');const reclaimed4 = await requestList.fetchNextRequest();- expect(reclaimed4.url).to.be.eql('https://example.com/4');+ expect(reclaimed4.url).toBe('https://example.com/4');await requestList.markRequestHandled(request4);- expect(requestList.getState()).to.be.eql({+ expect(requestList.getState()).toEqual({inProgress: {'https://example.com/3': true,},nextIndex: 5,nextUniqueKey: 'https://example.com/6',});- expect(await requestList.isEmpty()).to.be.eql(false);- expect(await requestList.isFinished()).to.be.eql(false);- expect(requestList.inProgress).to.include(requestList.reclaimed);+ expect(await requestList.isEmpty()).toBe(false);+ expect(await requestList.isFinished()).toBe(false);+ expect(requestList.inProgress).toEqual(expect.arrayContaining([requestList.reclaimed]));//// Mark 3rd handled@@ -317,14 +316,14 @@ describe('Apify.RequestList', () => {await requestList.markRequestHandled(request3);- expect(requestList.getState()).to.be.eql({+ expect(requestList.getState()).toEqual({inProgress: {},nextIndex: 5,nextUniqueKey: 'https://example.com/6',});- expect(await requestList.isEmpty()).to.be.eql(false);- expect(await requestList.isFinished()).to.be.eql(false);- expect(requestList.inProgress).to.include(requestList.reclaimed);+ expect(await requestList.isEmpty()).toBe(false);+ expect(await requestList.isFinished()).toBe(false);+ expect(requestList.inProgress).toEqual(expect.arrayContaining([requestList.reclaimed]));//// Fetch 6th@@ -332,18 +331,18 @@ describe('Apify.RequestList', () => {const request6 = await requestList.fetchNextRequest();- expect(request6.url).to.be.eql('https://example.com/6');- expect(await requestList.fetchNextRequest()).to.be.eql(null);- expect(requestList.getState()).to.be.eql({+ expect(request6.url).toBe('https://example.com/6');+ expect(await requestList.fetchNextRequest()).toBe(null);+ expect(requestList.getState()).toEqual({inProgress: {'https://example.com/6': true,},nextIndex: 6,nextUniqueKey: null,});- expect(await requestList.isEmpty()).to.be.eql(true);- expect(await requestList.isFinished()).to.be.eql(false);- expect(requestList.inProgress).to.include(requestList.reclaimed);+ expect(await requestList.isEmpty()).toBe(true);+ expect(await requestList.isFinished()).toBe(false);+ expect(requestList.inProgress).toEqual(expect.arrayContaining([requestList.reclaimed]));//// Reclaim 6th@@ -351,16 +350,16 @@ describe('Apify.RequestList', () => {await requestList.reclaimRequest(request6);- expect(requestList.getState()).to.be.eql({+ expect(requestList.getState()).toEqual({inProgress: {'https://example.com/6': true,},nextIndex: 6,nextUniqueKey: null,});- expect(await requestList.isEmpty()).to.be.eql(false);- expect(await requestList.isFinished()).to.be.eql(false);- expect(requestList.inProgress).to.include(requestList.reclaimed);+ expect(await requestList.isEmpty()).toBe(false);+ expect(await requestList.isFinished()).toBe(false);+ expect(requestList.inProgress).toEqual(expect.arrayContaining([requestList.reclaimed]));//// Fetch 6th@@ -368,17 +367,17 @@ describe('Apify.RequestList', () => {const reclaimed6 = await requestList.fetchNextRequest();- expect(reclaimed6.url).to.be.eql('https://example.com/6');- expect(requestList.getState()).to.be.eql({+ expect(reclaimed6.url).toBe('https://example.com/6');+ expect(requestList.getState()).toEqual({inProgress: {'https://example.com/6': true,},nextIndex: 6,nextUniqueKey: null,});- expect(await requestList.isEmpty()).to.be.eql(true);- expect(await requestList.isFinished()).to.be.eql(false);- expect(requestList.inProgress).to.include(requestList.reclaimed);+ expect(await requestList.isEmpty()).toBe(true);+ expect(await requestList.isFinished()).toBe(false);+ expect(requestList.inProgress).toEqual(expect.arrayContaining([requestList.reclaimed]));//// Mark 6th handled@@ -386,14 +385,14 @@ describe('Apify.RequestList', () => {await requestList.markRequestHandled(reclaimed6);- expect(requestList.getState()).to.be.eql({+ expect(requestList.getState()).toEqual({inProgress: {},nextIndex: 6,nextUniqueKey: null,});- expect(await requestList.isEmpty()).to.be.eql(true);- expect(await requestList.isFinished()).to.be.eql(true);- expect(requestList.inProgress).to.include(requestList.reclaimed);+ expect(await requestList.isEmpty()).toBe(true);+ expect(await requestList.isFinished()).toBe(true);+ expect(requestList.inProgress).toEqual(expect.arrayContaining([requestList.reclaimed]));});it('should correctly persist its state when persistStateKey is set', async () => {@@ -416,11 +415,11 @@ describe('Apify.RequestList', () => {const requestList = new Apify.RequestList(opts);await requestList.initialize();- expect(requestList.isStatePersisted).to.be.eql(true);+ expect(requestList.isStatePersisted).toBe(true);// Fetch one request and check that state is not persisted.const request1 = await requestList.fetchNextRequest();- expect(requestList.isStatePersisted).to.be.eql(false);+ expect(requestList.isStatePersisted).toBe(false);// Persist state.mock.expects('setValue')@@ -429,24 +428,24 @@ describe('Apify.RequestList', () => {.returns(Promise.resolve());Apify.events.emit(ACTOR_EVENT_NAMES_EX.PERSIST_STATE);await delayPromise(1);- expect(requestList.isStatePersisted).to.be.eql(true);+ expect(requestList.isStatePersisted).toBe(true);// Do some other changes and persist it again.const request2 = await requestList.fetchNextRequest();- expect(requestList.isStatePersisted).to.be.eql(false);+ expect(requestList.isStatePersisted).toBe(false);await requestList.markRequestHandled(request2);- expect(requestList.isStatePersisted).to.be.eql(false);+ expect(requestList.isStatePersisted).toBe(false);mock.expects('setValue').once().withArgs(PERSIST_STATE_KEY, requestList.getState()).returns(Promise.resolve());Apify.events.emit(ACTOR_EVENT_NAMES_EX.PERSIST_STATE);await delayPromise(1);- expect(requestList.isStatePersisted).to.be.eql(true);+ expect(requestList.isStatePersisted).toBe(true);// Reclaim event doesn't change the state.await requestList.reclaimRequest(request1);- expect(requestList.isStatePersisted).to.be.eql(true);+ expect(requestList.isStatePersisted).toBe(true);// Now initiate new request list from saved state and check that it's same as state// of original request list.@@ -456,7 +455,7 @@ describe('Apify.RequestList', () => {.returns(Promise.resolve(requestList.getState()));const requestList2 = new Apify.RequestList(opts);await requestList2.initialize();- expect(requestList2.getState()).to.be.eql(requestList.getState());+ expect(requestList2.getState()).toEqual(requestList.getState());mock.verify();});@@ -475,7 +474,7 @@ describe('Apify.RequestList', () => {};const requestList = new Apify.RequestList(opts);- expect(requestList.areSourcesPersisted).to.be.eql(false);+ expect(requestList.areSourcesPersisted).toBe(false);// Expect an attempt to load sources.mock.expects('getValue')@@ -490,7 +489,7 @@ describe('Apify.RequestList', () => {.returns(Promise.resolve());await requestList.initialize();- expect(requestList.areSourcesPersisted).to.be.eql(true);+ expect(requestList.areSourcesPersisted).toBe(true);const opts2 = {sources: [@@ -502,7 +501,7 @@ describe('Apify.RequestList', () => {};const requestList2 = new Apify.RequestList(opts2);- expect(requestList2.areSourcesPersisted).to.be.eql(false);+ expect(requestList2.areSourcesPersisted).toBe(false);// Now initialize new request list from saved sources and check that// they are same as state of original request list.@@ -515,8 +514,8 @@ describe('Apify.RequestList', () => {.never();await requestList2.initialize();- expect(requestList2.areSourcesPersisted).to.be.eql(true);- expect(requestList2.requests).to.be.eql(requestList.requests);+ expect(requestList2.areSourcesPersisted).toBe(true);+ expect(requestList2.requests).toEqual(requestList.requests);mock.verify();});@@ -539,7 +538,7 @@ describe('Apify.RequestList', () => {const urlsFromTxt = ['http://example.com/3', 'http://example.com/4'];const requestList = new Apify.RequestList(opts);- expect(requestList.areSourcesPersisted).to.be.eql(false);+ expect(requestList.areSourcesPersisted).toBe(false);// Expect an attempt to load sources.kvsMock.expects('getValue')@@ -560,7 +559,7 @@ describe('Apify.RequestList', () => {.returns(Promise.resolve(urlsFromTxt));await requestList.initialize();- expect(requestList.areSourcesPersisted).to.be.eql(true);+ expect(requestList.areSourcesPersisted).toBe(true);kvsMock.verify();publicUtilsMock.verify();@@ -623,7 +622,7 @@ describe('Apify.RequestList', () => {await requestList.initialize();- expect(requestList.length()).to.be.eql(4);+ expect(requestList.length()).toBe(4);});it('it gets correct handledCount()', async () => {@@ -644,16 +643,16 @@ describe('Apify.RequestList', () => {const req1 = await requestList.fetchNextRequest();const req2 = await requestList.fetchNextRequest();const req3 = await requestList.fetchNextRequest();- expect(requestList.handledCount()).to.be.eql(0);+ expect(requestList.handledCount()).toBe(0);await requestList.markRequestHandled(req2);- expect(requestList.handledCount()).to.be.eql(1);+ expect(requestList.handledCount()).toBe(1);await requestList.markRequestHandled(req3);- expect(requestList.handledCount()).to.be.eql(2);+ expect(requestList.handledCount()).toBe(2);await requestList.reclaimRequest(req1);- expect(requestList.handledCount()).to.be.eql(2);+ expect(requestList.handledCount()).toBe(2);});it('should correctly keep duplicate URLs while keepDuplicateUrls is set', async () => {@@ -670,7 +669,7 @@ describe('Apify.RequestList', () => {});await requestList.initialize();- expect(requestList.length()).to.be.eql(4);+ expect(requestList.length()).toBe(4);log.setLevel(log.LEVELS.INFO);const logStub = sinon.stub(console, 'log');@@ -686,9 +685,9 @@ describe('Apify.RequestList', () => {});await requestList.initialize();- expect(requestList.length()).to.be.eql(6);- expect(logStub.called).to.be.eql(true);- expect(logStub.getCall(0).args[0]).to.include('Check your sources\' unique keys.');+ expect(requestList.length()).toBe(6);+ expect(logStub.called).toBe(true);+ expect(logStub.getCall(0).args[0]).toEqual(expect.arrayContaining(['Check your sources\' unique keys.']));logStub.restore();log.setLevel(log.LEVELS.ERROR);@@ -704,11 +703,11 @@ describe('Apify.RequestList', () => {const sources = [{ url: 'https://example.com' }];const rl = await Apify.openRequestList(name, sources);- expect(rl).to.be.instanceof(Apify.RequestList);- expect(rl.persistStateKey.startsWith(name)).to.be.eql(true);- expect(rl.persistSourcesKey.startsWith(name)).to.be.eql(true);- expect(rl.sources).to.be.eql(sources);- expect(rl.isInitialized).to.be.eql(true);+ expect(rl).toBeInstanceOf(Apify.RequestList);+ expect(rl.persistStateKey.startsWith(name)).toBe(true);+ expect(rl.persistSourcesKey.startsWith(name)).toBe(true);+ expect(rl.sources).toEqual(sources);+ expect(rl.isInitialized).toBe(true);mock.verify();});@@ -721,11 +720,11 @@ describe('Apify.RequestList', () => {const sources = ['https://example.com'];const rl = await Apify.openRequestList(name, sources);- expect(rl).to.be.instanceof(Apify.RequestList);- expect(rl.persistStateKey.startsWith(name)).to.be.eql(true);- expect(rl.persistSourcesKey.startsWith(name)).to.be.eql(true);- expect(rl.sources).to.be.eql(sources.map(url => ({ url })));- expect(rl.isInitialized).to.be.eql(true);+ expect(rl).toBeInstanceOf(Apify.RequestList);+ expect(rl.persistStateKey.startsWith(name)).toBe(true);+ expect(rl.persistSourcesKey.startsWith(name)).toBe(true);+ expect(rl.sources).toEqual(sources.map(url => ({ url })));+ expect(rl.isInitialized).toBe(true);mock.verify();});@@ -742,12 +741,12 @@ describe('Apify.RequestList', () => {};const rl = await Apify.openRequestList(name, sources, options);- expect(rl).to.be.instanceof(Apify.RequestList);- expect(rl.persistStateKey.startsWith(name)).to.be.eql(true);- expect(rl.persistSourcesKey.startsWith(name)).to.be.eql(true);- expect(rl.sources).to.be.eql(sources);- expect(rl.isInitialized).to.be.eql(true);- expect(rl.keepDuplicateUrls).to.be.eql(true);+ expect(rl).toBeInstanceOf(Apify.RequestList);+ expect(rl.persistStateKey.startsWith(name)).toBe(true);+ expect(rl.persistSourcesKey.startsWith(name)).toBe(true);+ expect(rl.sources).toEqual(sources);+ expect(rl.isInitialized).toBe(true);+ expect(rl.keepDuplicateUrls).toBe(true);mock.verify();});@@ -760,11 +759,11 @@ describe('Apify.RequestList', () => {const sources = [{ url: 'https://example.com' }];const rl = await Apify.openRequestList(name, sources);- expect(rl).to.be.instanceof(Apify.RequestList);- expect(rl.persistStateKey).to.be.eql(null);- expect(rl.persistSourcesKey).to.be.eql(null);- expect(rl.sources).to.be.eql(sources);- expect(rl.isInitialized).to.be.eql(true);+ expect(rl).toBeInstanceOf(Apify.RequestList);+ expect(rl.persistStateKey).toBe(null);+ expect(rl.persistSourcesKey).toBe(null);+ expect(rl.sources).toEqual(sources);+ expect(rl.isInitialized).toBe(true);mock.verify();});@@ -781,9 +780,9 @@ describe('Apify.RequestList', () => {await Apify.openRequestList(...arg);throw new Error('wrong error');} catch (err) {- expect(err.message).to.not.be.eql('wrong error');- expect(err.message).to.include('Parameter');- expect(err.message).to.not.be.eql('must');+ expect(err.message).not.toBe('wrong error');+ expect(err.message).toEqual(expect.arrayContaining(['Parameter']));+ expect(err.message).not.toBe('must');}}});diff --git a/test/request_queue.js b/__tests__/request_queue.jssimilarity index 76%rename from test/request_queue.jsrename to __tests__/request_queue.jsindex fd64a0319..dfba1e85a 100644--- a/test/request_queue.js+++ b/__tests__/request_queue.js@@ -14,7 +14,7 @@ import { emptyLocalStorageSubdir, LOCAL_STORAGE_DIR, expectNotUsingLocalStorage,const { apifyClient } = utils;const expectRequestsSame = (req1, req2) => {- expect(_.omit(req1, 'id')).to.be.eql(_.omit(req2, 'id'));+ expect(_.omit(req1, 'id')).toEqual(_.omit(req2, 'id'));};describe('RequestQueue', () => {@@ -32,44 +32,46 @@ describe('RequestQueue', () => {await queue.addRequest(new Apify.Request({ url: 'http://example.com/middle' }));await queue.addRequest(new Apify.Request({ url: 'http://example.com/last-but-first' }), { forefront: true });- expect(req1.id).to.be.a('string');- expect(req1.uniqueKey).to.eql('http://example.com/first');- expect(info1).to.contain({+ expect(typeof req1.id).toBe('string');+ expect(req1.uniqueKey).toBe('http://example.com/first');+ expect(info1).toMatchObject({wasAlreadyPresent: false,wasAlreadyHandled: false,request: req1,});- expect(info1.requestId).to.be.a('string');+ expect(typeof info1.requestId).toBe('string');const request3 = await queue.fetchNextRequest();const request1 = await queue.fetchNextRequest();const request2 = await queue.fetchNextRequest();- expect(await queue.getRequest(request1.id)).to.be.eql(request1);- expect(await queue.getRequest(request2.id)).to.be.eql(request2);- expect(await queue.getRequest(request3.id)).to.be.eql(request3);- expect(await queue.getRequest(request1.id)).to.not.be.eql(request3);- expect(await queue.getRequest('non-exiting')).to.be.eql(null);+ expect(await queue.getRequest(request1.id)).toEqual(request1);+ expect(await queue.getRequest(request2.id)).toEqual(request2);+ expect(await queue.getRequest(request3.id)).toEqual(request3);+ expect(await queue.getRequest(request1.id)).not.toEqual(request3);+ expect(await queue.getRequest('non-exiting')).toBe(null);- expect(request3.url).to.be.eql('http://example.com/last-but-first');- expect(request1.url).to.be.eql('http://example.com/first');- expect(request2.url).to.be.eql('http://example.com/middle');+ expect(request3.url).toBe('http://example.com/last-but-first');+ expect(request1.url).toBe('http://example.com/first');+ expect(request2.url).toBe('http://example.com/middle');- expect((await queue.getRequest(request3.id)).url).to.be.eql('http://example.com/last-but-first');- expect((await queue.getRequest(request1.id)).url).to.be.eql('http://example.com/first');- expect((await queue.getRequest(request2.id)).url).to.be.eql('http://example.com/middle');+ expect((await queue.getRequest(request3.id)).url).toBe('http://example.com/last-but-first');+ expect((await queue.getRequest(request1.id)).url).toBe('http://example.com/first');+ expect((await queue.getRequest(request2.id)).url).toBe('http://example.com/middle');- expect(await queue.fetchNextRequest()).to.be.eql(null);- expect(await queue.isEmpty()).to.be.eql(true);- expect(await queue.isFinished()).to.be.eql(false);+ expect(await queue.fetchNextRequest()).toBe(null);+ expect(await queue.isEmpty()).toBe(true);+ expect(await queue.isFinished()).toBe(false);// Test validationsawait queue.markRequestHandled(new Apify.Request({ id: 'XXX', url: 'dummy' }))- .catch(err => expect(err.message).to.match(/Cannot mark request XXX as handled, because it is not in progress/));+ .catch(err => expect(err.message).toMatch(/Cannot mark request XXX as handled, because it is not in progress/));await queue.reclaimRequest(new Apify.Request({ id: 'XXX', url: 'dummy' }))- .catch(err => expect(err.message).to.match(/Cannot reclaim request XXX, because it is not in progress/));+ .catch(err => expect(err.message).toMatch(/Cannot reclaim request XXX, because it is not in progress/));await queue.addRequest(new Apify.Request({ id: 'id-already-set', url: 'dummy' }))- .catch(err => expect(err.message).to.match(/Request already has the "id" field set so it cannot be added to the queue/));+ .catch(err => expect(err.message).toMatch(+ /Request already has the "id" field set so it cannot be added to the queue/+ ));// Check that changes to Requests are persisted to Queue.request1.errorMessages = ['Hello'];@@ -79,34 +81,34 @@ describe('RequestQueue', () => {await queue.markRequestHandled(request3);await queue.reclaimRequest(request1);const info2 = await queue.reclaimRequest(request2);- expect(await queue.isEmpty()).to.be.eql(false);+ expect(await queue.isEmpty()).toBe(false);- expect(info2).to.contain({+ expect(info2).toMatchObject({wasAlreadyPresent: true,wasAlreadyHandled: false,request: request2,});- expect(info2.requestId).to.be.a('string');+ expect(typeof info2.requestId).toBe('string');const handledRequest3 = await queue.getRequest(request3.id);- expect(handledRequest3.handledAt).to.be.an.instanceof(Date);- expect(handledRequest3).to.be.eql(request3);+ expect(handledRequest3.handledAt).toBeInstanceOf(Date);+ expect(handledRequest3).toEqual(request3);- expect(await queue.fetchNextRequest()).to.be.eql(request1);- expect(await queue.fetchNextRequest()).to.be.eql(request2);- expect(await queue.fetchNextRequest()).to.be.eql(null);+ expect(await queue.fetchNextRequest()).toEqual(request1);+ expect(await queue.fetchNextRequest()).toEqual(request2);+ expect(await queue.fetchNextRequest()).toBe(null);const info3 = await queue.markRequestHandled(request1);await queue.markRequestHandled(request2);- expect(info3).to.contain({+ expect(info3).toMatchObject({wasAlreadyPresent: true,wasAlreadyHandled: false,request: request1,});- expect(info3.requestId).to.be.a('string');+ expect(typeof info3.requestId).toBe('string');- expect(await queue.isEmpty()).to.be.eql(true);- expect(await queue.isFinished()).to.be.eql(true);+ expect(await queue.isEmpty()).toBe(true);+ expect(await queue.isFinished()).toBe(true);// Drop it.const queueDir = path.join(LOCAL_STORAGE_DIR, LOCAL_STORAGE_SUBDIR, 'my-queue-0');@@ -122,7 +124,7 @@ describe('RequestQueue', () => {await queue.addRequest({ url: '' });assert.fail('This should not happen');} catch (e) {- expect(e.message).to.contain('The "url" option cannot be empty string');+ expect(e.message).toEqual(expect.arrayContaining(['The "url" option cannot be empty string']));}await queue.addRequest(new Apify.Request({ url: 'something' }));await Apify.utils.sleep(20);@@ -131,14 +133,14 @@ describe('RequestQueue', () => {const request2 = await queue.fetchNextRequest();const request1 = await queue.fetchNextRequest();- expect(request1.url).to.be.eql('dummy');- expect(request1.uniqueKey).to.be.eql('dummy');+ expect(request1.url).toBe('dummy');+ expect(request1.uniqueKey).toBe('dummy');- expect(request2.url).to.be.eql('something');- expect(request2.uniqueKey).to.be.eql('something');+ expect(request2.url).toBe('something');+ expect(request2.uniqueKey).toBe('something');- expect(await queue.getRequest(request1.id)).to.be.eql(request1);- expect(await queue.getRequest(request2.id)).to.be.eql(request2);+ expect(await queue.getRequest(request1.id)).toEqual(request1);+ expect(await queue.getRequest(request2.id)).toEqual(request2);});it('supports forefront param in reclaimRequest()', async () => {@@ -149,13 +151,13 @@ describe('RequestQueue', () => {await queue.addRequest(new Apify.Request({ url: 'http://example.com/third' }));const request1ForFirstTime = await queue.fetchNextRequest();- expect(request1ForFirstTime.url).to.be.eql('http://example.com/first');+ expect(request1ForFirstTime.url).toBe('http://example.com/first');// Return it to the front.await queue.reclaimRequest(request1ForFirstTime, { forefront: true });const request1ForSecondTime = await queue.fetchNextRequest();- expect(request1ForSecondTime.url).to.be.eql('http://example.com/first');+ expect(request1ForSecondTime.url).toBe('http://example.com/first');// Now put it at the back.await queue.reclaimRequest(request1ForSecondTime);@@ -164,9 +166,9 @@ describe('RequestQueue', () => {const request3 = await queue.fetchNextRequest();const request1 = await queue.fetchNextRequest();- expect(request1.url).to.be.eql('http://example.com/first');- expect(request2.url).to.be.eql('http://example.com/middle');- expect(request3.url).to.be.eql('http://example.com/third');+ expect(request1.url).toBe('http://example.com/first');+ expect(request2.url).toBe('http://example.com/middle');+ expect(request3.url).toBe('http://example.com/third');});it('should get initialized from existing dir', async () => {@@ -187,18 +189,18 @@ describe('RequestQueue', () => {// Now do the same with another queue.const anotherQueue = new RequestQueueLocal('my-queue-2', LOCAL_STORAGE_DIR);- expect(await anotherQueue.isEmpty()).to.be.eql(false);- expect(await anotherQueue.isFinished()).to.be.eql(false);+ expect(await anotherQueue.isEmpty()).toBe(false);+ expect(await anotherQueue.isFinished()).toBe(false);const request3FromAnotherQueue = await anotherQueue.fetchNextRequest();const request2FromAnotherQueue = await anotherQueue.fetchNextRequest();expectRequestsSame(request3FromAnotherQueue, request3);expectRequestsSame(request2FromAnotherQueue, request2);- expect(await anotherQueue.isEmpty()).to.be.eql(true);- expect(await anotherQueue.isFinished()).to.be.eql(false);+ expect(await anotherQueue.isEmpty()).toBe(true);+ expect(await anotherQueue.isFinished()).toBe(false);await anotherQueue.markRequestHandled(request3FromAnotherQueue);await anotherQueue.markRequestHandled(request2FromAnotherQueue);- expect(await anotherQueue.isEmpty()).to.be.eql(true);- expect(await anotherQueue.isFinished()).to.be.eql(true);+ expect(await anotherQueue.isEmpty()).toBe(true);+ expect(await anotherQueue.isFinished()).toBe(true);});it('should accept plain object in addRequest()', async () => {@@ -206,7 +208,7 @@ describe('RequestQueue', () => {await queue.addRequest({ url: 'http://example.com/a' });expect((await queue.fetchNextRequest()).url,- ).to.be.eql('http://example.com/a');+ ).toBe('http://example.com/a');});it('getInfo() and handledCount() should work', async () => {@@ -214,7 +216,7 @@ describe('RequestQueue', () => {const queue = new RequestQueueLocal(queueName, LOCAL_STORAGE_DIR);let count = await queue.handledCount();let info;- expect(count).to.be.eql(0);+ expect(count).toBe(0);const r1 = new Apify.Request({ url: 'http://example.com/1' });const r2 = new Apify.Request({ url: 'http://example.com/2' });const r3 = new Apify.Request({ url: 'http://example.com/3' });@@ -223,27 +225,27 @@ describe('RequestQueue', () => {count = await queue.handledCount();info = await queue.getInfo();- expect(count).to.be.eql(0);- expect(info).to.be.an('object');- expect(info.id).to.be.eql(queueName);- expect(info.name).to.be.eql(queueName);- expect(info.userId).to.be.eql(null);- expect(info.totalRequestCount).to.be.eql(2);- expect(info.pendingRequestCount).to.be.eql(2);- expect(info.handledRequestCount).to.be.eql(0);+ expect(count).toBe(0);+ expect(info).toBeInstanceOf(Object);+ expect(info.id).toEqual(queueName);+ expect(info.name).toEqual(queueName);+ expect(info.userId).toBe(null);+ expect(info.totalRequestCount).toBe(2);+ expect(info.pendingRequestCount).toBe(2);+ expect(info.handledRequestCount).toBe(0);const cTime = info.createdAt.getTime();let mTime = info.modifiedAt.getTime();- expect(cTime).to.be.below(Date.now() + 1);- expect(cTime).to.be.at.most(mTime);+ expect(cTime).toBeLessThan(Date.now() + 1);+ expect(cTime).toBeLessThanOrEqual(mTime);const rf1 = await queue.fetchNextRequest();await queue.markRequestHandled(rf1);count = await queue.handledCount();info = await queue.getInfo();- expect(count).to.be.eql(1);- expect(info.totalRequestCount).to.be.eql(2);- expect(info.pendingRequestCount).to.be.eql(1);- expect(info.handledRequestCount).to.be.eql(1);+ expect(count).toBe(1);+ expect(info.totalRequestCount).toBe(2);+ expect(info.pendingRequestCount).toBe(1);+ expect(info.handledRequestCount).toBe(1);await queue.addRequest(r3);const rf2 = await queue.fetchNextRequest();@@ -252,10 +254,10 @@ describe('RequestQueue', () => {await queue.markRequestHandled(rf3);count = await queue.handledCount();info = await queue.getInfo();- expect(count).to.be.eql(3);- expect(info.totalRequestCount).to.be.eql(3);- expect(info.pendingRequestCount).to.be.eql(0);- expect(info.handledRequestCount).to.be.eql(3);+ expect(count).toBe(3);+ expect(info.totalRequestCount).toBe(3);+ expect(info.pendingRequestCount).toBe(0);+ expect(info.handledRequestCount).toBe(3);// Test access timeawait Apify.utils.sleep(2);@@ -267,18 +269,18 @@ describe('RequestQueue', () => {const cTime2 = info.createdAt.getTime();mTime = info.modifiedAt.getTime();const aTime = info.accessedAt.getTime();- expect(cTime).to.be.eql(cTime2);- expect(mTime).to.be.below(aTime);- expect(mTime).to.be.below(now);- expect(aTime).to.be.below(now);+ expect(cTime).toEqual(cTime2);+ expect(mTime).toBeLessThan(aTime);+ expect(mTime).toBeLessThan(now);+ expect(aTime).toBeLessThan(now);const newQueue = new RequestQueueLocal(queueName, LOCAL_STORAGE_DIR);count = await newQueue.handledCount();info = await queue.getInfo();- expect(count).to.be.eql(3);- expect(info.totalRequestCount).to.be.eql(3);- expect(info.pendingRequestCount).to.be.eql(0);- expect(info.handledRequestCount).to.be.eql(3);+ expect(count).toBe(3);+ expect(info.totalRequestCount).toBe(3);+ expect(info.pendingRequestCount).toBe(0);+ expect(info.handledRequestCount).toBe(3);});it('deprecated delete() still works', async () => {@@ -314,32 +316,32 @@ describe('RequestQueue', () => {.returns(Promise.resolve({ requestId: 'a', wasAlreadyHandled: false, wasAlreadyPresent: false, request: requestA }));const queueOperationInfo1 = await queue.addRequest(requestA);- expect(requestA.id).to.eql('a');- expect(requestA.uniqueKey).to.eql('http://example.com/a');- expect(queueOperationInfo1).to.include({+ expect(requestA.id).toBe('a');+ expect(requestA.uniqueKey).toBe('http://example.com/a');+ expect(queueOperationInfo1).toMatchObject({wasAlreadyPresent: false,wasAlreadyHandled: false,requestId: 'a',});- expect(queueOperationInfo1.request).to.include({+ expect(queueOperationInfo1.request).toMatchObject({id: 'a',});- expect(queue.queueHeadDict.length()).to.be.eql(1);+ expect(queue.queueHeadDict.length()).toBe(1);// Try to add again the a request with the same URLconst copyOfRequest = { url: 'http://example.com/a' };const queueOperationInfo2 = await queue.addRequest(copyOfRequest);- expect(copyOfRequest.id).to.eql('a');- expect(copyOfRequest.uniqueKey).to.eql('http://example.com/a');- expect(queueOperationInfo2).to.include({+ expect(copyOfRequest.id).toBe('a');+ expect(copyOfRequest.uniqueKey).toBe('http://example.com/a');+ expect(queueOperationInfo2).toMatchObject({wasAlreadyPresent: true,wasAlreadyHandled: false,requestId: 'a',});- expect(queueOperationInfo2.request).to.include({+ expect(queueOperationInfo2.request).toMatchObject({id: 'a',});- expect(queue.queueHeadDict.length()).to.be.eql(1);+ expect(queue.queueHeadDict.length()).toBe(1);const requestB = new Request({ url: 'http://example.com/b' });mock.expects('addRequest')@@ -353,8 +355,8 @@ describe('RequestQueue', () => {.returns(Promise.resolve({ requestId: 'b', wasAlreadyHandled: false, wasAlreadyPresent: false, request: requestB }));await queue.addRequest(requestB, { forefront: true });- expect(queue.queueHeadDict.length()).to.be.eql(2);- expect(queue.inProgressCount()).to.be.eql(0);+ expect(queue.queueHeadDict.length()).toBe(2);+ expect(queue.inProgressCount()).toBe(0);// Forefronted request was added to the queue.mock.expects('getRequest')@@ -365,17 +367,19 @@ describe('RequestQueue', () => {}).returns(Promise.resolve(_.extend(requestB, { id: 'b' })));const requestBFromQueue = await queue.fetchNextRequest();- expect(requestBFromQueue).to.be.eql(requestB);- expect(queue.queueHeadDict.length()).to.be.eql(1);- expect(queue.inProgressCount()).to.be.eql(1);+ expect(requestBFromQueue).toEqual(requestB);+ expect(queue.queueHeadDict.length()).toBe(1);+ expect(queue.inProgressCount()).toBe(1);// Test validationsawait queue.markRequestHandled(new Request({ id: 'XXX', url: 'dummy' }))- .catch(err => expect(err.message).to.match(/Cannot mark request XXX as handled, because it is not in progress/));+ .catch(err => expect(err.message).toMatch(/Cannot mark request XXX as handled, because it is not in progress/));await queue.reclaimRequest(new Request({ id: 'XXX', url: 'dummy' }))- .catch(err => expect(err.message).to.match(/Cannot reclaim request XXX, because it is not in progress/));+ .catch(err => expect(err.message).toMatch(/Cannot reclaim request XXX, because it is not in progress/));await queue.addRequest(new Request({ id: 'id-already-set', url: 'dummy' }))- .catch(err => expect(err.message).to.match(/Request already has the "id" field set so it cannot be added to the queue/));+ .catch(err => expect(err.message).toMatch(+ /Request already has the "id" field set so it cannot be added to the queue/+ ));// getRequest() returns null if object was not found.mock.expects('getRequest')@@ -386,7 +390,7 @@ describe('RequestQueue', () => {}).returns(Promise.resolve(null));const requestXFromQueue = await queue.getRequest('non-existent');- expect(requestXFromQueue).to.be.eql(null);+ expect(requestXFromQueue).toBe(null);// Reclaim it.mock.expects('updateRequest')@@ -399,11 +403,11 @@ describe('RequestQueue', () => {}).returns(Promise.resolve({ requestId: requestB.id, wasAlreadyHandled: false, wasAlreadyPresent: true, request: requestB }));await queue.reclaimRequest(requestB, { forefront: true });- expect(queue.queueHeadDict.length()).to.be.eql(1);- expect(queue.inProgressCount()).to.be.eql(1);+ expect(queue.queueHeadDict.length()).toBe(1);+ expect(queue.inProgressCount()).toBe(1);await Apify.utils.sleep(STORAGE_CONSISTENCY_DELAY_MILLIS + 10);- expect(queue.queueHeadDict.length()).to.be.eql(2);- expect(queue.inProgressCount()).to.be.eql(0);+ expect(queue.queueHeadDict.length()).toBe(2);+ expect(queue.inProgressCount()).toBe(0);// Fetch again.mock.expects('getRequest')@@ -414,9 +418,9 @@ describe('RequestQueue', () => {}).returns(Promise.resolve(_.extend(requestB, { id: 'b' })));const requestBFromQueue2 = await queue.fetchNextRequest();- expect(requestBFromQueue2).to.be.eql(requestB);- expect(queue.queueHeadDict.length()).to.be.eql(1);- expect(queue.inProgressCount()).to.be.eql(1);+ expect(requestBFromQueue2).toEqual(requestB);+ expect(queue.queueHeadDict.length()).toBe(1);+ expect(queue.inProgressCount()).toBe(1);// Mark handled.mock.expects('updateRequest')@@ -428,8 +432,8 @@ describe('RequestQueue', () => {}).returns(Promise.resolve({ requestId: requestB.id, wasAlreadyHandled: false, wasAlreadyPresent: true, request: requestB }));await queue.markRequestHandled(requestB);- expect(queue.queueHeadDict.length()).to.be.eql(1);- expect(queue.inProgressCount()).to.be.eql(0);+ expect(queue.queueHeadDict.length()).toBe(1);+ expect(queue.inProgressCount()).toBe(0);// Emulate there are no cached items in queuequeue.queueHeadDict.clear();@@ -456,9 +460,9 @@ describe('RequestQueue', () => {}).returns(Promise.resolve(_.extend(requestA, { id: 'a' })));const requestAFromQueue = await queue.fetchNextRequest();- expect(requestAFromQueue).to.be.eql(requestA);- expect(queue.queueHeadDict.length()).to.be.eql(1);- expect(queue.inProgressCount()).to.be.eql(1);+ expect(requestAFromQueue).toEqual(requestA);+ expect(queue.queueHeadDict.length()).toBe(1);+ expect(queue.inProgressCount()).toBe(1);// Drop queue.mock.expects('deleteQueue')@@ -504,7 +508,7 @@ describe('RequestQueue', () => {// Add request B that has same unique so that addRequest() is not called because it's already cached.mock.expects('addRequest').never();- expect(await queue.addRequest(requestB)).to.be.eql({+ expect(await queue.addRequest(requestB)).toEqual({requestId: 'a',wasAlreadyPresent: true,wasAlreadyHandled: false,@@ -546,7 +550,7 @@ describe('RequestQueue', () => {// Add request Y that has same unique so that addRequest() is not called because it's already cached.mock.expects('addRequest').never();- expect(await queue.addRequest(requestY)).to.be.eql({+ expect(await queue.addRequest(requestY)).toEqual({requestId: 'x',wasAlreadyPresent: true,wasAlreadyHandled: true,@@ -579,12 +583,12 @@ describe('RequestQueue', () => {{ id: 'a', uniqueKey: 'aaa' },],}));- expect(await queue.isEmpty()).to.be.eql(false);+ expect(await queue.isEmpty()).toBe(false);// Add request A and addRequest is not called because was already cached.const requestA = new Request({ url: 'http://example.com/a', uniqueKey: 'aaa' });mock.expects('addRequest').never();- expect(await queue.addRequest(requestA)).to.be.eql({+ expect(await queue.addRequest(requestA)).toEqual({requestId: 'a',wasAlreadyPresent: true,wasAlreadyHandled: false,@@ -623,7 +627,7 @@ describe('RequestQueue', () => {request: requestA,}));await queue.addRequest(requestA, { forefront: true });- expect(queue.queueHeadDict.length()).to.be.eql(1);+ expect(queue.queueHeadDict.length()).toBe(1);// Try to get requestA which is not available yet.mock.expects('getRequest')@@ -633,7 +637,7 @@ describe('RequestQueue', () => {requestId: 'a',}).returns(Promise.resolve(null));- expect(await queue.fetchNextRequest()).to.be.eql(null);+ expect(await queue.fetchNextRequest()).toBe(null);// Give queue time to mark request 'a' as not in progressawait Apify.utils.sleep(STORAGE_CONSISTENCY_DELAY_MILLIS + 10);@@ -658,7 +662,7 @@ describe('RequestQueue', () => {{ id: 'a', uniqueKey: 'aaa' },],}));- expect(await queue.fetchNextRequest()).to.be.eql(requestA);+ expect(await queue.fetchNextRequest()).toEqual(requestA);mock.verify();mock.restore();@@ -701,7 +705,7 @@ describe('RequestQueue', () => {.returns(Promise.resolve({ items: [] }));await queue.addRequest(requestA, { forefront: true });- expect(await queue.fetchNextRequest()).to.be.eql(null);+ expect(await queue.fetchNextRequest()).toBe(null);mock.verify();mock.restore();@@ -733,7 +737,7 @@ describe('RequestQueue', () => {}));const queue = new RequestQueue('id');const count = await queue.handledCount();- expect(count).to.be.eql(33);+ expect(count).toBe(33);sinon.assert.callCount(stub, 1);sinon.restore();});@@ -775,7 +779,7 @@ describe('RequestQueue', () => {hadMultipleClients: true,}));- expect(await queue.isFinished()).to.be.eql(true);+ expect(await queue.isFinished()).toBe(true);mock.verify();mock.restore();@@ -789,8 +793,8 @@ describe('RequestQueue', () => {const queue = new RequestQueue(queueId, 'some-name', clientKey);const mock = sinon.mock(apifyClient.requestQueues);- expect(queue.assumedTotalCount).to.be.eql(0);- expect(queue.assumedHandledCount).to.be.eql(0);+ expect(queue.assumedTotalCount).toBe(0);+ expect(queue.assumedHandledCount).toBe(0);// Add some requests.const requestA = new Apify.Request({ url: 'http://example.com/a' });@@ -804,14 +808,14 @@ describe('RequestQueue', () => {await queue.addRequest(requestA, { forefront: true });await queue.addRequest(requestB, { forefront: true });- expect(queue.queueHeadDict.length()).to.be.eql(2);- expect(queue.inProgressCount()).to.be.eql(0);- expect(queue.assumedTotalCount).to.be.eql(2);- expect(queue.assumedHandledCount).to.be.eql(0);+ expect(queue.queueHeadDict.length()).toBe(2);+ expect(queue.inProgressCount()).toBe(0);+ expect(queue.assumedTotalCount).toBe(2);+ expect(queue.assumedHandledCount).toBe(0);// It won't query the head as there is something in progress or pending.mock.expects('getHead').never();- expect(await queue.isFinished()).to.be.eql(false);+ expect(await queue.isFinished()).toBe(false);// Fetch them from queue.mock.expects('getRequest').once()@@ -821,18 +825,18 @@ describe('RequestQueue', () => {.withArgs({ queueId: 'some-id', requestId: 'a' }).returns(Promise.resolve(_.extend(requestA, { id: 'a' })));const requestBFromQueue = await queue.fetchNextRequest();- expect(requestBFromQueue).to.be.eql(requestB);+ expect(requestBFromQueue).toEqual(requestB);const requestAFromQueue = await queue.fetchNextRequest();- expect(requestAFromQueue).to.be.eql(requestA);+ expect(requestAFromQueue).toEqual(requestA);- expect(queue.queueHeadDict.length()).to.be.eql(0);- expect(queue.inProgressCount()).to.be.eql(2);- expect(queue.assumedTotalCount).to.be.eql(2);- expect(queue.assumedHandledCount).to.be.eql(0);+ expect(queue.queueHeadDict.length()).toBe(0);+ expect(queue.inProgressCount()).toBe(2);+ expect(queue.assumedTotalCount).toBe(2);+ expect(queue.assumedHandledCount).toBe(0);// It won't query the head as there is something in progress or pending.mock.expects('getHead').never();- expect(await queue.isFinished()).to.be.eql(false);+ expect(await queue.isFinished()).toBe(false);// Reclaim one and mark another one handled.mock.expects('updateRequest').once()@@ -843,35 +847,35 @@ describe('RequestQueue', () => {.withArgs({ queueId, request: requestA, forefront: true, clientKey }).returns(Promise.resolve({ requestId: requestA.id, wasAlreadyHandled: false, wasAlreadyPresent: true, request: requestA }));await queue.reclaimRequest(requestA, { forefront: true });- expect(queue.queueHeadDict.length()).to.be.eql(0);- expect(queue.inProgressCount()).to.be.eql(1);- expect(queue.assumedTotalCount).to.be.eql(2);- expect(queue.assumedHandledCount).to.be.eql(1);+ expect(queue.queueHeadDict.length()).toBe(0);+ expect(queue.inProgressCount()).toBe(1);+ expect(queue.assumedTotalCount).toBe(2);+ expect(queue.assumedHandledCount).toBe(1);await Apify.utils.sleep(STORAGE_CONSISTENCY_DELAY_MILLIS + 10);- expect(queue.queueHeadDict.length()).to.be.eql(1);- expect(queue.inProgressCount()).to.be.eql(0);- expect(queue.assumedTotalCount).to.be.eql(2);- expect(queue.assumedHandledCount).to.be.eql(1);+ expect(queue.queueHeadDict.length()).toBe(1);+ expect(queue.inProgressCount()).toBe(0);+ expect(queue.assumedTotalCount).toBe(2);+ expect(queue.assumedHandledCount).toBe(1);// It won't query the head as there is something in progress or pending.mock.expects('getHead').never();- expect(await queue.isFinished()).to.be.eql(false);+ expect(await queue.isFinished()).toBe(false);// Fetch again.mock.expects('getRequest').once().withArgs({ queueId: 'some-id', requestId: 'a' }).returns(Promise.resolve(_.extend(requestA, { id: 'a' })));const requestAFromQueue2 = await queue.fetchNextRequest();- expect(requestAFromQueue2).to.be.eql(requestA);+ expect(requestAFromQueue2).toEqual(requestA);- expect(queue.queueHeadDict.length()).to.be.eql(0);- expect(queue.inProgressCount()).to.be.eql(1);- expect(queue.assumedTotalCount).to.be.eql(2);- expect(queue.assumedHandledCount).to.be.eql(1);+ expect(queue.queueHeadDict.length()).toBe(0);+ expect(queue.inProgressCount()).toBe(1);+ expect(queue.assumedTotalCount).toBe(2);+ expect(queue.assumedHandledCount).toBe(1);// It won't query the head as there is something in progress or pending.mock.expects('getHead').never();- expect(await queue.isFinished()).to.be.eql(false);+ expect(await queue.isFinished()).toBe(false);// Mark handled.mock.expects('updateRequest').once()@@ -879,10 +883,10 @@ describe('RequestQueue', () => {.returns(Promise.resolve({ requestId: requestA.id, wasAlreadyHandled: false, wasAlreadyPresent: true, request: requestA }));await queue.markRequestHandled(requestA);- expect(queue.queueHeadDict.length()).to.be.eql(0);- expect(queue.inProgressCount()).to.be.eql(0);- expect(queue.assumedTotalCount).to.be.eql(2);- expect(queue.assumedHandledCount).to.be.eql(2);+ expect(queue.queueHeadDict.length()).toBe(0);+ expect(queue.inProgressCount()).toBe(0);+ expect(queue.assumedTotalCount).toBe(2);+ expect(queue.assumedHandledCount).toBe(2);// Return head with modifiedAt = now so it would retry the query for queue to become consistent but because hadMultipleClients=true// it will finish immediately.@@ -900,7 +904,7 @@ describe('RequestQueue', () => {hadMultipleClients: false,}));- expect(await queue.isFinished()).to.be.eql(true);+ expect(await queue.isFinished()).toBe(true);mock.verify();mock.restore();@@ -928,7 +932,7 @@ describe('RequestQueue', () => {const result = await queue.getInfo();- expect(result).to.be.eql(expected);+ expect(result).toEqual(expected);mock.verify();mock.restore();diff --git a/test/session_pool/session.js b/__tests__/session_pool/session.jssimilarity index 51%rename from test/session_pool/session.jsrename to __tests__/session_pool/session.jsindex 9937ea5dd..a5d66b75a 100644--- a/test/session_pool/session.js+++ b/__tests__/session_pool/session.js@@ -1,5 +1,3 @@-import { expect } from 'chai';-import { Session } from '../../build/session_pool/session';import { SessionPool } from '../../build/session_pool/session_pool';import EVENTS from '../../build/session_pool/events';@@ -17,14 +15,14 @@ describe('Session - testing session behaviour ', async () => {});it('should markGood session and lower the errorScore', () => {- expect(session.usageCount).to.be.eql(0);- expect(session.errorScore).to.be.eql(0);+ expect(session.usageCount).toBe(0);+ expect(session.errorScore).toBe(0);session.markGood();- expect(session.usageCount).to.be.eql(1);- expect(session.errorScore).to.be.eql(0);+ expect(session.usageCount).toBe(1);+ expect(session.errorScore).toBe(0);session.errorScore = 1;session.markGood();- expect(session.errorScore).to.be.eql(0.5);+ expect(session.errorScore).toBe(0.5);});it('should throw error when param sessionPool is not EventEmitter instance', () => {@@ -34,72 +32,72 @@ describe('Session - testing session behaviour ', async () => {} catch (e) {err = e;}- expect(err).to.exist; // eslint-disable-line- expect(err.message.includes('Session: sessionPool must be instance of SessionPool')).to.be.true; // eslint-disable-line+ expect(err).toBeDefined(); // eslint-disable-line+ expect(err.message.includes('Session: sessionPool must be instance of SessionPool')).toBe(true); // eslint-disable-line});it('should mark session markBaded', () => {session.markBad();- expect(session.errorScore).to.be.eql(1);- expect(session.usageCount).to.be.eql(1);+ expect(session.errorScore).toBe(1);+ expect(session.usageCount).toBe(1);});it('should expire session', async () => {session = new Session({ maxAgeSecs: 1 / 100, sessionPool });await Apify.utils.sleep(101);- expect(session.isExpired()).to.be.eql(true);- expect(session.isUsable()).to.be.eql(false);+ expect(session.isExpired()).toBe(true);+ expect(session.isUsable()).toBe(false);});it('should max out session usage', () => {session.maxSessionUsageCount = 1;session.markGood();- expect(session.isMaxUsageCountReached()).to.be.eql(true);- expect(session.isUsable()).to.be.eql(false);+ expect(session.isMaxUsageCountReached()).toBe(true);+ expect(session.isUsable()).toBe(false);});it('should block session', () => {session.errorScore += session.maxErrorScore;- expect(session.isBlocked()).to.be.eql(true);- expect(session.isUsable()).to.be.eql(false);+ expect(session.isBlocked()).toBe(true);+ expect(session.isUsable()).toBe(false);});it('should markGood session', () => {session.markGood();- expect(session.usageCount).to.be.eql(1);- expect(session.isUsable()).to.be.eql(true);+ expect(session.usageCount).toBe(1);+ expect(session.isUsable()).toBe(true);});it('should retire session', () => {let discarded = false;sessionPool.on(EVENTS.SESSION_RETIRED, (ses) => {- expect(ses instanceof Session).to.be.eql(true);+ expect(ses instanceof Session).toBe(true);discarded = true;});session.retire();- expect(discarded).to.be.true; // eslint-disable-line- expect(session.usageCount).to.be.eql(1);+ expect(discarded).toBe(true); // eslint-disable-line+ expect(session.usageCount).toBe(1);});it('should get state', () => {const state = session.getState();- expect(state.id).to.exist; // eslint-disable-line- expect(state.cookies).to.exist; // eslint-disable-line- expect(state.userData).to.exist; // eslint-disable-line- expect(state.maxErrorScore).to.exist; // eslint-disable-line- expect(state.errorScoreDecrement).to.exist; // eslint-disable-line- expect(state.expiresAt).to.exist; // eslint-disable-line- expect(state.createdAt).to.exist; // eslint-disable-line- expect(state.usageCount).to.exist; // eslint-disable-line- expect(state.errorScore).to.exist; // eslint-disable-line+ expect(state.id).toBeDefined(); // eslint-disable-line+ expect(state.cookies).toBeDefined(); // eslint-disable-line+ expect(state.userData).toBeDefined(); // eslint-disable-line+ expect(state.maxErrorScore).toBeDefined(); // eslint-disable-line+ expect(state.errorScoreDecrement).toBeDefined(); // eslint-disable-line+ expect(state.expiresAt).toBeDefined(); // eslint-disable-line+ expect(state.createdAt).toBeDefined(); // eslint-disable-line+ expect(state.usageCount).toBeDefined(); // eslint-disable-line+ expect(state.errorScore).toBeDefined(); // eslint-disable-lineObject.entries(state).forEach(([key, value]) => {if (session[key] instanceof Date) {- expect(session[key].toISOString()).to.be.eql(value);+ expect(session[key].toISOString()).toEqual(value);} else {- expect(session[key]).to.be.eql(value);+ expect(session[key]).toEqual(value);}});});diff --git a/test/session_pool/session_pool.js b/__tests__/session_pool/session_pool.jssimilarity index 73%rename from test/session_pool/session_pool.jsrename to __tests__/session_pool/session_pool.jsindex 4eb550591..ec31b3fa3 100644--- a/test/session_pool/session_pool.js+++ b/__tests__/session_pool/session_pool.js@@ -1,4 +1,3 @@-import { expect } from 'chai';import { LOCAL_STORAGE_DIR, emptyLocalStorageSubdir } from '../_helper';import { SessionPool, openSessionPool } from '../../build/session_pool/session_pool';import Apify from '../../build';@@ -20,12 +19,12 @@ describe('SessionPool - testing session pool', async () => {});it('should initialize with default values for first time', async () => {- expect(sessionPool.sessions.length).to.exist; // eslint-disable-line- expect(sessionPool.maxPoolSize).to.exist; // eslint-disable-line- expect(sessionPool.maxSessionAgeSecs).to.exist; // eslint-disable-line- expect(sessionPool.maxSessionUsageCount).to.exist; // eslint-disable-line- expect(sessionPool.persistStateKey).to.exist; // eslint-disable-line- expect(sessionPool.createSessionFunction).to.be.eql(sessionPool._defaultCreateSessionFunction); // eslint-disable-line+ expect(sessionPool.sessions.length).toBeDefined(); // eslint-disable-line+ expect(sessionPool.maxPoolSize).toBeDefined(); // eslint-disable-line+ expect(sessionPool.maxSessionAgeSecs).toBeDefined(); // eslint-disable-line+ expect(sessionPool.maxSessionUsageCount).toBeDefined(); // eslint-disable-line+ expect(sessionPool.persistStateKey).toBeDefined(); // eslint-disable-line+ expect(sessionPool.createSessionFunction).toEqual(sessionPool._defaultCreateSessionFunction); // eslint-disable-line});it('should override default values', async () => {@@ -44,7 +43,7 @@ describe('SessionPool - testing session pool', async () => {await sessionPool.initialize();Object.entries(opts).forEach(([key, value]) => {- expect(sessionPool[key]).to.be.eql(value);+ expect(sessionPool[key]).toEqual(value);});});@@ -63,19 +62,19 @@ describe('SessionPool - testing session pool', async () => {sessionPool = await openSessionPool(opts);Object.entries(opts).forEach(([key, value]) => {- expect(sessionPool[key]).to.be.eql(value);+ expect(sessionPool[key]).toEqual(value);});});describe('should retrieve session', () => {it('should retrieve session with correct shape', async () => {const session = await sessionPool.getSession();- expect(sessionPool.sessions.length).to.be.eql(1);- expect(session.id).to.exist; // eslint-disable-line- expect(session.cookies.length).to.be.eql(0);- expect(session.maxAgeSecs).to.eql(sessionPool.maxSessionAgeSecs);- expect(session.maxAgeSecs).to.eql(sessionPool.maxSessionAgeSecs);- expect(session.sessionPool).to.eql(sessionPool);+ expect(sessionPool.sessions.length).toBe(1);+ expect(session.id).toBeDefined(); // eslint-disable-line+ expect(session.cookies.length).toBe(0);+ expect(session.maxAgeSecs).toEqual(sessionPool.maxSessionAgeSecs);+ expect(session.maxAgeSecs).toEqual(sessionPool.maxSessionAgeSecs);+ expect(session.sessionPool).toEqual(sessionPool);});it('should pick session when pool is full', async () => {@@ -92,7 +91,7 @@ describe('SessionPool - testing session pool', async () => {await sessionPool.getSession();- expect(isCalled).to.be.true; //eslint-disable-line+ expect(isCalled).toBe(true); //eslint-disable-line});it('should delete picked session when it is usable a create a new one', async () => {@@ -111,9 +110,9 @@ describe('SessionPool - testing session pool', async () => {await sessionPool.getSession();- expect(isCalled).to.be.true; //eslint-disable-line- expect(sessionPool.sessions[0].id === session.id).to.be.false; //eslint-disable-line- expect(sessionPool.sessions).to.be.length(1);+ expect(isCalled).toBe(true); //eslint-disable-line+ expect(sessionPool.sessions[0].id === session.id).toBe(false); //eslint-disable-line+ expect(sessionPool.sessions).toHaveLength(1);});});@@ -127,16 +126,16 @@ describe('SessionPool - testing session pool', async () => {Object.entries(sessionPoolSaved).forEach(([key, value]) => {if (key !== 'sessions') {- expect(value).to.be.eql(sessionPool[key]);+ expect(value).toEqual(sessionPool[key]);}});- expect(sessionPoolSaved.sessions.length).to.be.eql(sessionPool.sessions.length);+ expect(sessionPoolSaved.sessions.length).toEqual(sessionPool.sessions.length);sessionPoolSaved.sessions.forEach((session, index) => {Object.entries(session).forEach(([key, value]) => {if (sessionPool.sessions[index][key] instanceof Date) {- expect(value).to.be.eql(sessionPool.sessions[index][key].toISOString());+ expect(value).toEqual(sessionPool.sessions[index][key].toISOString());} else {- expect(sessionPool.sessions[index][key]).to.be.eql(value);+ expect(sessionPool.sessions[index][key]).toEqual(value);}});});@@ -145,7 +144,7 @@ describe('SessionPool - testing session pool', async () => {const loadedSessionPool = new SessionPool();await loadedSessionPool.initialize();- expect(loadedSessionPool).to.have.all.keys(Object.keys(sessionPool));+ expect(loadedSessionPool).toEqual(expect.arrayContaining(Object.keys(sessionPool)));});it('should create only maxPoolSize number of sessions', async () => {@@ -153,13 +152,13 @@ describe('SessionPool - testing session pool', async () => {for (let i = 0; i < max + 100; i++) {await sessionPool.getSession();}- expect(sessionPool.sessions.length).to.be.eql(sessionPool.maxPoolSize);+ expect(sessionPool.sessions.length).toEqual(sessionPool.maxPoolSize);});it('should create session', async () => {await sessionPool._createSession(); // eslint-disable-line- expect(sessionPool.sessions.length).to.be.eql(1);- expect(sessionPool.sessions[0].id).to.exist; // eslint-disable-line+ expect(sessionPool.sessions.length).toBe(1);+ expect(sessionPool.sessions[0].id).toBeDefined(); // eslint-disable-line});describe('should persist state', () => {@@ -177,7 +176,7 @@ describe('SessionPool - testing session pool', async () => {it('on persist event', async () => {await sessionPool.getSession();- expect(sessionPool.sessions.length).to.be.eql(1);+ expect(sessionPool.sessions.length).toBe(1);events.emit(ACTOR_EVENT_NAMES_EX.PERSIST_STATE);@@ -193,7 +192,7 @@ describe('SessionPool - testing session pool', async () => {const state = await sessionPool.keyValueStore.getValue(sessionPool.persistStateKey);- expect(sessionPool.getState()).to.be.eql(state);+ expect(sessionPool.getState()).toEqual(state);});});@@ -203,7 +202,7 @@ describe('SessionPool - testing session pool', async () => {}const picked = sessionPool.getSession();sessionPool._removeSession(picked); // eslint-disable-line- expect(sessionPool.sessions.find(s => s.id === picked.id)).to.be.eql(undefined);+ expect(sessionPool.sessions.find(s => s.id === picked.id)).toEqual(undefined);});it('should recreate only usable sessions', async () => {@@ -216,26 +215,26 @@ describe('SessionPool - testing session pool', async () => {invalidSessionsCount += 1;}}- expect(sessionPool.retiredSessionsCount).to.be.eql(invalidSessionsCount);+ expect(sessionPool.retiredSessionsCount).toEqual(invalidSessionsCount);await sessionPool.persistState();const newSessionPool = new SessionPool();await newSessionPool.initialize();- expect(newSessionPool.sessions).to.be.length(10 - invalidSessionsCount);+ expect(newSessionPool.sessions).toHaveLength(10 - invalidSessionsCount);});it('should createSessionFunction work', async () => {let isCalled;const createSessionFunction = (sessionPool2) => {isCalled = true;- expect(sessionPool2 instanceof SessionPool).to.be.true; // eslint-disable-line+ expect(sessionPool2 instanceof SessionPool).toBe(true); // eslint-disable-linereturn new Session({ sessionPool: sessionPool2 });};const newSessionPool = await Apify.openSessionPool({ createSessionFunction });const session = await newSessionPool.getSession();- expect(isCalled).to.be.true; // eslint-disable-line- expect(session.constructor.name).to.be.eql("Session") // eslint-disable-line+ expect(isCalled).toBe(true); // eslint-disable-line+ expect(session.constructor.name).toBe("Session") // eslint-disable-line});});diff --git a/test/settings_rotator.js b/__tests__/settings_rotator.jssimilarity index 78%rename from test/settings_rotator.jsrename to __tests__/settings_rotator.jsindex a4a0595f5..5dca986d6 100644--- a/test/settings_rotator.js+++ b/__tests__/settings_rotator.js@@ -1,5 +1,4 @@import _ from 'underscore';-import { expect } from 'chai';import Apify from '../build/index';describe('Apify.SettingsRotator', () => {@@ -14,6 +13,6 @@ describe('Apify.SettingsRotator', () => {const settings = _.range(0, totalCalls).map(() => rotator.fetchSettings());- expect(_.uniq(settings).length).to.be.eql(Math.ceil(totalCalls / maxUsages));+ expect(_.uniq(settings).length).toEqual(Math.ceil(totalCalls / maxUsages));});});diff --git a/test/stealth/stealth.js b/__tests__/stealth/stealth.jssimilarity index 87%rename from test/stealth/stealth.jsrename to __tests__/stealth/stealth.jsindex de2b7fe7d..6b2f2709d 100644--- a/test/stealth/stealth.js+++ b/__tests__/stealth/stealth.js@@ -1,4 +1,3 @@-import { expect } from 'chai';import scanner from 'fpscanner';import Apify from '../../build';@@ -41,11 +40,11 @@ describe('Stealth - testing headless chrome hiding tricks', () => {const { webDriver } = await getFingerPrint(page);// check if disabling works- expect(webDriver).to.be.eql(true);+ expect(webDriver).toBe(true);const { plugins, mimeTypes } = await getFingerPrint(page);- expect(plugins.length).to.be.eql(3);- expect(mimeTypes.length).to.be.eql(4);+ expect(plugins.length).toBe(3);+ expect(mimeTypes.length).toBe(4);return browser.close();});@@ -61,7 +60,7 @@ describe('Stealth - testing headless chrome hiding tricks', () => {await page.goto('file://test_html.html');const { webDriver } = await getFingerPrint(page);- expect(webDriver).to.be.eql(false);+ expect(webDriver).toBe(false);return browser.close();});@@ -77,7 +76,7 @@ describe('Stealth - testing headless chrome hiding tricks', () => {await page.goto('file://test_html.html');const { permissions } = await getFingerPrint(page);- expect(permissions.state).to.be.eql('denied');+ expect(permissions.state).toBe('denied');return browser.close();});@@ -93,8 +92,8 @@ describe('Stealth - testing headless chrome hiding tricks', () => {await page.goto('file://test_html.html');const { languages } = await getFingerPrint(page);- expect(languages).to.be.an('array');- expect(languages[0]).to.be.eql('en-US');+ expect(Array.isArray(languages)).toBe(true);+ expect(languages[0]).toBe('en-US');return browser.close();});@@ -110,8 +109,8 @@ describe('Stealth - testing headless chrome hiding tricks', () => {await page.goto('file://test_html.html');const { videoCard } = await getFingerPrint(page);- expect(videoCard[0]).to.be.eql('Intel Inc.');- expect(videoCard[1]).to.be.eql('Intel(R) Iris(TM) Plus Graphics 640');+ expect(videoCard[0]).toBe('Intel Inc.');+ expect(videoCard[1]).toBe('Intel(R) Iris(TM) Plus Graphics 640');return browser.close();});@@ -127,8 +126,8 @@ describe('Stealth - testing headless chrome hiding tricks', () => {await page.goto('file://test_html.html');const { screen } = await getFingerPrint(page);- expect(screen.wOuterHeight > 0).to.be.eql(true);- expect(screen.wOuterWidth > 0).to.be.eql(true);+ expect(screen.wOuterHeight > 0).toBe(true);+ expect(screen.wOuterWidth > 0).toBe(true);return browser.close();});@@ -144,7 +143,7 @@ describe('Stealth - testing headless chrome hiding tricks', () => {await page.goto('file://test_html.html');const returnValue = await page.evaluate(() => console.debug('TEST'));- expect(returnValue).to.be.eql(null);+ expect(returnValue).toBe(null);return browser.close();});@@ -159,9 +158,9 @@ describe('Stealth - testing headless chrome hiding tricks', () => {await page.goto('file://test_html.html');const { hasChrome } = await getFingerPrint(page);const chrome = await page.evaluate(() => window.chrome); //eslint-disable-line- expect(chrome).to.be.an('object');- expect(chrome.runtime).to.be.empty; // eslint-disable-line- expect(hasChrome).to.be.eql(true);+ expect(chrome).toBeInstanceOf(Object);+ expect(chrome.runtime).toHaveLength(0); // eslint-disable-line+ expect(hasChrome).toBe(true);return browser.close();});@@ -177,7 +176,7 @@ describe('Stealth - testing headless chrome hiding tricks', () => {await page.goto('file://test_html.html');const { iframeChrome } = await getFingerPrint(page);- expect(iframeChrome).to.be.eql('object');+ expect(iframeChrome).toBe('object');return browser.close();});@@ -202,7 +201,7 @@ describe('Stealth - testing headless chrome hiding tricks', () => {const realReturn = await page.evaluate(() => document.querySelector('iframe').contentWindow.mySuperFunction(), //eslint-disable-line);- expect(realReturn).to.eql(testFuncReturnValue);+ expect(realReturn).toEqual(testFuncReturnValue);return browser.close();});@@ -218,7 +217,7 @@ describe('Stealth - testing headless chrome hiding tricks', () => {await page.goto('file://test_html.html');const { deviceMemory } = await getFingerPrint(page);- expect(deviceMemory).not.to.be.eql(0);+ expect(deviceMemory).not.toBe(0);return browser.close();});@@ -236,7 +235,7 @@ describe('Stealth - testing headless chrome hiding tricks', () => {const testedFingerprint = scanner.analyseFingerprint(fingerPrint);const failedChecks = Object.values(testedFingerprint).filter(val => val.consistent < 3);- expect(failedChecks.length).to.eql(0);+ expect(failedChecks.length).toBe(0);return browser.close();});@@ -258,7 +257,7 @@ describe('Stealth - testing headless chrome hiding tricks', () => {});await puppeteerCrawler.run();const fingerprint = values[0];- expect(fingerprint.webDriver).to.be.false; // eslint-disable-line- expect(fingerprint.webDriverValue).to.be.undefined; // eslint-disable-line+ expect(fingerprint.webDriver).toBe(false); // eslint-disable-line+ expect(fingerprint.webDriverValue).toBeUndefined(); // eslint-disable-line});});diff --git a/test/stealth/test_html.html b/__tests__/stealth/test_html.htmlsimilarity index 100%rename from test/stealth/test_html.htmlrename to __tests__/stealth/test_html.htmldiff --git a/test/utils.js b/__tests__/utils.jssimilarity index 82%rename from test/utils.jsrename to __tests__/utils.jsindex bef4e48d8..07ed401ad 100644--- a/test/utils.js+++ b/__tests__/utils.js@@ -1,4 +1,3 @@-import { expect } from 'chai';import sinon from 'sinon';import _ from 'underscore';import fs from 'fs';@@ -20,12 +19,12 @@ describe('utils.newClient()', () => {process.env[ENV_VARS.TOKEN] = 'token';const client = utils.newClient();- expect(client.constructor.name).to.eql('ApifyClient');+ expect(client.constructor.name).toBe('ApifyClient');const opts = client.getOptions();- expect(opts.userId).to.eql('userId');- expect(opts.token).to.eql('token');- expect(opts.baseUrl).to.eql('http://www.example.com:1234/path/');+ expect(opts.userId).toBe('userId');+ expect(opts.token).toBe('token');+ expect(opts.baseUrl).toBe('http://www.example.com:1234/path/');});it('uses correct default if APIFY_API_BASE_URL is not defined', () => {@@ -36,20 +35,20 @@ describe('utils.newClient()', () => {const opts = client.getOptions();- expect(opts.userId).to.eql('userId');- expect(opts.token).to.eql('token');- expect(opts.baseUrl).to.eql('https://api.apify.com');+ expect(opts.userId).toBe('userId');+ expect(opts.token).toBe('token');+ expect(opts.baseUrl).toBe('https://api.apify.com');});});describe('utils.addCharsetToContentType()', () => {it('works', () => {- expect(utils.addCharsetToContentType('application/json; charset=something')).to.eql('application/json; charset=something');- expect(utils.addCharsetToContentType('application/json; foo=bar; charset=something')).to.eql('application/json; foo=bar; charset=something');- expect(utils.addCharsetToContentType('application/json; foo=bar')).to.eql('application/json; charset=utf-8; foo=bar');- expect(utils.addCharsetToContentType('application/json')).to.eql('application/json; charset=utf-8');- expect(utils.addCharsetToContentType(null)).to.eql(null);- expect(utils.addCharsetToContentType(undefined)).to.eql(undefined);+ expect(utils.addCharsetToContentType('application/json; charset=something')).toBe('application/json; charset=something');+ expect(utils.addCharsetToContentType('application/json; foo=bar; charset=something')).toBe('application/json; foo=bar; charset=something');+ expect(utils.addCharsetToContentType('application/json; foo=bar')).toBe('application/json; charset=utf-8; foo=bar');+ expect(utils.addCharsetToContentType('application/json')).toBe('application/json; charset=utf-8');+ expect(utils.addCharsetToContentType(null)).toBe(null);+ expect(utils.addCharsetToContentType(undefined)).toEqual(undefined);});});@@ -58,10 +57,10 @@ describe('utils.isProduction()', () => {const prev = process.env.NODE_ENV;try {process.env.NODE_ENV = 'production';- expect(utils.isProduction()).to.eql(true);+ expect(utils.isProduction()).toBe(true);process.env.NODE_ENV = 'debug';- expect(utils.isProduction()).to.eql(false);+ expect(utils.isProduction()).toBe(false);} finally {process.env.NODE_ENV = prev;}@@ -76,7 +75,7 @@ describe('utils.isDocker()', () => {return utils.isDocker(true).then((is) => {- expect(is).to.be.eql(true);+ expect(is).toBe(true);fs.stat.restore();fs.readFile.restore();});@@ -89,7 +88,7 @@ describe('utils.isDocker()', () => {return utils.isDocker(true).then((is) => {- expect(is).to.be.eql(true);+ expect(is).toBe(true);fs.stat.restore();fs.readFile.restore();});@@ -102,7 +101,7 @@ describe('utils.isDocker()', () => {return utils.isDocker(true).then((is) => {- expect(is).to.be.eql(true);+ expect(is).toBe(true);fs.stat.restore();fs.readFile.restore();});@@ -115,7 +114,7 @@ describe('utils.isDocker()', () => {return utils.isDocker(true).then((is) => {- expect(is).to.be.eql(false);+ expect(is).toBe(false);fs.stat.restore();fs.readFile.restore();});@@ -145,13 +144,13 @@ describe('utils.getMemoryInfo()', () => {return Apify.getMemoryInfo().then((data) => {- expect(data).to.include({+ expect(data).toMatchObject({totalBytes: 333,freeBytes: 222,usedBytes: 111,childProcessesBytes: 0,});- expect(data.mainProcessBytes).to.be.at.least(20000000);+ expect(data.mainProcessBytes).toBeGreaterThanOrEqual(20000000);utilsMock.restore();osMock.restore();@@ -177,13 +176,13 @@ describe('utils.getMemoryInfo()', () => {return Apify.getMemoryInfo().then((data) => {- expect(data).to.include({+ expect(data).toMatchObject({totalBytes: 333,freeBytes: 222,usedBytes: 111,childProcessesBytes: 0,});- expect(data.mainProcessBytes).to.be.at.least(20000000);+ expect(data.mainProcessBytes).toBeGreaterThanOrEqual(20000000);utilsMock.restore();fs.readFile.restore();@@ -215,13 +214,13 @@ describe('utils.getMemoryInfo()', () => {return Apify.getMemoryInfo().then((data) => {- expect(data).to.include({+ expect(data).toMatchObject({totalBytes: 333,freeBytes: 222,usedBytes: 111,});- expect(data.mainProcessBytes).to.be.at.least(20000000);- expect(data.childProcessesBytes).to.be.at.least(20000000);+ expect(data.mainProcessBytes).toBeGreaterThanOrEqual(20000000);+ expect(data.childProcessesBytes).toBeGreaterThanOrEqual(20000000);utilsMock.restore();osMock.restore();delete process.env[ENV_VARS.HEADLESS];@@ -252,13 +251,13 @@ describe('utils.getMemoryInfo()', () => {return Apify.getMemoryInfo().then((data) => {- expect(data).to.include({+ expect(data).toMatchObject({totalBytes: 333,freeBytes: 222,usedBytes: 111,});- expect(data.mainProcessBytes).to.be.at.least(20000000);- expect(data.childProcessesBytes).to.be.at.least(20000000);+ expect(data.mainProcessBytes).toBeGreaterThanOrEqual(20000000);+ expect(data.childProcessesBytes).toBeGreaterThanOrEqual(20000000);utilsMock.restore();fs.readFile.restore();delete process.env[ENV_VARS.HEADLESS];@@ -272,13 +271,13 @@ describe('utils.isPromise()', () => {it('works', () => {const rejected = Promise.reject();- expect(utils.isPromise(new Promise(resolve => setTimeout(resolve, 1000)))).to.be.eql(true);- expect(utils.isPromise(Promise.resolve())).to.be.eql(true);- expect(utils.isPromise(rejected)).to.be.eql(true);- expect(utils.isPromise(new Date())).to.be.eql(false);- expect(utils.isPromise(Function)).to.be.eql(false);- expect(utils.isPromise(() => {})).to.be.eql(false);- expect(utils.isPromise({ then: () => {} })).to.be.eql(false);+ expect(utils.isPromise(new Promise(resolve => setTimeout(resolve, 1000)))).toBe(true);+ expect(utils.isPromise(Promise.resolve())).toBe(true);+ expect(utils.isPromise(rejected)).toBe(true);+ expect(utils.isPromise(new Date())).toBe(false);+ expect(utils.isPromise(Function)).toBe(false);+ expect(utils.isPromise(() => {})).toBe(false);+ expect(utils.isPromise({ then: () => {} })).toBe(false);rejected.catch(() => {});});@@ -292,39 +291,39 @@ describe('utils.newPromise()', () => {describe('utils.isAtHome()', () => {it('works', () => {- expect(utils.isAtHome()).to.be.eql(false);+ expect(utils.isAtHome()).toBe(false);process.env[ENV_VARS.IS_AT_HOME] = 1;- expect(utils.isAtHome()).to.be.eql(true);+ expect(utils.isAtHome()).toBe(true);delete process.env[ENV_VARS.IS_AT_HOME];- expect(utils.isAtHome()).to.be.eql(false);+ expect(utils.isAtHome()).toBe(false);});});describe('utils.sum()', () => {it('works', () => {- expect(utils.sum([1, 2, 3, 1.2])).to.be.eql(7.2);- expect(utils.sum([])).to.be.eql(0);- expect(utils.sum([9])).to.be.eql(9);+ expect(utils.sum([1, 2, 3, 1.2])).toBe(7.2);+ expect(utils.sum([])).toBe(0);+ expect(utils.sum([9])).toBe(9);});});describe('utils.avg()', () => {it('works', () => {- expect(utils.avg([1, 2, 3, 1.2])).to.be.eql(7.2 / 4);- expect(utils.avg([])).to.be.eql(NaN);- expect(utils.avg([9])).to.be.eql(9);+ expect(utils.avg([1, 2, 3, 1.2])).toEqual(7.2 / 4);+ expect(utils.avg([])).toEqual(NaN);+ expect(utils.avg([9])).toBe(9);});});describe('utils.weightedAvg()', () => {it('works', () => {- expect(utils.weightedAvg([10, 10, 10], [1, 1, 1])).to.be.eql(10);- expect(utils.weightedAvg([5, 10, 15], [1, 1, 1])).to.be.eql(10);- expect(utils.weightedAvg([10, 10, 10], [0.5, 1, 1.5])).to.be.eql(10);- expect(utils.weightedAvg([29, 35, 89], [13, 91, 3])).to.be.eql(((29 * 13) + (35 * 91) + (89 * 3)) / (13 + 91 + 3));- expect(utils.weightedAvg([], [])).to.be.eql(NaN);- expect(utils.weightedAvg([1], [0])).to.be.eql(NaN);- expect(utils.weightedAvg([], [1])).to.be.eql(NaN);+ expect(utils.weightedAvg([10, 10, 10], [1, 1, 1])).toBe(10);+ expect(utils.weightedAvg([5, 10, 15], [1, 1, 1])).toBe(10);+ expect(utils.weightedAvg([10, 10, 10], [0.5, 1, 1.5])).toBe(10);+ expect(utils.weightedAvg([29, 35, 89], [13, 91, 3])).toEqual(((29 * 13) + (35 * 91) + (89 * 3)) / (13 + 91 + 3));+ expect(utils.weightedAvg([], [])).toEqual(NaN);+ expect(utils.weightedAvg([1], [0])).toEqual(NaN);+ expect(utils.weightedAvg([], [1])).toEqual(NaN);});});@@ -350,7 +349,7 @@ describe('Apify.utils.sleep()', () => {}).then(() => {const timeAfter = Date.now();- expect(timeAfter - timeBefore).to.be.gte(95);+ expect(timeAfter - timeBefore).toBeGreaterThanOrEqual(95);});});});@@ -394,117 +393,117 @@ describe('Apify.utils.extractUrls()', () => {it('extracts simple URLs', () => {const { string, array } = getURLData(SIMPLE_URL_LIST);const extracted = extractUrls({ string });- expect(extracted).to.be.eql(array);+ expect(extracted).toEqual(array);});it('extracts unicode URLs', () => {const { string, array } = getURLData(UNICODE_URL_LIST);const extracted = extractUrls({ string });- expect(extracted).to.be.eql(array);+ expect(extracted).toEqual(array);});it('extracts unicode URLs with commas', () => {const { string, array } = getURLData(COMMA_URL_LIST);const extracted = extractUrls({ string, urlRegExp: URL_WITH_COMMAS_REGEX });- expect(extracted).to.be.eql(array);+ expect(extracted).toEqual(array);});it('extracts tricky URLs', () => {const { string, array } = getURLData(TRICKY_URL_LIST);const extracted = extractUrls({ string });- expect(extracted).to.be.eql(array);+ expect(extracted).toEqual(array);});it('does not extract invalid URLs', () => {const { string } = getURLData(INVALID_URL_LIST);const extracted = extractUrls({ string });- expect(extracted).to.be.eql(['http://www.foo.bar']);+ expect(extracted).toEqual(['http://www.foo.bar']);});it('extracts simple URLs from JSON', () => {const d = getURLData(SIMPLE_URL_LIST);const string = makeJSON(d);const extracted = extractUrls({ string });- expect(extracted).to.be.eql(d.array.concat(d.array));+ expect(extracted).toEqual(d.array.concat(d.array));});it('extracts unicode URLs from JSON', () => {const d = getURLData(UNICODE_URL_LIST);const string = makeJSON(d);const extracted = extractUrls({ string });- expect(extracted).to.be.eql(d.array.concat(d.array));+ expect(extracted).toEqual(d.array.concat(d.array));});it('extracts unicode URLs with commas from JSON', () => {const d = getURLData(COMMA_URL_LIST);const string = makeJSON(d);const extracted = extractUrls({ string, urlRegExp: URL_WITH_COMMAS_REGEX });- expect(extracted).to.be.eql(d.array.concat(d.array));+ expect(extracted).toEqual(d.array.concat(d.array));});it('extracts tricky URLs from JSON', () => {const d = getURLData(TRICKY_URL_LIST);const string = makeJSON(d);const extracted = extractUrls({ string });- expect(extracted).to.be.eql(d.array.concat(d.array));+ expect(extracted).toEqual(d.array.concat(d.array));});it('does not extract invalid URLs from JSON', () => {const d = getURLData(INVALID_URL_LIST);const string = makeJSON(d);const extracted = extractUrls({ string });- expect(extracted).to.be.eql(['http://www.foo.bar', 'http://www.foo.bar']);+ expect(extracted).toEqual(['http://www.foo.bar', 'http://www.foo.bar']);});it('extracts simple URLs from CSV', () => {const { array } = getURLData(SIMPLE_URL_LIST);const string = makeCSV(array);const extracted = extractUrls({ string });- expect(extracted).to.be.eql(array);+ expect(extracted).toEqual(array);});it('extracts unicode URLs from CSV', () => {const { array } = getURLData(UNICODE_URL_LIST);const string = makeCSV(array);const extracted = extractUrls({ string });- expect(extracted).to.be.eql(array);+ expect(extracted).toEqual(array);});it('extracts unicode URLs with commas from semicolon CSV', () => {const { array } = getURLData(COMMA_URL_LIST);const string = makeCSV(array, ';');const extracted = extractUrls({ string, urlRegExp: URL_WITH_COMMAS_REGEX });- expect(extracted).to.be.eql(array);+ expect(extracted).toEqual(array);});it('extracts tricky URLs from CSV', () => {const { array } = getURLData(TRICKY_URL_LIST);const string = makeCSV(array);const extracted = extractUrls({ string });- expect(extracted).to.be.eql(array);+ expect(extracted).toEqual(array);});it('does not extract invalid URLs from CSV', () => {const { array } = getURLData(INVALID_URL_LIST);const string = makeCSV(array);const extracted = extractUrls({ string });- expect(extracted).to.be.eql(['http://www.foo.bar']);+ expect(extracted).toEqual(['http://www.foo.bar']);});it('extracts simple URLs from Text', () => {const { array } = getURLData(SIMPLE_URL_LIST);const string = makeText(array);const extracted = extractUrls({ string });- expect(extracted).to.be.eql(array);+ expect(extracted).toEqual(array);});it('extracts unicode URLs from Text', () => {const { array } = getURLData(UNICODE_URL_LIST);const string = makeText(array);const extracted = extractUrls({ string });- expect(extracted).to.be.eql(array);+ expect(extracted).toEqual(array);});it('extracts unicode URLs with commas from Text', () => {const { array } = getURLData(COMMA_URL_LIST);const string = makeText(array);const extracted = extractUrls({ string, urlRegExp: URL_WITH_COMMAS_REGEX });- expect(extracted).to.be.eql(array);+ expect(extracted).toEqual(array);});it('extracts tricky URLs from Text', () => {const { array } = getURLData(TRICKY_URL_LIST);const string = makeText(array);const extracted = extractUrls({ string });- expect(extracted).to.be.eql(array);+ expect(extracted).toEqual(array);});it('does not extract invalid URLs from Text', () => {const { array } = getURLData(INVALID_URL_LIST);const string = makeText(array);const extracted = extractUrls({ string });- expect(extracted).to.be.eql(['http://www.foo.bar']);+ expect(extracted).toEqual(['http://www.foo.bar']);});});@@ -525,15 +524,15 @@ describe('Apify.utils.downloadListOfUrls()', () => {return expect(downloadListOfUrls({url: 'nowhere',- })).to.eventually.deep.equal(arr);+ })).toEqual(arr);});});describe('Apify.utils.getRandomUserAgent()', () => {it('works', () => {const agent = utils.publicUtils.getRandomUserAgent();- expect(agent).to.be.a('string');- expect(agent.length).to.not.be.eql(0);+ expect(typeof agent).toBe('string');+ expect(agent.length).not.toBe(0);});});@@ -542,19 +541,19 @@ describe('utils.openLocalStorage()', async () => {const cache = new LruCache({ maxLength: 5 });class MyStore {}- expect(cache.length()).to.be.eql(0);+ expect(cache.length()).toBe(0);const store = await utils.openLocalStorage('some-id', 'some-env', MyStore, cache);- expect(store).to.be.instanceOf(MyStore);- expect(cache.length()).to.be.eql(1);+ expect(store).toBeInstanceOf(MyStore);+ expect(cache.length()).toBe(1);const store2 = await utils.openLocalStorage('some-id', 'some-env', MyStore, cache);- expect(store2).to.be.equal(store);- expect(cache.length()).to.be.eql(1);+ expect(store2).toBe(store);+ expect(cache.length()).toBe(1);const store3 = await utils.openLocalStorage('some-other-id', 'some-env', MyStore, cache);- expect(store3).to.not.be.equal(store);- expect(cache.length()).to.be.eql(2);+ expect(store3).not.toBe(store);+ expect(cache.length()).toBe(2);});it('should use ID from ENV variable if no parameter is provided', async () => {@@ -568,7 +567,7 @@ describe('utils.openLocalStorage()', async () => {process.env['some-env'] = 'id-from-env';const store = await utils.openLocalStorage(null, 'some-env', MyStore, cache);- expect(store.id).to.eql('id-from-env');+ expect(store.id).toBe('id-from-env');delete process.env['some-env'];});@@ -583,14 +582,14 @@ describe('utils.openLocalStorage()', async () => {// There is some default in shared constants.const defaultLocalValue = LOCAL_ENV_VARS[ENV_VARS.DEFAULT_KEY_VALUE_STORE_ID];- expect(defaultLocalValue).to.be.a('string');- expect(defaultLocalValue).to.have.length.above(1);+ expect(typeof defaultLocalValue).toBe('string');+ expect(defaultLocalValue.length).toBeGreaterThan(1);// There is no env var!- expect(process.env[ENV_VARS.DEFAULT_KEY_VALUE_STORE_ID]).to.be.eql(undefined);+ expect(process.env[ENV_VARS.DEFAULT_KEY_VALUE_STORE_ID]).toEqual(undefined);const store = await utils.openLocalStorage(null, ENV_VARS.DEFAULT_KEY_VALUE_STORE_ID, MyStore, cache);- expect(store.id).to.eql(defaultLocalValue);+ expect(store.id).toEqual(defaultLocalValue);});});@@ -605,21 +604,21 @@ describe('utils.openRemoteStorage()', async () => {delete process.env['some-env'];- expect(cache.length()).to.be.eql(0);+ expect(cache.length()).toBe(0);const store = await utils.openRemoteStorage('some-id', 'some-env', MyStore, cache, async () => ({ id: 'some-id' }));- expect(store.id).to.be.eql('some-id');- expect(cache.length()).to.be.eql(1);+ expect(store.id).toBe('some-id');+ expect(cache.length()).toBe(1);const store2 = await utils.openRemoteStorage('some-id', 'some-env', MyStore, cache, async () => { throw new Error('Should not be called!'); }); // eslint-disable-line- expect(store2.id).to.be.eql('some-id');- expect(store2).to.be.equal(store);- expect(cache.length()).to.be.eql(1);+ expect(store2.id).toBe('some-id');+ expect(store2).toBe(store);+ expect(cache.length()).toBe(1);const store3 = await utils.openRemoteStorage('some-other-id', 'some-env', MyStore, cache, async () => ({ id: 'some-other-id' }));- expect(store3).to.not.be.equal(store);- expect(store3.id).to.be.eql('some-other-id');- expect(cache.length()).to.be.eql(2);+ expect(store3).not.toBe(store);+ expect(store3.id).toBe('some-other-id');+ expect(cache.length()).toBe(2);});it('should use ID from ENV variable if no parameter is provided', async () => {@@ -633,7 +632,7 @@ describe('utils.openRemoteStorage()', async () => {process.env['some-env'] = 'id-from-env';const store = await utils.openLocalStorage(null, 'some-env', MyStore, cache);- expect(store.id).to.eql('id-from-env');+ expect(store.id).toBe('id-from-env');delete process.env['some-env'];});@@ -649,7 +648,7 @@ describe('utils.openRemoteStorage()', async () => {process.env['some-env'] = 'id-from-env';const store = await utils.openRemoteStorage(null, 'some-env', MyStore, cache, async () => { throw new Error('Should not be called!'); }); // eslint-disable-line- expect(store.id).to.eql('id-from-env');+ expect(store.id).toBe('id-from-env');delete process.env['some-env'];});@@ -657,7 +656,7 @@ describe('utils.openRemoteStorage()', async () => {const checkHtmlToText = (html, expectedText, hasBody = false) => {const text1 = Apify.utils.htmlToText(html);- expect(text1).to.eql(expectedText);+ expect(text1).toEqual(expectedText);// Test embedding into <body> gives the same resultif (typeof html === 'string' && !hasBody) {@@ -677,7 +676,7 @@ const checkHtmlToText = (html, expectedText, hasBody = false) => {</body></html>`;const text2 = Apify.utils.htmlToText(html2);- expect(text2).to.eql(expectedText);+ expect(text2).toEqual(expectedText);}};@@ -782,7 +781,7 @@ describe('utils.createRequestDebugInfo()', () => {foo: 'bar',};- expect(Apify.utils.createRequestDebugInfo(request, response, additionalFields)).to.be.eql({+ expect(Apify.utils.createRequestDebugInfo(request, response, additionalFields)).toEqual({requestId: 'some-id',url: 'https://example.com',loadedUrl: 'https://example.com',@@ -815,7 +814,7 @@ describe('utils.createRequestDebugInfo()', () => {foo: 'bar',};- expect(Apify.utils.createRequestDebugInfo(request, response, additionalFields)).to.be.eql({+ expect(Apify.utils.createRequestDebugInfo(request, response, additionalFields)).toEqual({requestId: 'some-id',url: 'https://example.com',loadedUrl: 'https://example.com',@@ -838,7 +837,7 @@ describe('utils.snakeCaseToCamelCase()', () => {};_.mapObject(tests, (camelCase, snakeCase) => {- expect(utils.snakeCaseToCamelCase(snakeCase)).to.be.eql(camelCase);+ expect(utils.snakeCaseToCamelCase(snakeCase)).toEqual(camelCase);});});});@@ -856,7 +855,7 @@ describe('utils.addTimeoutToPromise()', () => {await p;throw new Error('Wrong error.');} catch (err) {- expect(err.message).to.be.eql('Timed out.');+ expect(err.message).toBe('Timed out.');} finally {clock.restore();}@@ -871,7 +870,7 @@ describe('utils.addTimeoutToPromise()', () => {'Timed out.',);clock.tick(101);- expect(await p).to.be.eql('Done');+ expect(await p).toBe('Done');} catch (err) {throw new Error('This should not fail.');} finally {diff --git a/test/utils_request.js b/__tests__/utils_request.jssimilarity index 70%rename from test/utils_request.jsrename to __tests__/utils_request.jsindex b78d2846f..a62194762 100644--- a/test/utils_request.js+++ b/__tests__/utils_request.js@@ -1,4 +1,3 @@-import { expect } from 'chai';import express from 'express';import {requestAsBrowser,@@ -66,8 +65,8 @@ describe('Apify.utils_request', () => {useMobileVersion: true,};const response = await requestAsBrowser(data);- expect(response.statusCode).to.eql(200);- expect(JSON.parse(response.body)['user-agent']).to.be.eql(FIREFOX_MOBILE_USER_AGENT);+ expect(response.statusCode).toBe(200);+ expect(JSON.parse(response.body)['user-agent']).toEqual(FIREFOX_MOBILE_USER_AGENT);});it('uses desktop user-agent by default ', async () => {@@ -75,11 +74,8 @@ describe('Apify.utils_request', () => {url: `http://${HOST}:${port}/echo`,};const response = await requestAsBrowser(data);- expect(response.statusCode).to.eql(200);- expect(JSON.parse(response.body)['user-agent'])- .to- .be- .eql(FIREFOX_DESKTOP_USER_AGENT);+ expect(response.statusCode).toBe(200);+ expect(JSON.parse(response.body)['user-agent']).toEqual(FIREFOX_DESKTOP_USER_AGENT);});it('sets correct hosts', async () => {@@ -90,8 +86,8 @@ describe('Apify.utils_request', () => {const response = await requestAsBrowser(options);- expect(response.statusCode).to.eql(200);- expect(JSON.parse(response.body).host).to.be.eql(host);+ expect(response.statusCode).toBe(200);+ expect(JSON.parse(response.body).host).toEqual(host);});it('uses correct default language', async () => {@@ -103,8 +99,8 @@ describe('Apify.utils_request', () => {const response = await requestAsBrowser(options);- expect(response.statusCode).to.eql(200);- expect(JSON.parse(response.body)['accept-language']).to.be.eql(`${languageCode}-${countryCode},${languageCode};q=0.5`);+ expect(response.statusCode).toBe(200);+ expect(JSON.parse(response.body)['accept-language']).toEqual(`${languageCode}-${countryCode},${languageCode};q=0.5`);});it('throws error for 406', async () => {@@ -118,8 +114,8 @@ describe('Apify.utils_request', () => {error = e;}- expect(error).to.exist; //eslint-disable-line- expect(error.message).to.eql(`Request for ${options.url} aborted due to abortFunction`);+ expect(error).toBeDefined(); //eslint-disable-line+ expect(error.message).toEqual(`Request for ${options.url} aborted due to abortFunction`);});it('does not throw for empty response body', async () => {@@ -133,7 +129,7 @@ describe('Apify.utils_request', () => {error = e;}- expect(error).to.not.exist; //eslint-disable-line+ expect(error).toBeFalsy(); //eslint-disable-line});it('throws for other contentType then - text/html', async () => {@@ -147,8 +143,8 @@ describe('Apify.utils_request', () => {error = e;}- expect(error).to.exist; //eslint-disable-line- expect(error.message).to.eql(`Request for ${options.url} aborted due to abortFunction`);+ expect(error).toBeDefined(); //eslint-disable-line+ expect(error.message).toEqual(`Request for ${options.url} aborted due to abortFunction`);});it('overrides defaults', async () => {@@ -162,8 +158,8 @@ describe('Apify.utils_request', () => {const response = await requestAsBrowser(options);- expect(response.statusCode).to.eql(200);- expect(JSON.parse(response.body)['user-agent']).to.be.eql(options.headers['User-Agent']);+ expect(response.statusCode).toBe(200);+ expect(JSON.parse(response.body)['user-agent']).toEqual(options.headers['User-Agent']);});it('headers has same format as in firefox', async () => {@@ -174,21 +170,21 @@ describe('Apify.utils_request', () => {const response = await requestAsBrowser(options);const headersArray = JSON.parse(response.body);- expect(response.statusCode).to.eql(200);--- expect(headersArray[0]).to.be.eql('Host');- expect(headersArray[1]).to.be.eql(host);- expect(headersArray[2]).to.be.eql('User-Agent');- expect(headersArray[3]).to.be.eql(FIREFOX_DESKTOP_USER_AGENT);- expect(headersArray[4]).to.be.eql('Accept');- expect(headersArray[5]).to.be.eql('text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8');- expect(headersArray[6]).to.be.eql('Accept-Language');- expect(headersArray[7]).to.be.eql('en-US,en;q=0.5');- expect(headersArray[8]).to.be.eql('Accept-Encoding');- expect(headersArray[9]).to.be.eql('gzip, deflate, br');- expect(headersArray[10]).to.be.eql('Connection');- expect(headersArray[11]).to.be.eql('keep-alive');+ expect(response.statusCode).toBe(200);+++ expect(headersArray[0]).toBe('Host');+ expect(headersArray[1]).toEqual(host);+ expect(headersArray[2]).toBe('User-Agent');+ expect(headersArray[3]).toEqual(FIREFOX_DESKTOP_USER_AGENT);+ expect(headersArray[4]).toBe('Accept');+ expect(headersArray[5]).toBe('text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8');+ expect(headersArray[6]).toBe('Accept-Language');+ expect(headersArray[7]).toBe('en-US,en;q=0.5');+ expect(headersArray[8]).toBe('Accept-Encoding');+ expect(headersArray[9]).toBe('gzip, deflate, br');+ expect(headersArray[10]).toBe('Connection');+ expect(headersArray[11]).toBe('keep-alive');});});});diff --git a/test/utils_social.js b/__tests__/utils_social.jssimilarity index 100%rename from test/utils_social.jsrename to __tests__/utils_social.jsdiff --git a/package.json b/package.jsonindex ada40f5a7..6acee2255 100644--- a/package.json+++ b/package.json@@ -40,7 +40,7 @@"build": "rm -rf ./build && babel src --out-dir build --copy-files","build-docs": "npm run clean && npm run build && node ./website/tools/build_docs.js","build-readme": "node ./tools/build_readme.js",- "test": "npm run build && nyc --reporter=html --reporter=text mocha --timeout 60000 --require @babel/register --recursive --exit",+ "test": "npm run build && jest","test:integration": "npm run build && nyc --reporter=html --reporter=text mocha 'test/integration_tests' --timeout 60000 --require @babel/register --recursive --exit","prepare": "npm run build","prepublishOnly": "(test $TRAVIS || (echo \"Publishing is reserved to the Travis CI!\"; exit 1))",diff --git a/test/constants.js b/test/constants.jsdeleted file mode 100644index 5b1f5196e..000000000--- a/test/constants.js+++ /dev/null@@ -1,16 +0,0 @@-import { expect } from 'chai';-import { ACTOR_BASE_DOCKER_IMAGES, BUILD_TAG_LATEST, ENV_VARS } from 'apify-shared/consts';-import { ACTOR_EVENT_NAMES_EX } from '../build/constants';--describe('consts', () => {- it('should contain constants from apify-shared', () => {- expect(ACTOR_BASE_DOCKER_IMAGES).to.be.a('array');- expect(BUILD_TAG_LATEST).to.be.a('string');- });-- it('should contain local constants', () => {- expect(ENV_VARS).to.be.a('object');- expect(ACTOR_EVENT_NAMES_EX.CPU_INFO).to.be.eql('cpuInfo');- expect(ACTOR_EVENT_NAMES_EX.PERSIST_STATE).to.be.eql('persistState');- });-});