Merge pull request #132 from /issues/107-newline-error

fix: correct returning newlines in execute script sync
Seneca-CDOT · Jan 15, 2020 · 6a77936 · 6a77936
2 parents 023a19f + da01d16
commit 6a77936
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Session/Session.ts b/src/Session/Session.ts
@@ -690,9 +690,12 @@ class Session {
     });
 
     const { window } = this.browser.dom;
+    const scriptWithEscapedNewlines = script
+      .replace(/\r\n/g, '\\r\\n')
+      .replace(/\n/g, '\\n');
 
     const func = window
-      .eval(`(function() {${script}})`)
+      .eval(`(function() {${scriptWithEscapedNewlines}})`)
       .bind(null, ...argumentList);
 
     const vm = new VM({

diff --git a/test/jest/e2e/execute-script-sync.test.js b/test/jest/e2e/execute-script-sync.test.js
@@ -175,4 +175,10 @@ describe('Execute Script Sync', () => {
       await executeScript('return document.getElementsByTagName("body")'),
     ).toStrictEqual([{ [ELEMENT]: expect.any(String) }]);
   });
+
+  it('handles returning newlines', async () => {
+    expect(await executeScript('return "\n"')).toBe('\n');
+    expect(await executeScript('return "\r\n"')).toBe('\r\n');
+    expect(await executeScript('return "\n\r\n\r\n";')).toBe('\n\r\n\r\n');
+  });
 });