allow stored variables to partially affect the locators

corevo · corevo · commit 4e99af41adf8 · 2018-07-10T18:04:49.000+03:00
diff --git a/packages/selianize/__tests__/command.spec.js b/packages/selianize/__tests__/command.spec.js
diff --git a/packages/selianize/__tests__/location.spec.js b/packages/selianize/__tests__/location.spec.js
@@ -27,40 +27,40 @@ describe("location code emitter", () => {
   it("should emit id locator", () => {
     const type = "id";
     const selector = "someId";
-    return expect(LocationEmitter.emit(`${type}=${selector}`)).resolves.toBe(`By.id("${selector}")`);
+    return expect(LocationEmitter.emit(`${type}=${selector}`)).resolves.toBe(`By.id(\`${selector}\`)`);
   });
   it("should emit link locator", () => {
     const type = "link";
     const selector = "someLink";
-    return expect(LocationEmitter.emit(`${type}=${selector}`)).resolves.toBe(`By.linkText("${selector}")`);
+    return expect(LocationEmitter.emit(`${type}=${selector}`)).resolves.toBe(`By.linkText(\`${selector}\`)`);
   });
   it("should emit css locator", () => {
     const type = "css";
     const selector = "someCss";
-    return expect(LocationEmitter.emit(`${type}=${selector}`)).resolves.toBe(`By.css("${selector}")`);
+    return expect(LocationEmitter.emit(`${type}=${selector}`)).resolves.toBe(`By.css(\`${selector}\`)`);
   });
   it("should emit css locator with `=` sign", () => {
     const type = "css";
     const selector = "a[title=JScript]";
-    return expect(LocationEmitter.emit(`${type}=${selector}`)).resolves.toBe(`By.css("${selector}")`);
+    return expect(LocationEmitter.emit(`${type}=${selector}`)).resolves.toBe(`By.css(\`${selector}\`)`);
   });
   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.toBe("By.css(`a[title=\\\"escaped\\\"]`)");
   });
   it("should emit xpath locator", () => {
     const type = "xpath";
     const selector = "someXpath";
-    return expect(LocationEmitter.emit(`${type}=${selector}`)).resolves.toBe(`By.xpath("${selector}")`);
+    return expect(LocationEmitter.emit(`${type}=${selector}`)).resolves.toBe(`By.xpath(\`${selector}\`)`);
   });
   it("should emit implicit xpath locator", () => {
     const selector = "//test=xpath";
-    return expect(LocationEmitter.emit(selector)).resolves.toBe(`By.xpath("${selector}")`);
+    return expect(LocationEmitter.emit(selector)).resolves.toBe(`By.xpath(\`${selector}\`)`);
   });
   it("should emit name locator", () => {
     const type = "name";
     const selector = "someName";
-    return expect(LocationEmitter.emit(`${type}=${selector}`)).resolves.toBe(`By.name("${selector}")`);
+    return expect(LocationEmitter.emit(`${type}=${selector}`)).resolves.toBe(`By.name(\`${selector}\`)`);
   });
 });
diff --git a/packages/selianize/__tests__/selection.spec.js b/packages/selianize/__tests__/selection.spec.js
@@ -24,21 +24,21 @@ describe("selection location code emitter", () => {
   it("should emit label locator", () => {
     const type = "label";
     const selector = "a label";
-    return expect(SelectionEmitter.emit(`${type}=${selector}`)).resolves.toBe(`By.xpath("//option[. = '${selector}']")`);
+    return expect(SelectionEmitter.emit(`${type}=${selector}`)).resolves.toBe(`By.xpath(\`//option[. = '${selector}']\`)`);
   });
   it("should emit id locator", () => {
     const type = "id";
     const selector = "someId";
-    return expect(SelectionEmitter.emit(`${type}=${selector}`)).resolves.toBe(`By.css("*[id=${selector}]")`);
+    return expect(SelectionEmitter.emit(`${type}=${selector}`)).resolves.toBe(`By.css(\`*[id=${selector}]\`)`);
   });
   it("should emit value locator", () => {
     const type = "value";
     const selector = "someValue";
-    return expect(SelectionEmitter.emit(`${type}=${selector}`)).resolves.toBe(`By.css("*[value=${selector}]")`);
+    return expect(SelectionEmitter.emit(`${type}=${selector}`)).resolves.toBe(`By.css(\`*[value=${selector}]\`)`);
   });
   it("should emit id locator", () => {
     const type = "index";
     const selector = "2";
-    return expect(SelectionEmitter.emit(`${type}=${selector}`)).resolves.toBe(`By.css("*:nth-child(${selector})")`);
+    return expect(SelectionEmitter.emit(`${type}=${selector}`)).resolves.toBe(`By.css(\`*:nth-child(${selector})\`)`);
   });
 });
