@seleniumhq/code-export-javascript-mocha 3.16.1 → 3.17.4

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

@@ -303,7 +303,7 @@ exports[`command code emitter should emit \`send keys\` command with a variable
 
 exports[`command code emitter should emit \`set speed\` 1`] = `"console.log(\\"\`set speed\` is a no-op in code export, use \`pause\` instead\\")"`;
 
-exports[`command code emitter should emit \`setWindowSize\` 1`] = `"await driver.manage().window().setRect(1440, 1177)"`;
+exports[`command code emitter should emit \`setWindowSize\` 1`] = `"await driver.manage().window().setRect({ width: 1440, height: 1177 })"`;
 
 exports[`command code emitter should emit \`store attribute\` command 1`] = `
 "{
@@ -420,6 +420,8 @@ exports[`command code emitter should emit \`waitForElementPresent\` command 1`]
 
 exports[`command code emitter should emit \`waitForElementVisible\` command 1`] = `"await driver.wait(until.elementIsVisible(await driver.findElement(By.css(\\"#blah\\"))), 5000)"`;
 
+exports[`command code emitter should emit \`waitForText\` command 1`] = `"await driver.wait(until.elementTextIs(await driver.findElement(By.css(\\"#blah\\")), 'text'), 30000)"`;
+
 exports[`command code emitter should emit \`while\` command 1`] = `"while(!!await driver.executeScript(\\"return (true)\\")) {"`;
 
 exports[`command code emitter should emit new window handling, if command opens a new window 1`] = `

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

@@ -18,7 +18,7 @@ describe('login', function() {
   })
   it('valid credentials', async function() {
     await driver.get(\\"http://the-internet.herokuapp.com/login\\")
-    await driver.manage().window().setRect(1440, 1177)
+    await driver.manage().window().setRect({ width: 1440, height: 1177 })
     await driver.findElement(By.id(\\"username\\")).sendKeys(\\"tomsmith\\")
     await driver.findElement(By.id(\\"password\\")).sendKeys(\\"SuperSecretPassword!\\")
     await driver.findElement(By.css(\\"#login button\\")).click()
@@ -26,7 +26,7 @@ describe('login', function() {
   })
   it('invalid credentials', async function() {
     await driver.get(\\"http://the-internet.herokuapp.com/login\\")
-    await driver.manage().window().setRect(1440, 1177)
+    await driver.manage().window().setRect({ width: 1440, height: 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()
@@ -116,7 +116,7 @@ exports[`Code Export JavaScript Mocha should export a suite with a reused test m
 const { Builder, By, Key, until } = require('selenium-webdriver')
 const assert = require('assert')
 
