Fix some unit tests

duckduckgo · Sep 4, 2024 · f4ae631 · f4ae631
1 parent 4bd1822
commit f4ae631
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 34 deletions.
diff --git a/post-processing/clickhouse.js b/post-processing/clickhouse.js
@@ -23,7 +23,7 @@ Examples:
     .option('--delete', 'Delete data for the given crawlid')
     .parse(process.argv);
 
-const opts = program.opts()
+const opts = program.opts();
 
 const ch = new Clickhouse();
 const crawlName = opts.crawlname;

diff --git a/tests/collectors/APICallCollector.mocha.js b/tests/collectors/APICallCollector.mocha.js
@@ -65,7 +65,7 @@ describe('APICallCollector', () => {
         });
 
         // @ts-ignore not a real CDP client
-        await collector.addTarget({cdpClient: fakeCDPClient, type: 'page', url: 'https://example.com'});
+        await collector.addTarget({session: fakeCDPClient, type: 'page', url: 'https://example.com'});
 
         const executionContextCreated = listeners.find(a => a.name === 'Runtime.executionContextCreated');
         assert(executionContextCreated, 'executionContextCreated listener was set');

diff --git a/tests/collectors/CMPCollector.mocha.js b/tests/collectors/CMPCollector.mocha.js
@@ -66,7 +66,7 @@ describe('CMPCollector', () => {
             }
         });
         // @ts-ignore not a real CDP client
