@seleniumhq/code-export-python-pytest 3.16.0 → 3.17.4

package/__test__/src/__snapshots__/command.spec.js.snap

@@ -123,9 +123,9 @@ actions = ActionChains(self.driver)
 actions.drag_and_drop(dragged, dropped).perform()"
 `;
 
-exports[`command code emitter should emit \`echo\` command 1`] = `"print(str(\\"blah\\"))"`;
+exports[`command code emitter should emit \`echo\` command 1`] = `"print(\\"blah\\")"`;
 
-exports[`command code emitter should emit \`echo\` command with variables 1`] = `"print(str(self.vars[\\"blah\\"]))"`;
+exports[`command code emitter should emit \`echo\` command with variables 1`] = `"print(\\"blah = {}\\".format(self.vars[\\"blah\\"]))"`;
 
 exports[`command code emitter should emit \`edit content\` command 1`] = `
 "element = self.driver.find_element(By.ID, \\"contentEditable\\")
@@ -225,7 +225,7 @@ actions.move_to_element(element).release().perform()"
 
 exports[`command code emitter should emit \`open\` with absolute url 1`] = `"self.driver.get(\\"https://www.seleniumhq.org/\\")"`;
 
-exports[`command code emitter should emit \`pause\` command 1`] = `"time.sleep(300)"`;
+exports[`command code emitter should emit \`pause\` command 1`] = `"time.sleep(0.3)"`;
 
 exports[`command code emitter should emit \`remove selection\` command 1`] = `
 "dropdown = self.driver.find_element(By.CSS_SELECTOR, \\"select\\")
@@ -348,17 +348,19 @@ assert value == \\"test\\""
 
 exports[`command code emitter should emit \`verify\` command 1`] = `"assert(self.vars[\\"varrrName\\"] == \\"blah\\")"`;
 
-exports[`command code emitter should emit \`waitForElementEditable\` command 1`] = `"WebDriverWait(self.driver, 5000).until(expected_conditions.element_to_be_clickable((By.CSS_SELECTOR, \\"#blah\\")))"`;
+exports[`command code emitter should emit \`waitForElementEditable\` command 1`] = `"WebDriverWait(self.driver, 5).until(expected_conditions.element_to_be_clickable((By.CSS_SELECTOR, \\"#blah\\")))"`;
 
-exports[`command code emitter should emit \`waitForElementNotEditable\` command 1`] = `"WebDriverWait(self.driver, 5000).until_not(expected_conditions.element_to_be_clickable((By.CSS_SELECTOR, \\"#blah\\")))"`;
+exports[`command code emitter should emit \`waitForElementNotEditable\` command 1`] = `"WebDriverWait(self.driver, 5).until_not(expected_conditions.element_to_be_clickable((By.CSS_SELECTOR, \\"#blah\\")))"`;
 
-exports[`command code emitter should emit \`waitForElementNotPresent\` command 1`] = `"WebDriverWait(self.driver, 5000).until(expected_conditions.invisibility_of_element_located((By.CSS_SELECTOR, \\"#blah\\")))"`;
+exports[`command code emitter should emit \`waitForElementNotPresent\` command 1`] = `"WebDriverWait(self.driver, 5).until(expected_conditions.invisibility_of_element_located((By.CSS_SELECTOR, \\"#blah\\")))"`;
 
-exports[`command code emitter should emit \`waitForElementNotVisible\` command 1`] = `"WebDriverWait(self.driver, 5000).until(expected_conditions.invisibility_of_element_located((By.CSS_SELECTOR, \\"#blah\\")))"`;
+exports[`command code emitter should emit \`waitForElementNotVisible\` command 1`] = `"WebDriverWait(self.driver, 5).until(expected_conditions.invisibility_of_element_located((By.CSS_SELECTOR, \\"#blah\\")))"`;
 
-exports[`command code emitter should emit \`waitForElementPresent\` command 1`] = `"WebDriverWait(self.driver, 5000).until(expected_conditions.presence_of_element_located((By.CSS_SELECTOR, \\"#blah\\")))"`;
+exports[`command code emitter should emit \`waitForElementPresent\` command 1`] = `"WebDriverWait(self.driver, 5).until(expected_conditions.presence_of_element_located((By.CSS_SELECTOR, \\"#blah\\")))"`;
 