-describe('login', function() {
+describe('Reused methods', function() {
   this.timeout(30000)
   let driver
   let vars
@@ -132,7 +132,12 @@ describe('login', function() {
     await driver.findElement(By.linkText(\\"Form Authentication\\")).click()
     await driver.findElement(By.id(\\"username\\")).sendKeys(vars[\\"username\\"])
     await driver.findElement(By.id(\\"password\\")).sendKeys(vars[\\"password\\"])
-    await driver.findElement(By.css(\\".fa\\")).click()
+    if (!!await driver.executeScript(\\"return (true)\\")) {
+      await driver.findElement(By.css(\\".fa\\")).click()
+    }
+  }
+  async function tinymethod() {
+    vars[\\"value\\"] = \\"field\\"
   }
   it('invalid credentials', async function() {
     vars[\\"username\\"] = \\"blah\\"
@@ -144,6 +149,12 @@ describe('login', function() {
     vars[\\"password\\"] = \\"SuperSecretPassword!\\"
     login()
   })
+  it('two methods', async function() {
+    vars[\\"username\\"] = \\"blah\\"
+    vars[\\"password\\"] = \\"blah\\"
+    login()
+    tinymethod()
+  })
 })
 "
 `;
@@ -254,7 +265,7 @@ describe('login', function() {
   })
   it('login', async function() {
     await driver.get(\\"http://the-internet.herokuapp.com/login\\")
-    await driver.manage().window().setRect(1440, 1177)
+    await driver.manage().window().setRect({ width: 1440, height: 1177 })
     await driver.findElement(By.id(\\"username\\")).sendKeys(\\"tomsmith\\")
     await driver.findElement(By.id(\\"password\\")).sendKeys(\\"SuperSecretPassword!\\")
     await driver.findElement(By.css(\\"#login button\\")).click()
@@ -285,7 +296,9 @@ describe('valid credentials', function() {
     await driver.findElement(By.linkText(\\"Form Authentication\\")).click()
     await driver.findElement(By.id(\\"username\\")).sendKeys(vars[\\"username\\"])
     await driver.findElement(By.id(\\"password\\")).sendKeys(vars[\\"password\\"])
-    await driver.findElement(By.css(\\".fa\\")).click()
+    if (!!await driver.executeScript(\\"return (true)\\")) {
+      await driver.findElement(By.css(\\".fa\\")).click()
+    }
   }
   it('valid credentials', async function() {
     vars[\\"username\\"] = \\"tomsmith\\"
@@ -323,7 +336,7 @@ describe('select window', function() {
   }
   it('select window', async function() {
     await driver.get(\\"http://the-internet.herokuapp.com/\\")
-    await driver.manage().window().setRect(1260, 1027)
+    await driver.manage().window().setRect({ width: 1260, height: 1027 })
     await driver.findElement(By.linkText(\\"Multiple Windows\\")).click()
     vars[\\"windowHandles\\"] = await driver.getAllWindowHandles()
     await driver.findElement(By.linkText(\\"Click Here\\")).click()
@@ -356,7 +369,7 @@ describe('login', function() {
   })
   it('login', async function() {
     await driver.get(\\"http://the-internet.herokuapp.com/login\\")
-    await driver.manage().window().setRect(1440, 1177)
+    await driver.manage().window().setRect({ width: 1440, height: 1177 })
     await driver.findElement(By.id(\\"username\\")).sendKeys(\\"tomsmith\\")
     await driver.findElement(By.id(\\"password\\")).sendKeys(\\"SuperSecretPassword!\\")
     await driver.findElement(By.css(\\"#login button\\")).click()

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
 
@@ -838,6 +838,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 JavaScript Mocha', () => {
     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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/code-export-javascript-mocha",
-  "version": "3.16.1",
+  "version": "3.17.4",
   "description": "Export Selenium IDE project contents to JavaScript Mocha",
   "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": "48286487072620bef87707901478bd58f788931d"
+  "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,
@@ -541,7 +542,7 @@ async function emitRunScript(script) {
 async function emitSetWindowSize(size) {
   const [width, height] = size.split('x')
   return Promise.resolve(
-    `await driver.manage().window().setRect(${width}, ${height})`
+    `await driver.manage().window().setRect({ width: ${width}, height: ${height} })`
   )
 }
 
@@ -974,6 +975,15 @@ async function emitWaitForElementNotEditable(locator, timeout) {
   )
 }
 
+async function emitWaitForText(locator, text) {
+  const timeout = 30000
+  return Promise.resolve(
+    `await driver.wait(until.elementTextIs(await driver.findElement(${await location.emit(
+      locator
+    )}), '${text}'), ${Math.floor(timeout)})`
+  )
+}
+
 export default {
   canEmit,
   emit,

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'
@@ -61,6 +61,7 @@ export async function emitTest({
   project,
   enableOriginTracing,
   beforeEachOptions,
+  enableDescriptionAsComment,
 }) {
   global.baseUrl = baseUrl
   const testDeclaration = generateTestDeclaration(test.name)
@@ -68,6 +69,7 @@ export async function emitTest({
     ...opts,
     testDeclaration,
     enableOriginTracing,
+    enableDescriptionAsComment,
     project,
   })
   const suiteName = test.name
@@ -93,11 +95,13 @@ export async function emitSuite({
   project,
   enableOriginTracing,
   beforeEachOptions,
+  enableDescriptionAsComment,
 }) {
   global.baseUrl = baseUrl
   const result = await exporter.emit.testsFromSuite(tests, suite, opts, {
     enableOriginTracing,
     generateTestDeclaration,
+    enableDescriptionAsComment,
     project,
   })
   const suiteDeclaration = generateSuiteDeclaration(suite.name)
@@ -118,6 +122,7 @@ export default {
   emit: {
     test: emitTest,
     suite: emitSuite,
+    command: emitter.emit,
     locator: location.emit,
   },
   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,