diff --git a/packages/selianize/src/command.js b/packages/selianize/src/command.js
@@ -217,23 +217,23 @@ async function emitVerifyElementNotPresent(locator) {
 }
 
 async function emitVerifySelectedValue(locator, value) {
-  return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await expect(driver.findElement(${await LocationEmitter.emit(locator)})).resolves.toHaveSelectedValue("${value}");`);
+  return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await expect(driver.findElement(${await LocationEmitter.emit(locator)})).resolves.toHaveSelectedValue(\`${value}\`);`);
 }
 
 async function emitVerifySelectedLabel(locator, labelValue) {
-  return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await driver.findElement(${await LocationEmitter.emit(locator)}).then(element => {element.getAttribute("value").then(selectedValue => {element.findElement(By.xpath('option[@value="'+selectedValue+'"]')).then(selectedOption => {selectedOption.getText().then(selectedLabel => {expect(selectedLabel).toBe("${labelValue}");});});});});`);
+  return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await driver.findElement(${await LocationEmitter.emit(locator)}).then(element => {element.getAttribute("value").then(selectedValue => {element.findElement(By.xpath('option[@value="'+selectedValue+'"]')).then(selectedOption => {selectedOption.getText().then(selectedLabel => {expect(selectedLabel).toBe(\`${labelValue}\`);});});});});`);
 }
 
 async function emitVerifyNotSelectedValue(locator, value) {
-  return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await expect(driver.findElement(${await LocationEmitter.emit(locator)})).resolves.not.toHaveSelectedValue("${value}");`);
+  return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await expect(driver.findElement(${await LocationEmitter.emit(locator)})).resolves.not.toHaveSelectedValue(\`${value}\`);`);
 }
 
 async function emitVerifyValue(locator, value) {
-  return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await expect(driver.findElement(${await LocationEmitter.emit(locator)})).resolves.toHaveValue("${value}");`);
+  return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await expect(driver.findElement(${await LocationEmitter.emit(locator)})).resolves.toHaveValue(\`${value}\`);`);
 }
 
 async function emitVerifyText(locator, text) {
-  return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await expect(driver.findElement(${await LocationEmitter.emit(locator)})).resolves.toHaveText("${text}");`);
+  return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await expect(driver.findElement(${await LocationEmitter.emit(locator)})).resolves.toHaveText(\`${text}\`);`);
 }
 
 async function emitVerifyNotText(locator, text) {
@@ -245,7 +245,7 @@ async function emitVerifyTitle(title) {
 }
 
 async function emitStore(value, varName) {
-  return Promise.resolve(`vars["${varName}"] = "${value}";`);
+  return Promise.resolve(`vars["${varName}"] = \`${value}\`;`);
 }
 
 async function emitStoreText(locator, varName) {
@@ -284,7 +284,7 @@ async function emitSelectFrame(frameLocation) {
 
 function emitSelectWindow(windowLocation) {
   if (/^name=/.test(windowLocation)) {
-    return Promise.resolve(`await driver.switchTo().window("${windowLocation.split("name=")[1]}");`);
+    return Promise.resolve(`await driver.switchTo().window(\`${windowLocation.split("name=")[1]}\`);`);
   } else {
     return Promise.reject(new Error("Can only emit `select window` using name locator"));
   }
@@ -307,11 +307,11 @@ async function emitMouseOut(locator) {
 }
 
 function emitAssertAlert(alertText) {
-  return Promise.resolve(`await driver.switchTo().alert().then(alert => {alert.getText().then(text => {expect(text).toBe("${alertText}");});});`);
+  return Promise.resolve(`await driver.switchTo().alert().then(alert => {alert.getText().then(text => {expect(text).toBe(\`${alertText}\`);});});`);
 }
 
 function emitAssertAlertAndAccept(alertText) {
-  return Promise.resolve(`await driver.switchTo().alert().then(alert => {alert.getText().then(text => {expect(text).toBe("${alertText}");alert.accept();});});`);
+  return Promise.resolve(`await driver.switchTo().alert().then(alert => {alert.getText().then(text => {expect(text).toBe(\`${alertText}\`);alert.accept();});});`);
 }
 
 function emitChooseOkOnNextConfirmation() {
@@ -323,11 +323,11 @@ function emitChooseCancelOnNextConfirmation() {
 }
 
 function emitAnswerOnNextPrompt(textToSend) {
-  return Promise.resolve(`await driver.switchTo().alert().then(alert => {alert.sendKeys("${textToSend}").then(() => {alert.accept();});});`);
+  return Promise.resolve(`await driver.switchTo().alert().then(alert => {alert.sendKeys(\`${textToSend}\`).then(() => {alert.accept();});});`);
 }
 
 async function emitEditContent(locator, content) {
-  return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await driver.findElement(${await LocationEmitter.emit(locator)}).then(element => {driver.executeScript("if(arguments[0].contentEditable === 'true') {arguments[0].innerHTML = '${content}'}", element);});`);
+  return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await driver.findElement(${await LocationEmitter.emit(locator)}).then(element => {driver.executeScript(\`if(arguments[0].contentEditable === 'true') {arguments[0].innerHTML = '${content}'}\`, element);});`);
 }
 
 async function emitSubmit(locator) {
diff --git a/packages/selianize/src/location.js b/packages/selianize/src/location.js
@@ -47,21 +47,21 @@ export default {
 };
 
 function emitId(selector) {
-  return Promise.resolve(`By.id("${selector}")`);
+  return Promise.resolve(`By.id(\`${selector}\`)`);
 }
 
 function emitName(selector) {
-  return Promise.resolve(`By.name("${selector}")`);
+  return Promise.resolve(`By.name(\`${selector}\`)`);
 }
 
 function emitLink(selector) {
-  return Promise.resolve(`By.linkText("${selector}")`);
+  return Promise.resolve(`By.linkText(\`${selector}\`)`);
 }
 
 function emitCss(selector) {
-  return Promise.resolve(`By.css("${selector}")`);
+  return Promise.resolve(`By.css(\`${selector}\`)`);
 }
 
 function emitXpath(selector) {
-  return Promise.resolve(`By.xpath("${selector}")`);
+  return Promise.resolve(`By.xpath(\`${selector}\`)`);
 }
diff --git a/packages/selianize/src/selection.js b/packages/selianize/src/selection.js
@@ -39,17 +39,17 @@ export default {
 };
 
 function emitId(id) {
-  return Promise.resolve(`By.css("*[id=${id}]")`);
+  return Promise.resolve(`By.css(\`*[id=${id}]\`)`);
 }
 
 function emitValue(value) {
-  return Promise.resolve(`By.css("*[value=${value}]")`);
+  return Promise.resolve(`By.css(\`*[value=${value}]\`)`);
 }
 
 function emitLabel(label) {
-  return Promise.resolve(`By.xpath("//option[. = '${label}']")`);
+  return Promise.resolve(`By.xpath(\`//option[. = '${label}']\`)`);
 }
 
 function emitIndex(index) {
-  return Promise.resolve(`By.css("*:nth-child(${index})")`);
+  return Promise.resolve(`By.css(\`*:nth-child(${index})\`)`);
 }

Original file line number	Diff line number	Diff line change
`@@ -217,23 +217,23 @@ async function emitVerifyElementNotPresent(locator) {`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`async function emitVerifySelectedValue(locator, value) {`
`220`		- return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await expect(driver.findElement(${await LocationEmitter.emit(locator)})).resolves.toHaveSelectedValue("${value}");`);
	`220`	+ return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await expect(driver.findElement(${await LocationEmitter.emit(locator)})).resolves.toHaveSelectedValue(\`${value}\`);`);
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`async function emitVerifySelectedLabel(locator, labelValue) {`
`224`		- return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await driver.findElement(${await LocationEmitter.emit(locator)}).then(element => {element.getAttribute("value").then(selectedValue => {element.findElement(By.xpath('option[@value="'+selectedValue+'"]')).then(selectedOption => {selectedOption.getText().then(selectedLabel => {expect(selectedLabel).toBe("${labelValue}");});});});});`);
	`224`	+ return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await driver.findElement(${await LocationEmitter.emit(locator)}).then(element => {element.getAttribute("value").then(selectedValue => {element.findElement(By.xpath('option[@value="'+selectedValue+'"]')).then(selectedOption => {selectedOption.getText().then(selectedLabel => {expect(selectedLabel).toBe(\`${labelValue}\`);});});});});`);
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`async function emitVerifyNotSelectedValue(locator, value) {`
`228`		- return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await expect(driver.findElement(${await LocationEmitter.emit(locator)})).resolves.not.toHaveSelectedValue("${value}");`);
	`228`	+ return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await expect(driver.findElement(${await LocationEmitter.emit(locator)})).resolves.not.toHaveSelectedValue(\`${value}\`);`);
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`async function emitVerifyValue(locator, value) {`
`232`		- return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await expect(driver.findElement(${await LocationEmitter.emit(locator)})).resolves.toHaveValue("${value}");`);
	`232`	+ return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await expect(driver.findElement(${await LocationEmitter.emit(locator)})).resolves.toHaveValue(\`${value}\`);`);
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`async function emitVerifyText(locator, text) {`
`236`		- return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await expect(driver.findElement(${await LocationEmitter.emit(locator)})).resolves.toHaveText("${text}");`);
	`236`	+ return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await expect(driver.findElement(${await LocationEmitter.emit(locator)})).resolves.toHaveText(\`${text}\`);`);
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`async function emitVerifyNotText(locator, text) {`
`@@ -245,7 +245,7 @@ async function emitVerifyTitle(title) {`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`async function emitStore(value, varName) {`
`248`		- return Promise.resolve(`vars["${varName}"] = "${value}";`);
	`248`	+ return Promise.resolve(`vars["${varName}"] = \`${value}\`;`);
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`async function emitStoreText(locator, varName) {`
`@@ -284,7 +284,7 @@ async function emitSelectFrame(frameLocation) {`
`284`	`284`
`285`	`285`	`function emitSelectWindow(windowLocation) {`
`286`	`286`	`if (/^name=/.test(windowLocation)) {`
`287`		- return Promise.resolve(`await driver.switchTo().window("${windowLocation.split("name=")[1]}");`);
	`287`	+ return Promise.resolve(`await driver.switchTo().window(\`${windowLocation.split("name=")[1]}\`);`);