-exports[`command code emitter should emit \`waitForElementVisible\` command 1`] = `"WebDriverWait(self.driver, 5000).until(expected_conditions.visibility_of_element_located((By.CSS_SELECTOR, \\"#blah\\")))"`;
+exports[`command code emitter should emit \`waitForElementVisible\` command 1`] = `"WebDriverWait(self.driver, 5).until(expected_conditions.visibility_of_element_located((By.CSS_SELECTOR, \\"#blah\\")))"`;
+
+exports[`command code emitter should emit \`waitForText\` command 1`] = `"WebDriverWait(self.driver, 30).until(expected_conditions.text_to_be_present_in_element((By.CSS_SELECTOR, \\"#blah\\"), \\"text\\"))"`;
 
 exports[`command code emitter should emit \`while\` command 1`] = `
 Object {

package/__test__/src/__snapshots__/index.spec.js.snap

@@ -127,7 +127,7 @@ from selenium.webdriver.support.wait import WebDriverWait
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
 
-class TestLogin():
+class TestReusedmethods():
   def setup_method(self, method):
     self.driver = webdriver.Chrome()
     self.vars = {}
@@ -140,7 +140,11 @@ class TestLogin():
     self.driver.find_element(By.LINK_TEXT, \\"Form Authentication\\").click()
     self.driver.find_element(By.ID, \\"username\\").send_keys(self.vars[\\"username\\"])
     self.driver.find_element(By.ID, \\"password\\").send_keys(self.vars[\\"password\\"])
-    self.driver.find_element(By.CSS_SELECTOR, \\".fa\\").click()
+    if self.driver.execute_script(\\"return (true)\\"):
+      self.driver.find_element(By.CSS_SELECTOR, \\".fa\\").click()
+  
+  def tinymethod(self):
+    self.vars[\\"value\\"] = \\"field\\"
   
   def test_invalidcredentials(self):
     self.vars[\\"username\\"] = \\"blah\\"
@@ -152,6 +156,12 @@ class TestLogin():
     self.vars[\\"password\\"] = \\"SuperSecretPassword!\\"
     self.login()
   
+  def test_twomethods(self):
+    self.vars[\\"username\\"] = \\"blah\\"
+    self.vars[\\"password\\"] = \\"blah\\"
+    self.login()
+    self.tinymethod()
+  
 "
 `;
 
@@ -305,7 +315,8 @@ class TestValidcredentials():
     self.driver.find_element(By.LINK_TEXT, \\"Form Authentication\\").click()
     self.driver.find_element(By.ID, \\"username\\").send_keys(self.vars[\\"username\\"])
     self.driver.find_element(By.ID, \\"password\\").send_keys(self.vars[\\"password\\"])
-    self.driver.find_element(By.CSS_SELECTOR, \\".fa\\").click()
+    if self.driver.execute_script(\\"return (true)\\"):
+      self.driver.find_element(By.CSS_SELECTOR, \\".fa\\").click()
   
   def test_validcredentials(self):
     self.vars[\\"username\\"] = \\"tomsmith\\"

package/__test__/src/command.spec.js

@@ -21,7 +21,7 @@ import {
   ControlFlowCommandNames,
 } from '../../../selenium-ide/src/neo/models/Command'
 import { opts } from '../../src/index'
-import { codeExport as exporter } from '@seleniumhq/side-utils'
+import { codeExport as exporter } from '@seleniumhq/side-code-export'
 
 const commandPrefixPadding = opts.commandPrefixPadding
 
