Fix deprecations

Author: thomashohn

lib/helper/WebDriver.js

@@ -667,7 +667,7 @@ class WebDriver extends Helper {
       this.isRunning = false
       return this.browser.deleteSession()
     }
-    if (this.browser.isInsideFrame) await this.browser.switchToFrame(null)
+    if (this.browser.isInsideFrame) await this.browser.switchFrame(null)
 
     if (this.options.keepBrowserState) return
 
@@ -2574,16 +2574,16 @@ class WebDriver extends Helper {
   async switchTo(locator) {
     this.browser.isInsideFrame = true
     if (Number.isInteger(locator)) {
-      return this.browser.switchToFrame(locator)
+      return this.browser.switchFrame(locator)
     }
     if (!locator) {
-      return this.browser.switchToFrame(null)
+      return this.browser.switchFrame(null)
     }
 
     let res = await this._locate(locator, true)
     assertElementExists(res, locator)
     res = usingFirstElement(res)
-    return this.browser.switchToFrame(res)
+    return this.browser.switchFrame(res)
   }
 
   /**

test/helper/WebDriver.noSeleniumServer_test.js

@@ -373,12 +373,7 @@ describe('WebDriver - No Selenium server started', function () {
     it('should grab the innerHTML for an element', async () => {
       await wd.amOnPage('/')
       const source = await wd.grabHTMLFrom('#area1')
-      assert.deepEqual(
-        source,
-        `
-    <a href="/form/file" qa-id="test" qa-link="test"> Test Link </a>
-`,
-      )
+      assert.deepEqual(source, '<a href="/form/file" qa-id="test" qa-link="test">Test Link</a>')
     })
   })
 

test/helper/WebDriver_test.js

@@ -387,12 +387,7 @@ describe('WebDriver', function () {
     it('should grab the innerHTML for an element', async () => {
       await wd.amOnPage('/')
       const source = await wd.grabHTMLFrom('#area1')
-      assert.deepEqual(
-        source,
-        `
-    <a href="/form/file" qa-id="test" qa-link="test"> Test Link </a>
-`,
-      )
+      assert.deepEqual(source, '<a href="/form/file" qa-id="test" qa-link="test"> Test Link </a>')
     })
   })
 

test/helper/webapi.js

@@ -757,11 +757,9 @@ module.exports.tests = function () {
       await I.amOnPage('/info')
       const val = await I.grabHTMLFrom('#grab-multiple')
       assert.equal(
-        `
-    <a id="first-link">First</a>
-    <a id="second-link">Second</a>
-    <a id="third-link">Third</a>
-`,
+        `<a id="first-link">First</a>
+<a id="second-link">Second</a>
+<a id="third-link">Third</a>`,
         val,
       )
     })