@seleniumhq/code-export-javascript-mocha 3.15.0 → 3.17.2

package/README.md

@@ -0,0 +1,3 @@
+# code-export-javascript-mocha
+
+JavaScript Mocha code export for Selenium IDE.

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.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.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.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.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.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.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

@@ -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,7 +17,13 @@
 
 import fs from 'fs'
 import path from 'path'
-import { emitTest, emitSuite, _emitMethod, _findTestByName } from '../../src'
+import codeExport, {
+  emitTest,
+  emitSuite,
+  _emitMethod,
+  _findTestByName,
+} from '../../src'
+import Command from '../../src/command'
 import { project as projectProcessor } from '@seleniumhq/side-utils'
 
 function readFile(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/dist/command.js

@@ -123,6 +123,7 @@ const emitters = {
   waitForElementNotPresent: emitWaitForElementNotPresent,
   waitForElementNotVisible: emitWaitForElementNotVisible,
   webdriverAnswerOnVisiblePrompt: emitAnswerOnNextPrompt,
+  waitForText: emitWaitForText,
   webdriverChooseCancelOnVisibleConfirmation: emitChooseCancelOnNextConfirmation,
   webdriverChooseCancelOnVisiblePrompt: emitChooseCancelOnNextConfirmation,
   webdriverChooseOkOnVisibleConfirmation: emitChooseOkOnNextConfirmation,
@@ -552,7 +553,7 @@ async function emitRunScript(script) {
 
 async function emitSetWindowSize(size) {
   const [width, height] = size.split('x');
-  return Promise.resolve(`await driver.setRect(${width}, ${height})`);
+  return Promise.resolve(`await driver.manage().window().setRect({ width: ${width}, height: ${height} })`);
 }
 
 async function emitSelect(selectElement, option) {
@@ -942,6 +943,11 @@ async function emitWaitForElementNotEditable(locator, timeout) {
   return Promise.resolve(`await driver.wait(until.elementIsDisabled(await driver.findElement(${await _location.default.emit(locator)})), ${Math.floor(timeout)})`);
 }
 
+async function emitWaitForText(locator, text) {
+  const timeout = 30000;
+  return Promise.resolve(`await driver.wait(until.elementTextIs(await driver.findElement(${await _location.default.emit(locator)}), '${text}'), ${Math.floor(timeout)})`);
+}
+
 var _default = {
   canEmit,
   emit,

package/dist/index.js

@@ -60,13 +60,15 @@ async function emitTest({
   tests,
   project,
   enableOriginTracing,
-  beforeEachOptions
+  beforeEachOptions,
+  enableDescriptionAsComment
 }) {
   global.baseUrl = baseUrl;
   const testDeclaration = generateTestDeclaration(test.name);
   const result = await _sideUtils.codeExport.emit.test(test, tests, _objectSpread2({}, opts, {
     testDeclaration,
     enableOriginTracing,
+    enableDescriptionAsComment,
     project
   }));
   const suiteName = test.name;
@@ -92,12 +94,14 @@ async function emitSuite({
   tests,
   project,
   enableOriginTracing,
-  beforeEachOptions
+  beforeEachOptions,
+  enableDescriptionAsComment
 }) {
   global.baseUrl = baseUrl;
   const result = await _sideUtils.codeExport.emit.testsFromSuite(tests, suite, opts, {
     enableOriginTracing,
     generateTestDeclaration,
+    enableDescriptionAsComment,
     project
   });
   const suiteDeclaration = generateSuiteDeclaration(suite.name);
@@ -119,6 +123,7 @@ var _default = {
   emit: {
     test: emitTest,
     suite: emitSuite,
+    command: _command.default.emit,
     locator: _location.default.emit
   },
   register: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/code-export-javascript-mocha",
-  "version": "3.15.0",
+  "version": "3.17.2",
   "description": "Export Selenium IDE project contents to JavaScript Mocha",
   "repository": "https://github.com/SeleniumHQ/selenium-ide",
   "keywords": [
@@ -21,6 +21,6 @@
     "@babel/preset-env": "^7.4.5"
   },
   "dependencies": {
-    "@seleniumhq/side-utils": "^3.15.0"
+    "@seleniumhq/side-utils": "^3.17.2"
   }
 }

package/src/command.js

@@ -113,6 +113,7 @@ export const emitters = {
   waitForElementNotPresent: emitWaitForElementNotPresent,
   waitForElementNotVisible: emitWaitForElementNotVisible,
   webdriverAnswerOnVisiblePrompt: emitAnswerOnNextPrompt,
+  waitForText: emitWaitForText,
   webdriverChooseCancelOnVisibleConfirmation: emitChooseCancelOnNextConfirmation,
   webdriverChooseCancelOnVisiblePrompt: emitChooseCancelOnNextConfirmation,
   webdriverChooseOkOnVisibleConfirmation: emitChooseOkOnNextConfirmation,
@@ -540,7 +541,9 @@ async function emitRunScript(script) {
 
 async function emitSetWindowSize(size) {
   const [width, height] = size.split('x')
-  return Promise.resolve(`await driver.setRect(${width}, ${height})`)
+  return Promise.resolve(
+    `await driver.manage().window().setRect({ width: ${width}, height: ${height} })`
+  )
 }
 
 async function emitSelect(selectElement, option) {
@@ -972,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/index.js

@@ -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/dist/hooks/afterAll.js

@@ -1,48 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-// Licensed to the Software Freedom Conservancy (SFC) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The SFC licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-let afterAll = `
-    @AfterAll
-    public void finalTearDown() {
-`;
-
-let hooks = [];
-
-function register(statement) {
-  hooks.push(statement);
-}
-
-function clear() {
-  hooks = [];
-}
-
-function emit({ isOptional } = { isOptional: false }) {
-  if (isOptional && !hooks.length) return '';
-  return afterAll + hooks.join('\r\n') + `    }
-`;
-}
-
-exports.default = {
-  register,
-  clear,
-  emit
-};

package/dist/hooks/afterEach.js

@@ -1,49 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-// Licensed to the Software Freedom Conservancy (SFC) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The SFC licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-let afterEach = `
-    @After
-    public void tearDown() {
-        driver.quit();
-`;
-
-let hooks = [];
-
-function register(statement) {
-  hooks.push(statement);
-}
-
-function clear() {
-  hooks = [];
-}
-
-function emit({ isOptional } = { isOptional: false }) {
-  if (isOptional && !hooks.length) return '';
-  return afterEach + hooks.join('\r\n') + `    }
-`;
-}
-
-exports.default = {
-  register,
-  clear,
-  emit
-};

package/dist/hooks/beforeAll.js

@@ -1,48 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-// Licensed to the Software Freedom Conservancy (SFC) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The SFC licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-let beforeAll = `
-    @BeforeAll
-    public void initialSetUp() {
-`;
-
-let hooks = [];
-
-function register(statement) {
-  hooks.push(statement);
-}
-
-function clear() {
-  hooks = [];
-}
-
-function emit({ isOptional } = { isOptional: false }) {
-  if (isOptional && !hooks.length) return '';
-  return beforeAll + hooks.join('\r\n') + `    }
-`;
-}
-
-exports.default = {
-  register,
-  clear,
-  emit
-};

package/dist/hooks/beforeEach.js

@@ -1,50 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-// Licensed to the Software Freedom Conservancy (SFC) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The SFC licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-let beforeEach = `
-    @Before
-    public void setUp() {
-        driver = new FirefoxDriver();
-        js = (JavascriptExecutor) driver;
-`;
-
-let hooks = [];
-
-function register(statement) {
-  hooks.push(statement);
-}
-
-function clear() {
-  hooks = [];
-}
-
-function emit({ isOptional } = { isOptional: false }) {
-  if (isOptional && !hooks.length) return '';
-  return beforeEach + hooks.join('\r\n') + `    }
-`;
-}
-
-exports.default = {
-  register,
-  clear,
-  emit
-};

package/dist/hooks/declareDependencies.js

@@ -1,66 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-// Licensed to the Software Freedom Conservancy (SFC) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The SFC licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-let dependencies = `
-import org.junit.Test;
-import org.junit.Before;
-import org.junit.After;
-import static org.junit.Assert.*;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.core.IsNot.not;
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.firefox.FirefoxDriver;
-import org.openqa.selenium.Dimension;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.interactions.Actions;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-import org.openqa.selenium.support.ui.WebDriverWait;
-import org.openqa.selenium.JavascriptExecutor;
-import org.openqa.selenium.Alert;
-import org.openqa.selenium.Keys;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ArrayList;
-
-`;
-
-let hooks = [];
-
-function register(statement) {
-  hooks.push(statement);
-}
-
-function clear() {
-  hooks = [];
-}
-
-function emit({ isOptional } = { isOptional: false }) {
-  if (isOptional && !hooks.length) return '';
-  return dependencies + hooks.join('\r\n');
-}
-
-exports.default = {
-  register,
-  clear,
-  emit
-};

package/dist/hooks/declareMethods.js

@@ -1,53 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-// Licensed to the Software Freedom Conservancy (SFC) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The SFC licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-let hooks = [];
-
-function register(name, commands) {
-  let result = '';
-  result += `
-    public void ${name}() {
-    `;
-  if (commands) {
-    commands.forEach(command => {
-      result += `\t${command}
-    `;
-    });
-  }
-  result += `}`;
-  if (!hooks.includes(result)) hooks.push(result);
-}
-
-function clear() {
-  hooks = [];
-}
-
-function emit({ isOptional } = { isOptional: false }) {
-  if (isOptional && !hooks.length) return '';
-  return hooks.length ? hooks.join('\n\r') : '';
-}
-
-exports.default = {
-  register,
-  clear,
-  emit
-};

package/dist/hooks/declareVariables.js

@@ -1,48 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-// Licensed to the Software Freedom Conservancy (SFC) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The SFC licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-let variables = `
-    private WebDriver driver;
-    private HashMap<String, Object> vars = new HashMap<String, Object>();
-    JavascriptExecutor js;
-`;
-
-let hooks = [];
-
-function register(statement) {
-  hooks.push(statement);
-}
-
-function clear() {
-  hooks = [];
-}
-
-function emit({ isOptional } = { isOptional: false }) {
-  if (isOptional && !hooks.length) return '';
-  return variables + hooks.join('\r\n');
-}
-
-exports.default = {
-  register,
-  clear,
-  emit
-};