`288`	`288`	`} else {`
`289`	`289`	return Promise.reject(new Error("Can only emit `select window` using name locator"));
`290`	`290`	`}`
`@@ -307,11 +307,11 @@ async function emitMouseOut(locator) {`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`function emitAssertAlert(alertText) {`
`310`		- return Promise.resolve(`await driver.switchTo().alert().then(alert => {alert.getText().then(text => {expect(text).toBe("${alertText}");});});`);
	`310`	+ return Promise.resolve(`await driver.switchTo().alert().then(alert => {alert.getText().then(text => {expect(text).toBe(\`${alertText}\`);});});`);
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`function emitAssertAlertAndAccept(alertText) {`
`314`		- return Promise.resolve(`await driver.switchTo().alert().then(alert => {alert.getText().then(text => {expect(text).toBe("${alertText}");alert.accept();});});`);
	`314`	+ return Promise.resolve(`await driver.switchTo().alert().then(alert => {alert.getText().then(text => {expect(text).toBe(\`${alertText}\`);alert.accept();});});`);
`315`	`315`	`}`
`316`	`316`
`317`	`317`	`function emitChooseOkOnNextConfirmation() {`
`@@ -323,11 +323,11 @@ function emitChooseCancelOnNextConfirmation() {`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`function emitAnswerOnNextPrompt(textToSend) {`
`326`		- return Promise.resolve(`await driver.switchTo().alert().then(alert => {alert.sendKeys("${textToSend}").then(() => {alert.accept();});});`);
	`326`	+ return Promise.resolve(`await driver.switchTo().alert().then(alert => {alert.sendKeys(\`${textToSend}\`).then(() => {alert.accept();});});`);
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`async function emitEditContent(locator, content) {`
`330`		- return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await driver.findElement(${await LocationEmitter.emit(locator)}).then(element => {driver.executeScript("if(arguments[0].contentEditable === 'true') {arguments[0].innerHTML = '${content}'}", element);});`);
	`330`	+ return Promise.resolve(`await driver.wait(until.elementLocated(${await LocationEmitter.emit(locator)}));await driver.findElement(${await LocationEmitter.emit(locator)}).then(element => {driver.executeScript(\`if(arguments[0].contentEditable === 'true') {arguments[0].innerHTML = '${content}'}\`, element);});`);
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`async function emitSubmit(locator) {`
Original file line number	Diff line number	Diff line change
`@@ -47,21 +47,21 @@ export default {`
`47`	`47`	`};`
`48`	`48`
`49`	`49`	`function emitId(selector) {`
`50`		- return Promise.resolve(`By.id("${selector}")`);
	`50`	+ return Promise.resolve(`By.id(\`${selector}\`)`);
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`function emitName(selector) {`
`54`		- return Promise.resolve(`By.name("${selector}")`);
	`54`	+ return Promise.resolve(`By.name(\`${selector}\`)`);
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`function emitLink(selector) {`
`58`		- return Promise.resolve(`By.linkText("${selector}")`);
	`58`	+ return Promise.resolve(`By.linkText(\`${selector}\`)`);
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`function emitCss(selector) {`
`62`		- return Promise.resolve(`By.css("${selector}")`);
	`62`	+ return Promise.resolve(`By.css(\`${selector}\`)`);
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`function emitXpath(selector) {`
`66`		- return Promise.resolve(`By.xpath("${selector}")`);
	`66`	+ return Promise.resolve(`By.xpath(\`${selector}\`)`);
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,17 +39,17 @@ export default {`
`39`	`39`	`};`
`40`	`40`
`41`	`41`	`function emitId(id) {`
`42`		- return Promise.resolve(`By.css("*[id=${id}]")`);
	`42`	+ return Promise.resolve(`By.css(\`*[id=${id}]\`)`);
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`function emitValue(value) {`
`46`		- return Promise.resolve(`By.css("*[value=${value}]")`);
	`46`	+ return Promise.resolve(`By.css(\`*[value=${value}]\`)`);
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`function emitLabel(label) {`
`50`		- return Promise.resolve(`By.xpath("//option[. = '${label}']")`);
	`50`	+ return Promise.resolve(`By.xpath(\`//option[. = '${label}']\`)`);
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`function emitIndex(index) {`
`54`		- return Promise.resolve(`By.css("*:nth-child(${index})")`);
	`54`	+ return Promise.resolve(`By.css(\`*:nth-child(${index})\`)`);
`55`	`55`	`}`