Added improved string escaping

David Haeffner · David Haeffner · commit 8772c00a93b8 · 2019-07-16T14:33:17.000+03:00
diff --git a/packages/code-export-java-junit/__test__/src/__snapshots__/index.spec.js.snap b/packages/code-export-java-junit/__test__/src/__snapshots__/index.spec.js.snap
@@ -41,7 +41,7 @@ public class LoginTest {
     driver.findElement(By.id(\\"username\\")).sendKeys(\\"tomsmith\\");
     driver.findElement(By.id(\\"password\\")).sendKeys(\\"SuperSecretPassword!\\");
     driver.findElement(By.cssSelector(\\"#login button\\")).click();
-    assertThat(driver.findElement(By.cssSelector(\\".flash.success\\")).getText(), is(\\"You logged into a secure area!\\\\\\\\n×\\"));
+    assertThat(driver.findElement(By.cssSelector(\\".flash.success\\")).getText(), is(\\"You logged into a secure area!\\\\n×\\"));
   }
   @Test
   public void invalidcredentials() {
@@ -50,7 +50,7 @@ public class LoginTest {
     driver.findElement(By.id(\\"username\\")).sendKeys(\\"blah\\");
     driver.findElement(By.id(\\"password\\")).sendKeys(\\"blah\\");
     driver.findElement(By.cssSelector(\\"#login button\\")).click();
-    assertThat(driver.findElement(By.id(\\"flash\\")).getText(), is(\\"Your username is invalid!\\\\\\\\n×\\"));
+    assertThat(driver.findElement(By.id(\\"flash\\")).getText(), is(\\"Your username is invalid!\\\\n×\\"));
   }
 }
 "
@@ -388,7 +388,7 @@ public class LoginTest {
     driver.findElement(By.id(\\"username\\")).sendKeys(\\"tomsmith\\");
     driver.findElement(By.id(\\"password\\")).sendKeys(\\"SuperSecretPassword!\\");
     driver.findElement(By.cssSelector(\\"#login button\\")).click();
-    assertThat(driver.findElement(By.cssSelector(\\".flash.success\\")).getText(), is(\\"You logged into a secure area!\\\\\\\\n×\\"));
+    assertThat(driver.findElement(By.cssSelector(\\".flash.success\\")).getText(), is(\\"You logged into a secure area!\\\\n×\\"));
   }
 }
 "
