fix: use this.options instead of this.config (#4186)

codeceptjs · Feb 10, 2024 · 15142ea · 15142ea
1 parent 4543e05
commit 15142ea
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/lib/helper/Puppeteer.js b/lib/helper/Puppeteer.js
@@ -486,7 +486,7 @@ class Puppeteer extends Helper {
     if (!page) return;
     page.setDefaultNavigationTimeout(this.options.getPageTimeout);
     this.context = await this.page.$('body');
-    if (this.config.browser === 'chrome') {
+    if (this.options.browser === 'chrome') {
       await page.bringToFront();
     }
   }
@@ -658,9 +658,9 @@ class Puppeteer extends Helper {
       url = this.options.url + url;
     }
 
-    if (this.config.basicAuth && (this.isAuthenticated !== true)) {
+    if (this.options.basicAuth && (this.isAuthenticated !== true)) {
       if (url.includes(this.options.url)) {
-        await this.page.authenticate(this.config.basicAuth);
+        await this.page.authenticate(this.options.basicAuth);
         this.isAuthenticated = true;
       }
     }

diff --git a/lib/helper/REST.js b/lib/helper/REST.js
@@ -72,9 +72,12 @@ class REST extends Helper {
       this.options.maxBodyLength = maxContentLength;
     }
 
-    this.options = { ...this.options, ...config };
+    // override defaults with config
+    this._setConfig(config);
+
     this.headers = { ...this.options.defaultHeaders };
     this.axios = axios.create();
+    // @ts-ignore
     this.axios.defaults.headers = this.options.defaultHeaders;
   }
 

diff --git a/lib/helper/WebDriver.js b/lib/helper/WebDriver.js
@@ -977,12 +977,12 @@ class WebDriver extends Helper {
    */
   amOnPage(url) {
     let split_url;
-    if (this.config.basicAuth) {
+    if (this.options.basicAuth) {
       if (url.startsWith('/')) {
-        url = this.config.url + url;
+        url = this.options.url + url;
       }
       split_url = url.split('//');
-      url = `${split_url[0]}//${this.config.basicAuth.username}:${this.config.basicAuth.password}@${split_url[1]}`;
+      url = `${split_url[0]}//${this.options.basicAuth.username}:${this.options.basicAuth.password}@${split_url[1]}`;
     }
     return this.browser.url(url);
   }