@@ -272,7 +272,7 @@ describe('command code emitter', () => {
   it('should emit `echo` command with variables', () => {
     const command = {
       command: 'echo',
-      target: '${blah}',
+      target: 'blah = ${blah}',
       value: '',
     }
     return expect(prettify(command)).resolves.toMatchSnapshot()
@@ -839,6 +839,14 @@ describe('command code emitter', () => {
     }
     return expect(prettify(command)).resolves.toMatchSnapshot()
   })
+  it('should emit `waitForText` command', () => {
+    const command = {
+      command: 'waitForText',
+      target: 'css=#blah',
+      value: 'text',
+    }
+    return expect(prettify(command)).resolves.toMatchSnapshot()
+  })
   it('should emit `answer on visible prompt` command', () => {
     const command = {
       command: 'webdriverAnswerOnVisiblePrompt',

package/__test__/src/index.spec.js

@@ -17,8 +17,14 @@
 
 import fs from 'fs'
 import path from 'path'
-import { emitTest, emitSuite, _emitMethod, _findTestByName } from '../../src'
-import { project as projectProcessor } from '@seleniumhq/side-utils'
+import codeExport, {
+  emitTest,
+  emitSuite,
+  _emitMethod,
+  _findTestByName,
+} from '../../src'
+import Command from '../../src/command'
+import { project as projectProcessor } from '@seleniumhq/side-code-export'
 
 function readFile(filename) {
   return JSON.parse(
@@ -28,7 +34,7 @@ function readFile(filename) {
         '..',
         '..',
         '..',
-        'side-utils',
+        'side-code-export',
         '__test__',
         'test-files',
         filename
@@ -132,6 +138,9 @@ describe('Code Export Python pytest', () => {
     expect(results.body).toBeDefined()
     expect(results.body).toMatchSnapshot()
   })
+  it('should export the command emitter', () => {
+    expect(Command.emit).toStrictEqual(codeExport.emit.command)
+  })
 })
 
 function normalizeProject(project) {

package/__test__/src/selection.spec.js

@@ -35,6 +35,13 @@ describe('selection location code emitter', () => {
       `By.XPATH, "//option[. = '${selector}']"`
     )
   })
+  it('should emit label locator with variable', () => {
+    const type = 'label'
+    const selector = 'self.vars["label"]'
+    return expect(emit(`${type}=${selector}`)).resolves.toEqual(
+      `By.XPATH, "//option[. = '{}']".format(${selector})`
+    )
+  })
   it('should emit id locator', () => {
     const type = 'id'
     const selector = 'someId'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/code-export-python-pytest",
-  "version": "3.16.0",
+  "version": "3.17.4",
   "description": "Export Selenium IDE project contents to Python pytest",
   "repository": "https://github.com/SeleniumHQ/selenium-ide",
   "keywords": [
@@ -21,7 +21,7 @@
     "@babel/preset-env": "^7.4.5"
   },
   "dependencies": {
-    "@seleniumhq/side-utils": "^3.16.0"
+    "@seleniumhq/side-code-export": "^4.0.0-alpha.0"
   },
-  "gitHead": "70be270a6733b9cd14a9a86f11cbffaf7892c585"
+  "gitHead": "351d5762ed774d624831bf9a7a02ae4fb8e70ea9"
 }

package/src/command.js

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import { codeExport as exporter } from '@seleniumhq/side-utils'
+import { codeExport as exporter } from '@seleniumhq/side-code-export'
 import location from './location'
 import selection from './selection'
 
@@ -113,6 +113,7 @@ export const emitters = {
   waitForElementNotPresent: emitWaitForElementNotPresent,
   waitForElementNotVisible: emitWaitForElementNotVisible,
   webdriverAnswerOnVisiblePrompt: emitAnswerOnNextPrompt,
+  waitForText: emitWaitForText,
   webdriverChooseCancelOnVisibleConfirmation: emitChooseCancelOnNextConfirmation,
   webdriverChooseCancelOnVisiblePrompt: emitChooseCancelOnNextConfirmation,
   webdriverChooseOkOnVisibleConfirmation: emitChooseOkOnNextConfirmation,
@@ -380,9 +381,21 @@ async function emitDragAndDrop(dragged, dropped) {
   return Promise.resolve({ commands })
 }
 
+function translateToPythonString(str) {
+  const regExp = /self.vars\["\w+"]/
+  const vars = str.match(regExp)
+
+  if (vars && vars.length > 0) {
+    const fmtStr = str.replace(regExp, '{}')
+    return `"${fmtStr}".format(${vars.join(', ')})`
+  }
+
+  return `"${str}"`
+}
+
 async function emitEcho(message) {
-  const _message = message.startsWith('self.vars[') ? message : `"${message}"`
-  return Promise.resolve(`print(str(${_message}))`)
+  const _message = translateToPythonString(message)
+  return Promise.resolve(`print(${_message})`)
 }
 
 async function emitEditContent(locator, content) {
@@ -484,7 +497,8 @@ function emitOpen(target) {
 }
 
 async function emitPause(time) {
-  const commands = [{ level: 0, statement: `time.sleep(${time})` }]
+  const sec = time / 1000
+  const commands = [{ level: 0, statement: `time.sleep(${sec})` }]
   return Promise.resolve({ commands })
 }
 
@@ -854,10 +868,11 @@ async function emitVerifyTitle(title) {
 }
 
 async function emitWaitForElementEditable(locator, timeout) {
+  const sec = timeout / 1000
   const commands = [
     {
       level: 0,
-      statement: `WebDriverWait(self.driver, ${timeout}).until(expected_conditions.element_to_be_clickable((${await location.emit(
+      statement: `WebDriverWait(self.driver, ${sec}).until(expected_conditions.element_to_be_clickable((${await location.emit(
         locator
       )})))`,
     },
@@ -865,15 +880,30 @@ async function emitWaitForElementEditable(locator, timeout) {
   return Promise.resolve({ commands })
 }
 
+async function emitWaitForText(locator, text) {
+  const timeout = 30000
+  const sec = timeout / 1000
+  const commands = [
+    {
+      level: 0,
+      statement: `WebDriverWait(self.driver, ${sec}).until(expected_conditions.text_to_be_present_in_element((${await location.emit(
+        locator
+      )}), "${text}"))`,
+    },
+  ]
+  return Promise.resolve({ commands })
+}
+
 function skip() {
   return Promise.resolve(undefined)
 }
 
 async function emitWaitForElementPresent(locator, timeout) {
+  const sec = timeout / 1000
   const commands = [
     {
       level: 0,
-      statement: `WebDriverWait(self.driver, ${timeout}).until(expected_conditions.presence_of_element_located((${await location.emit(
+      statement: `WebDriverWait(self.driver, ${sec}).until(expected_conditions.presence_of_element_located((${await location.emit(
         locator
       )})))`,
     },
@@ -882,10 +912,11 @@ async function emitWaitForElementPresent(locator, timeout) {
 }
 
 async function emitWaitForElementVisible(locator, timeout) {
+  const sec = timeout / 1000
   const commands = [
     {
       level: 0,
-      statement: `WebDriverWait(self.driver, ${timeout}).until(expected_conditions.visibility_of_element_located((${await location.emit(
+      statement: `WebDriverWait(self.driver, ${sec}).until(expected_conditions.visibility_of_element_located((${await location.emit(
         locator
       )})))`,
     },
@@ -896,10 +927,11 @@ async function emitWaitForElementVisible(locator, timeout) {
 }
 
 async function emitWaitForElementNotEditable(locator, timeout) {
+  const sec = timeout / 1000
   const commands = [
     {
       level: 0,
-      statement: `WebDriverWait(self.driver, ${timeout}).until_not(expected_conditions.element_to_be_clickable((${await location.emit(
+      statement: `WebDriverWait(self.driver, ${sec}).until_not(expected_conditions.element_to_be_clickable((${await location.emit(
         locator
       )})))`,
     },
@@ -910,10 +942,11 @@ async function emitWaitForElementNotEditable(locator, timeout) {
 }
 
 async function emitWaitForElementNotPresent(locator, timeout) {
+  const sec = timeout / 1000
   const commands = [
     {
       level: 0,
-      statement: `WebDriverWait(self.driver, ${timeout}).until(expected_conditions.invisibility_of_element_located((${await location.emit(
+      statement: `WebDriverWait(self.driver, ${sec}).until(expected_conditions.invisibility_of_element_located((${await location.emit(
         locator
       )})))`,
     },
@@ -924,10 +957,11 @@ async function emitWaitForElementNotPresent(locator, timeout) {
 }
 
 async function emitWaitForElementNotVisible(locator, timeout) {
+  const sec = timeout / 1000
   const commands = [
     {
       level: 0,
-      statement: `WebDriverWait(self.driver, ${timeout}).until(expected_conditions.invisibility_of_element_located((${await location.emit(
+      statement: `WebDriverWait(self.driver, ${sec}).until(expected_conditions.invisibility_of_element_located((${await location.emit(
         locator
       )})))`,
     },

package/src/hook.js

@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the specific language governing permissions and limitations
 // under the License.
 
-import { codeExport as exporter } from '@seleniumhq/side-utils'
+import { codeExport as exporter } from '@seleniumhq/side-code-export'
 
 const emitters = {
   afterAll,

package/src/index.js

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import { codeExport as exporter } from '@seleniumhq/side-utils'
+import { codeExport as exporter } from '@seleniumhq/side-code-export'
 import emitter from './command'
 import location from './location'
 import { generateHooks } from './hook'
@@ -62,6 +62,7 @@ export async function emitTest({
   project,
   enableOriginTracing,
   beforeEachOptions,
+  enableDescriptionAsComment,
 }) {
   global.baseUrl = baseUrl
   const testDeclaration = generateTestDeclaration(test.name)
@@ -69,6 +70,7 @@ export async function emitTest({
     ...opts,
     testDeclaration,
     enableOriginTracing,
+    enableDescriptionAsComment,
     project,
   })
   const suiteName = test.name
@@ -94,10 +96,12 @@ export async function emitSuite({
   project,
   enableOriginTracing,
   beforeEachOptions,
+  enableDescriptionAsComment,
 }) {
   global.baseUrl = baseUrl
   const result = await exporter.emit.testsFromSuite(tests, suite, opts, {
     enableOriginTracing,
+    enableDescriptionAsComment,
     generateTestDeclaration,
     project,
   })
@@ -120,6 +124,7 @@ export default {
     test: emitTest,
     suite: emitSuite,
     locator: location.emit,
+    command: emitter.emit,
   },
   register: {
     command: emitter.register,

package/src/location.js

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import { codeExport as exporter } from '@seleniumhq/side-utils'
+import { codeExport as exporter } from '@seleniumhq/side-code-export'
 
 const emitters = {
   id: emitId,

package/src/selection.js

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import { codeExport as exporter } from '@seleniumhq/side-utils'
+import { codeExport as exporter } from '@seleniumhq/side-code-export'
 
 const emitters = {
   id: emitId,
@@ -41,6 +41,9 @@ function emitValue(value) {
 }
 
 function emitLabel(label) {
+  if (label.startsWith('self.vars[')) {
+    return Promise.resolve(`By.XPATH, "//option[. = '{}']".format(${label})`)
+  }
   return Promise.resolve(`By.XPATH, "//option[. = '${label}']"`)
 }