diff --git a/packages/code-export-java-junit/__test__/src/__snapshots__/location.spec.js.snap b/packages/code-export-java-junit/__test__/src/__snapshots__/location.spec.js.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`location code emitter should escape quotes in locator strings 1`] = `"By.cssSelector(\\"a[title=\\"escaped\\"]\\")"`;
diff --git a/packages/code-export-java-junit/__test__/src/location.spec.js b/packages/code-export-java-junit/__test__/src/location.spec.js
@@ -73,9 +73,7 @@ describe('location code emitter', () => {
   it('should escape quotes in locator strings', () => {
     const type = 'css'
     const selector = 'a[title="escaped"]'
-    return expect(emit(`${type}=${selector}`)).resolves.toBe(
-      'By.cssSelector("a[title=\\"escaped\\"]")'
-    )
+    return expect(emit(`${type}=${selector}`)).resolves.toMatchSnapshot()
   })
   it('should emit xpath locator', () => {
     const type = 'xpath'
diff --git a/packages/code-export-java-junit/src/command.js b/packages/code-export-java-junit/src/command.js
@@ -396,8 +396,7 @@ async function emitEditContent(locator, content) {
 }
 
 async function emitExecuteScript(script, varName) {
-  const scriptString = script.script.replace(/"/g, "'")
-  const result = `js.executeScript("${scriptString}"${generateScriptArguments(
+  const result = `js.executeScript("${script.script}"${generateScriptArguments(
     script
   )})`
   return Promise.resolve(variableSetter(varName, result))
diff --git a/packages/code-export-javascript-mocha/__test__/src/__snapshots__/index.spec.js.snap b/packages/code-export-javascript-mocha/__test__/src/__snapshots__/index.spec.js.snap
@@ -22,15 +22,15 @@ describe('login', function() {
     await driver.findElement(By.id(\\"username\\")).sendKeys(\\"tomsmith\\")
     await driver.findElement(By.id(\\"password\\")).sendKeys(\\"SuperSecretPassword!\\")
     await driver.findElement(By.css(\\"#login button\\")).click()
-    assert(await driver.findElement(By.css(\\".flash.success\\")).getText() == \\"You logged into a secure area!\\\\\\\\n×\\")
+    assert(await driver.findElement(By.css(\\".flash.success\\")).getText() == \\"You logged into a secure area!\\\\n×\\")
   })
   it('invalid credentials', async function() {
     await driver.get(\\"http://the-internet.herokuapp.com/login\\")
     await driver.setRect(1440, 1177)
     await driver.findElement(By.id(\\"username\\")).sendKeys(\\"blah\\")
     await driver.findElement(By.id(\\"password\\")).sendKeys(\\"blah\\")
     await driver.findElement(By.css(\\"#login button\\")).click()
-    assert(await driver.findElement(By.id(\\"flash\\")).getText() == \\"Your username is invalid!\\\\\\\\n×\\")
+    assert(await driver.findElement(By.id(\\"flash\\")).getText() == \\"Your username is invalid!\\\\n×\\")
   })
 })
 "
@@ -258,7 +258,7 @@ describe('login', function() {
     await driver.findElement(By.id(\\"username\\")).sendKeys(\\"tomsmith\\")
     await driver.findElement(By.id(\\"password\\")).sendKeys(\\"SuperSecretPassword!\\")
     await driver.findElement(By.css(\\"#login button\\")).click()
-    assert(await driver.findElement(By.css(\\".flash.success\\")).getText() == \\"You logged into a secure area!\\\\\\\\n×\\")
+    assert(await driver.findElement(By.css(\\".flash.success\\")).getText() == \\"You logged into a secure area!\\\\n×\\")
   })
 })
 "
diff --git a/packages/code-export-javascript-mocha/__test__/src/__snapshots__/location.spec.js.snap b/packages/code-export-javascript-mocha/__test__/src/__snapshots__/location.spec.js.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`location code emitter should escape quotes in locator strings 1`] = `"By.css(\\"a[title=\\"escaped\\"]\\")"`;
diff --git a/packages/code-export-javascript-mocha/__test__/src/location.spec.js b/packages/code-export-javascript-mocha/__test__/src/location.spec.js
@@ -73,9 +73,7 @@ describe('location code emitter', () => {
   it('should escape quotes in locator strings', () => {
     const type = 'css'
     const selector = 'a[title="escaped"]'
-    return expect(emit(`${type}=${selector}`)).resolves.toEqual(
-      `By.css("a[title=\\"escaped\\"]")`
-    )
+    return expect(emit(`${type}=${selector}`)).resolves.toMatchSnapshot()
   })
   it('should emit xpath locator', () => {
     const type = 'xpath'
diff --git a/packages/code-export-javascript-mocha/src/command.js b/packages/code-export-javascript-mocha/src/command.js
@@ -249,10 +249,9 @@ async function emitClose() {
 }
 
 function generateExpressionScript(script) {
-  const scriptString = script.script.replace(/"/g, "'")
-  return `await driver.executeScript("return (${scriptString})"${generateScriptArguments(
-    script
-  )})`
+  return `await driver.executeScript("return (${
+    script.script
+  })"${generateScriptArguments(script)})`
 }
 
 function generateScriptArguments(script) {
diff --git a/packages/code-export-python-pytest/__test__/src/__snapshots__/index.spec.js.snap b/packages/code-export-python-pytest/__test__/src/__snapshots__/index.spec.js.snap
@@ -26,15 +26,15 @@ class TestLogin():
     self.driver.find_element(By.ID, \\"username\\").send_keys(\\"tomsmith\\")
     self.driver.find_element(By.ID, \\"password\\").send_keys(\\"SuperSecretPassword!\\")
     self.driver.find_element(By.CSS_SELECTOR, \\"#login button\\").click()
-    assert self.driver.find_element(By.CSS_SELECTOR, \\".flash.success\\").text == \\"You logged into a secure area!\\\\\\\\n×\\"
+    assert self.driver.find_element(By.CSS_SELECTOR, \\".flash.success\\").text == \\"You logged into a secure area!\\\\n×\\"
   
   def test_invalidcredentials(self):
     self.driver.get(\\"http://the-internet.herokuapp.com/login\\")
     self.driver.set_window_size(1440, 1177)
     self.driver.find_element(By.ID, \\"username\\").send_keys(\\"blah\\")
     self.driver.find_element(By.ID, \\"password\\").send_keys(\\"blah\\")
     self.driver.find_element(By.CSS_SELECTOR, \\"#login button\\").click()
-    assert self.driver.find_element(By.ID, \\"flash\\").text == \\"Your username is invalid!\\\\\\\\n×\\"
+    assert self.driver.find_element(By.ID, \\"flash\\").text == \\"Your username is invalid!\\\\n×\\"
   
 "
 `;
@@ -268,7 +268,7 @@ class TestLogin():
     self.driver.find_element(By.ID, \\"username\\").send_keys(\\"tomsmith\\")
     self.driver.find_element(By.ID, \\"password\\").send_keys(\\"SuperSecretPassword!\\")
     self.driver.find_element(By.CSS_SELECTOR, \\"#login button\\").click()
-    assert self.driver.find_element(By.CSS_SELECTOR, \\".flash.success\\").text == \\"You logged into a secure area!\\\\\\\\n×\\"
+    assert self.driver.find_element(By.CSS_SELECTOR, \\".flash.success\\").text == \\"You logged into a secure area!\\\\n×\\"
   
 "
 `;
diff --git a/packages/code-export-python-pytest/__test__/src/__snapshots__/location.spec.js.snap b/packages/code-export-python-pytest/__test__/src/__snapshots__/location.spec.js.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`location code emitter should escape quotes in locator strings 1`] = `"By.CSS_SELECTOR, \\"a[title=\\"escaped\\"]\\""`;
diff --git a/packages/code-export-python-pytest/__test__/src/location.spec.js b/packages/code-export-python-pytest/__test__/src/location.spec.js
@@ -73,9 +73,7 @@ describe('location code emitter', () => {
   it('should escape quotes in locator strings', () => {
     const type = 'css'
     const selector = 'a[title="escaped"]'
-    return expect(emit(`${type}=${selector}`)).resolves.toEqual(
-      `By.CSS_SELECTOR, "a[title=\\"escaped\\"]"`
-    )
+    return expect(emit(`${type}=${selector}`)).resolves.toMatchSnapshot()
   })
   it('should emit xpath locator', () => {
     const type = 'xpath'
diff --git a/packages/code-export-python-pytest/src/command.js b/packages/code-export-python-pytest/src/command.js
@@ -239,10 +239,9 @@ async function emitClose() {
 }
 
 function generateExpressionScript(script) {
-  const scriptString = script.script.replace(/"/g, "'")
-  return `self.driver.execute_script("return (${scriptString})"${generateScriptArguments(
-    script
-  )})`
+  return `self.driver.execute_script("return (${
+    script.script
+  })"${generateScriptArguments(script)})`
 }
 
 function generateScriptArguments(script) {
diff --git a/packages/selianize/__tests__/__snapshots__/command.spec.js.snap b/packages/selianize/__tests__/__snapshots__/command.spec.js.snap
@@ -22,6 +22,8 @@ exports[`command code emitter should emit \`mouse up at\` event 1`] = `"await dr
 
 exports[`command code emitter should emit \`mouse up\` event 1`] = `"await driver.wait(until.elementLocated(By.id(\`button\`)), configuration.timeout);await driver.findElement(By.id(\`button\`)).then(element => {return driver.actions({bridge: true}).move({origin: element}).release().perform();});"`;
 
+exports[`command code emitter should emit \`run script\` command 1`] = `"await driver.executeScript(\`alert('test');\\\\nalert('Im annoying');\`);"`;
+
 exports[`command code emitter should emit \`set window size\` command 1`] = `
 "try {
       await driver.manage().window().setRect({ width: 100, height: 100 });
diff --git a/packages/selianize/__tests__/__snapshots__/location.spec.js.snap b/packages/selianize/__tests__/__snapshots__/location.spec.js.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`location code emitter should escape quotes in locator strings 1`] = `"By.css(\`a[title=\\"escaped\\"]\`)"`;
diff --git a/packages/selianize/__tests__/command.spec.js b/packages/selianize/__tests__/command.spec.js
@@ -286,9 +286,7 @@ describe('command code emitter', () => {
       target: "alert('test');\nalert('Im annoying');",
       value: '',
     }
-    return expect(CommandEmitter.emit(command)).resolves.toBe(
-      `await driver.executeScript(\`${command.target}\`);`
-    )
+    return expect(CommandEmitter.emit(command)).resolves.toMatchSnapshot()
   })
   it('should emit `execute script` command', () => {
     const command = {
diff --git a/packages/selianize/__tests__/index.spec.js b/packages/selianize/__tests__/index.spec.js
@@ -32,7 +32,7 @@ describe('Selenium code serializer', () => {
     )
     return expect(Selianize(project)).resolves.toBeDefined()
   })
-  it('should resolve to snapshots on snapshotted tests', async () => {
+  it.only('should resolve to snapshots on snapshotted tests', async () => {
     const project = JSON.parse(
       fs.readFileSync(
         path.join(__dirname, 'test-files', 'project-5-partial-snapshot.side')
diff --git a/packages/selianize/__tests__/location.spec.js b/packages/selianize/__tests__/location.spec.js
@@ -73,9 +73,9 @@ describe('location code emitter', () => {
   it('should escape quotes in locator strings', () => {
     const type = 'css'
     const selector = 'a[title="escaped"]'
-    return expect(LocationEmitter.emit(`${type}=${selector}`)).resolves.toBe(
-      'By.css(`a[title=\\"escaped\\"]`)'
-    )
+    return expect(
+      LocationEmitter.emit(`${type}=${selector}`)
+    ).resolves.toMatchSnapshot()
   })
   it('should emit xpath locator', () => {
     const type = 'xpath'
diff --git a/packages/selianize/package.json b/packages/selianize/package.json
@@ -21,7 +21,7 @@
   "license": "Apache-2.0",
   "private": false,
   "dependencies": {
-    "js-string-escape": "^1.0.1"
+    "@seleniumhq/side-utils": "^3.11.1"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.3.4",
diff --git a/packages/selianize/src/command.js b/packages/selianize/src/command.js
@@ -17,6 +17,7 @@
 import config from './config'
 import LocationEmitter from './location'
 import SelectionEmitter from './selection'
+import { stringEscape } from '@seleniumhq/side-utils'
 
 const emitters = {
   open: emitOpen,
@@ -125,8 +126,16 @@ export function emit(command, options = config, snapshot) {
         return res({ skipped: true })
       try {
         let result = await emitters[command.command](
-          preprocessParameter(command.target, emitters[command.command].target),
-          preprocessParameter(command.value, emitters[command.command].value)
+          preprocessParameter(
+            command.target,
+            emitters[command.command].target,
+            command
+          ),
+          preprocessParameter(
+            command.value,
+            emitters[command.command].value,
+            command
+          )
         )
         if (command.opensWindow) result = emitNewWindowHandling(result, command)
         res(result)
@@ -151,11 +160,22 @@ export function canEmit(commandName) {
   return !!emitters[commandName]
 }
 
-function preprocessParameter(param, preprocessor) {
+function preprocessParameter(param, preprocessor, command) {
+  const escapedParam = escapeString(param, {
+    preprocessor,
+    commandName: command ? command.command : undefined,
+  })
   if (preprocessor) {
-    return preprocessor(param)
+    return preprocessor(escapedParam)
   }
-  return defaultPreprocessor(param)
+  return defaultPreprocessor(escapedParam)
+}
+
+function escapeString(string, { preprocessor, commandName }) {
+  if (commandName && commandName === 'storeJson') return string
+  else if (preprocessor && preprocessor.name === 'scriptPreprocessor')
+    return stringEscape(string.replace(/"/g, "'"), '"')
+  else return stringEscape(string)
 }
 
 function emitNewWindowHandling(emitted, command) {
diff --git a/packages/selianize/src/configuration.js b/packages/selianize/src/configuration.js
@@ -16,6 +16,7 @@
 // under the License.
 
 import config from './config'
+import { stringEscape } from '@seleniumhq/side-utils'
 
 const hooks = []
 
@@ -24,9 +25,9 @@ export async function emit(project, options = config, snapshot) {
     hooks.map(hook => hook({ name: project.name }))
   )).join('')
   if (!options.skipStdLibEmitting) {
-    return `global.Key = require('selenium-webdriver').Key;global.URL = require('url').URL;global.BASE_URL = configuration.baseUrl || '${
+    return `global.Key = require('selenium-webdriver').Key;global.URL = require('url').URL;global.BASE_URL = configuration.baseUrl || '${stringEscape(
       project.url
-    }';let vars = {};${configHooks}${snapshot ? snapshot : ''}`
+    )}';let vars = {};${configHooks}${snapshot ? snapshot : ''}`
   } else {
     if (configHooks) {
       return {
diff --git a/packages/selianize/src/index.js b/packages/selianize/src/index.js
@@ -22,6 +22,7 @@ import CommandEmitter from './command'
 import LocationEmitter from './location'
 import config from './config'
 import utils from './utils'
+import { stringEscape } from '@seleniumhq/side-utils'
 
 /**
  * @typedef Project a Selenium IDE project (.side)
@@ -165,7 +166,7 @@ export function RegisterEmitter(command, emitter) {
 export function ParseError(error) {
   return error.tests
     .map(test =>
-      `## ${test.name}\n`.concat(
+      `## ${stringEscape(test.name)}\n`.concat(
         test.commands
           .map(command => `${command.index}. ${command.message}\n`)
           .join('')
diff --git a/packages/selianize/src/location.js b/packages/selianize/src/location.js
@@ -15,8 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import StringEscape from 'js-string-escape'
-
 const emitters = {
   id: emitId,
   name: emitName,
@@ -34,7 +32,7 @@ export function emit(location) {
     }
     const fragments = location.split('=')
     const type = fragments.shift()
-    const selector = StringEscape(fragments.join('='))
+    const selector = fragments.join('=')
     if (emitters[type]) {
       let result = await emitters[type](selector)
       res(result)
diff --git a/packages/selianize/src/suite.js b/packages/selianize/src/suite.js
@@ -15,6 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
+import { stringEscape } from '@seleniumhq/side-utils'
+
 const hooks = []
 
 import config from './config'
@@ -40,6 +42,8 @@ export function emit(suite, tests, options = config, snapshot) {
     )
 
     if (!options.skipStdLibEmitting) {
+      const suiteName = stringEscape(suite.name)
+      const suiteTimeout = stringEscape(Math.floor(suite.timeout).toString())
       let testsCode = await Promise.all(
         suite.tests.map(testId => tests[testId].emitted).map(test => test.test)
       )
@@ -49,15 +53,16 @@ export function emit(suite, tests, options = config, snapshot) {
           name: tests[suite.tests[index]].emitted.name,
           code: `${code.replace(
             /^it/,
-            `jest.setTimeout(${suite.timeout * 1000});test`
+            `jest.setTimeout(${suiteTimeout * 1000});test`
           )}${hookResults}${snapshot ? snapshot.hook : ''}`,
         }))
         return res(testsCode)
       }
 
-      let result = `jest.setTimeout(${suite.timeout * 1000});describe("${
-        suite.name
-      }", () => {${hookResults}${snapshot ? snapshot.hook : ''}`
+      let result = `jest.setTimeout(${suiteTimeout *
+        1000});describe("${suiteName}", () => {${hookResults}${
+        snapshot ? snapshot.hook : ''
+      }`
 
       result += testsCode.join('')
 
diff --git a/packages/selianize/src/testcase.js b/packages/selianize/src/testcase.js
diff --git a/packages/side-utils/__test__/src/string-escape/index.spec.js b/packages/side-utils/__test__/src/string-escape/index.spec.js
diff --git a/packages/side-utils/package.json b/packages/side-utils/package.json
diff --git a/packages/side-utils/src/code-export/emit.js b/packages/side-utils/src/code-export/emit.js
diff --git a/packages/side-utils/src/code-export/preprocessor.js b/packages/side-utils/src/code-export/preprocessor.js
diff --git a/packages/side-utils/src/index.js b/packages/side-utils/src/index.js
diff --git a/packages/side-utils/src/string-escape/index.js b/packages/side-utils/src/string-escape/index.js

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public class LoginTest {`
`41`	`41`	`driver.findElement(By.id(\\"username\\")).sendKeys(\\"tomsmith\\");`
`42`	`42`	`driver.findElement(By.id(\\"password\\")).sendKeys(\\"SuperSecretPassword!\\");`
`43`	`43`	`driver.findElement(By.cssSelector(\\"#login button\\")).click();`
`44`		`- assertThat(driver.findElement(By.cssSelector(\\".flash.success\\")).getText(), is(\\"You logged into a secure area!\\\\\\\\n×\\"));`
	`44`	`+ assertThat(driver.findElement(By.cssSelector(\\".flash.success\\")).getText(), is(\\"You logged into a secure area!\\\\n×\\"));`
`45`	`45`	`}`
`46`	`46`	`@Test`
`47`	`47`	`public void invalidcredentials() {`
`@@ -50,7 +50,7 @@ public class LoginTest {`
`50`	`50`	`driver.findElement(By.id(\\"username\\")).sendKeys(\\"blah\\");`
`51`	`51`	`driver.findElement(By.id(\\"password\\")).sendKeys(\\"blah\\");`
`52`	`52`	`driver.findElement(By.cssSelector(\\"#login button\\")).click();`
`53`		`- assertThat(driver.findElement(By.id(\\"flash\\")).getText(), is(\\"Your username is invalid!\\\\\\\\n×\\"));`
	`53`	`+ assertThat(driver.findElement(By.id(\\"flash\\")).getText(), is(\\"Your username is invalid!\\\\n×\\"));`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`"`
`@@ -388,7 +388,7 @@ public class LoginTest {`
`388`	`388`	`driver.findElement(By.id(\\"username\\")).sendKeys(\\"tomsmith\\");`
`389`	`389`	`driver.findElement(By.id(\\"password\\")).sendKeys(\\"SuperSecretPassword!\\");`
`390`	`390`	`driver.findElement(By.cssSelector(\\"#login button\\")).click();`
`391`		`- assertThat(driver.findElement(By.cssSelector(\\".flash.success\\")).getText(), is(\\"You logged into a secure area!\\\\\\\\n×\\"));`
	`391`	`+ assertThat(driver.findElement(By.cssSelector(\\".flash.success\\")).getText(), is(\\"You logged into a secure area!\\\\n×\\"));`
`392`	`392`	`}`
`393`	`393`	`}`
`394`	`394`	`"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// Jest Snapshot v1, https://goo.gl/fbAQLP`
	`2`	`+`
	`3`	+exports[`location code emitter should escape quotes in locator strings 1`] = `"By.cssSelector(\\"a[title=\\"escaped\\"]\\")"`;
Original file line number	Diff line number	Diff line change
`@@ -396,8 +396,7 @@ async function emitEditContent(locator, content) {`
`396`	`396`	`}`
`397`	`397`
`398`	`398`	`async function emitExecuteScript(script, varName) {`
`399`		`- const scriptString = script.script.replace(/"/g, "'")`
`400`		- const result = `js.executeScript("${scriptString}"${generateScriptArguments(
	`399`	+ const result = `js.executeScript("${script.script}"${generateScriptArguments(
`401`	`400`	`script`
`402`	`401`	)})`
`403`	`402`	`return Promise.resolve(variableSetter(varName, result))`
Original file line number	Diff line number	Diff line change
`@@ -249,10 +249,9 @@ async function emitClose() {`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`function generateExpressionScript(script) {`
`252`		`- const scriptString = script.script.replace(/"/g, "'")`
`253`		- return `await driver.executeScript("return (${scriptString})"${generateScriptArguments(
`254`		`- script`
`255`		- )})`
	`252`	+ return `await driver.executeScript("return (${
	`253`	`+ script.script`
	`254`	+ })"${generateScriptArguments(script)})`
`256`	`255`	`}`
`257`	`256`
`258`	`257`	`function generateScriptArguments(script) {`