-        await collector.addTarget({cdpClient: fakeCDPClient, type: 'page', url: 'https://example.com'});
+        await collector.addTarget({session: fakeCDPClient, type: 'page', url: 'https://example.com'});
     });
 
     describe('handleMessage', () => {
@@ -284,18 +284,15 @@ describe('CMPCollector', () => {
             const contentScriptEval = commands.find(cmd => cmd[0] === 'Runtime.evaluate')[1];
             assert.strictEqual(contentScriptEval.contextId, 31337);
 
-            // @ts-ignore no need to provide all params
-            collector.context.pages = () => Promise.resolve([
-                {
-                    frames: () => [
-                        {
-                            evaluate: () => Promise.resolve('This website is using cookies. We are using cookies! To reiterate, you consent to the use of cookies on this website. In fact, there is nothing you can possibly do.')
-                        }
-                    ]
+            const origSessionSend = collector._cdpClient.send;
+            // @ts-expect-error monkey patching the method
+            collector._cdpClient.send = () => Promise.resolve({
+                result: {
+                    value: 'This website is using cookies. We are using cookies! To reiterate, you consent to the use of cookies on this website. In fact, there is nothing you can possibly do.'
                 }
-            ]);
-
+            });
             await collector.postLoad();
+            collector._cdpClient.send = origSessionSend;
             const results = await collector.getData();
             assert.deepStrictEqual(results, [{
                 name: '',

diff --git a/tests/collectors/CookieCollector.test.js b/tests/collectors/CookieCollector.test.js
@@ -51,7 +51,7 @@ const fakeCDPClient = {
 collector.init({});
 
 // @ts-ignore not a real CDP client
-collector.addTarget({cdpClient: fakeCDPClient, type: 'page', url: 'http://example.com'});
+collector.addTarget({session: fakeCDPClient, type: 'page', url: 'http://example.com'});
 
 collector.getData()
     .then(data => {

diff --git a/tests/collectors/RequestCollector.test.js b/tests/collectors/RequestCollector.test.js
@@ -8,7 +8,7 @@ function createFakeCDP() {
      */
     const listeners = [];
 
-    const cdpClient = {
+    const cdpSession = {
         send: () => Promise.resolve(),
         on: (/** @type {string} **/name, /** @type {function(object)} **/callback) => {
             listeners.push({name, callback});
@@ -18,7 +18,7 @@ function createFakeCDP() {
 
     return {
         listeners,
-        cdpClient
+        cdpSession
     };
 }
 
@@ -29,15 +29,15 @@ async function testDefaultSettings() {
     /**
      * getData
      */
-    const {listeners, cdpClient: fakeCDPClient} = createFakeCDP();
+    const {listeners, cdpSession: fakeCDPClient} = createFakeCDP();
 
     // @ts-ignore no need to provide all params
     collector.init({
         log: () => {}
     });
 
     // @ts-ignore not a real CDP client
-    await collector.addTarget({cdpClient: fakeCDPClient, type: 'page', url: 'http://example.com'});
+    await collector.addTarget({session: fakeCDPClient, type: 'page', url: 'http://example.com'});
 
     /**
      * Regular request - success
@@ -273,15 +273,24 @@ async function testResponseHashSetting() {
     /**
      * getData
      */
-    const {listeners, cdpClient: fakeCDPClient} = createFakeCDP();
+    const {listeners, cdpSession: fakeCDPClient} = createFakeCDP();
+    // @ts-expect-error monkeypatching a method
+    fakeCDPClient.send = command => {
+        if (command === 'Network.getResponseBody') {
+            // eslint-disable-next-line no-console
+            return Promise.resolve({body: 'dGVzdA==', base64Encoded: true});//btoa('test')
+        }
+
+        return Promise.resolve();
+    };
 
     // @ts-ignore no need to provide all params
     collector.init({
         log: () => {}
     });
 
     // @ts-ignore not a real CDP client
-    await collector.addTarget({cdpClient: fakeCDPClient, type: 'page', url: 'http://example.com'});
+    await collector.addTarget({session: fakeCDPClient, type: 'page', url: 'http://example.com'});
 
     const requestWillBeSent = listeners.find(a => a.name === 'Network.requestWillBeSent');
     const responseReceived = listeners.find(a => a.name === 'Network.responseReceived');
@@ -311,16 +320,6 @@ async function testResponseHashSetting() {
         }
     });
 
-    //@ts-ignore
-    fakeCDPClient.send = command => {
-        if (command === 'Network.getResponseBody') {
-            // eslint-disable-next-line no-console
-            return Promise.resolve({body: 'dGVzdA==', base64Encoded: true});//btoa('test')
-        }
-
-        return Promise.resolve();
-    };
-
     await loadingFinished.callback({requestId: 100, encodedDataLength: 666, timestamp: 223456});
 
     const data1 = collector.getData({finalUrl: 'https://example.com/'});
@@ -350,15 +349,15 @@ async function testCustomHeadersSetting() {
     /**
      * getData
      */
-    const {listeners, cdpClient: fakeCDPClient} = createFakeCDP();
+    const {listeners, cdpSession: fakeCDPClient} = createFakeCDP();
 
     // @ts-ignore no need to provide all params
     collector.init({
         log: () => {}
     });
 
     // @ts-ignore not a real CDP client
-    await collector.addTarget({cdpClient: fakeCDPClient, type: 'page', url: 'http://example.com'});
+    await collector.addTarget({session: fakeCDPClient, type: 'page', url: 'http://example.com'});
 
     const requestWillBeSent = listeners.find(a => a.name === 'Network.requestWillBeSent');
     const responseReceived = listeners.find(a => a.name === 'Network.responseReceived');

diff --git a/tests/collectors/TargetCollector.test.js b/tests/collectors/TargetCollector.test.js
@@ -11,9 +11,9 @@ const fakeCDPClient = {};
 collector.init();
 
 // @ts-ignore not a real CDP client
-collector.addTarget({cdpClient: fakeCDPClient, type: 'page', url: 'http://example.com'});
+collector.addTarget({session: fakeCDPClient, type: 'page', url: 'http://example.com'});
 // @ts-ignore not a real CDP client
-collector.addTarget({cdpClient: fakeCDPClient, type: 'service_worker', url: 'http://example.com/sw.js'});
+collector.addTarget({session: fakeCDPClient, type: 'service_worker', url: 'http://example.com/sw.js'});
 
 const targets = collector.getData();