Merge branch 'master' of github.com:SeleniumHQ/selenium-ide

Author: David Haeffner

packages/selenium-ide/src/content/selenium-api.js

@@ -548,9 +548,24 @@ Selenium.prototype.doStoreEval = function() {
 
 Selenium.prototype.doStoreText = function(locator, varName) {
   throwIfNoVarNameProvided(varName)
-  const element = this.findElementVisible(locator)
+  let text
+  try {
+    // Try to get the text if the element is visible
+    const element = this.findElementVisible(locator)
+    text = bot.dom.getVisibleText(element)
+  } catch (e) {
+    // element is not visible, but it may be due to the fact that it has no text
+    const element = this.browserbot.findElement(locator)
+    if (element.innerHTML === '') {
+      // element is empty then return empty string
+      text = ''
+    } else {
+      // element has content this is indeed invisible
+      throw e
+    }
+  }
   return browser.runtime.sendMessage({
-    storeStr: bot.dom.getVisibleText(element),
+    storeStr: text,
     storeVar: varName,
   })
 }
@@ -594,10 +609,6 @@ Selenium.prototype.doStoreAttribute = function(locator, varName) {
   })
 }
 
-Selenium.prototype.doEcho = function(value) {
-  return browser.runtime.sendMessage({ echoStr: value })
-}
-
 function waitUntil(condition, target, timeout, failureMessage) {
   if (!timeout) {
     throw new Error('Timeout not specified.')

packages/selenium-ide/src/neo/IO/SideeX/ext-command.js

@@ -19,6 +19,7 @@ import browser from 'webextension-polyfill'
 import Debugger, { convertLocator } from '../debugger'
 import PlaybackState from '../../stores/view/PlaybackState'
 import variables from '../../stores/view/Variables'
+import { Logger, Channels } from '../../stores/view/Logs'
 import FrameNotFoundError from '../../../errors/frame-not-found'
 import { absolutifyUrl } from '../playback/utils'
 import { userAgent as parsedUA } from '../../../common/utils'
@@ -40,6 +41,7 @@ export default class ExtCommand {
     // TODO: flexible wait
     this.waitInterval = 500
     this.waitTimes = 60
+    this.logger = new Logger(Channels.PLAYBACK)
 
     this.attached = false
 
@@ -377,6 +379,10 @@ export default class ExtCommand {
     await PlaybackState.break()
   }
 
+  async doEcho(string) {
+    this.logger.log(`echo: ${string}`)
+  }
+
   doOpen(targetUrl) {
     const url = absolutifyUrl(targetUrl, this.baseUrl)
     return browser.tabs
@@ -835,6 +841,7 @@ export default class ExtCommand {
   isExtCommand(command) {
     switch (command) {
       case 'debugger':
+      case 'echo':
       case 'pause':
       case 'open':
       case 'selectFrame':

packages/selenium-ide/src/neo/IO/SideeX/formatCommand.js

@@ -31,7 +31,7 @@ export function xlateArgument(value) {
     const regexp = /\$\{(.*?)\}/g
     let lastIndex = 0
     while ((r2 = regexp.exec(value))) {
-      if (variables.get(r2[1])) {
+      if (variables.has(r2[1])) {
         if (r2.index - lastIndex > 0) {
           parts.push(string(value.substring(lastIndex, r2.index)))
         }
@@ -50,7 +50,7 @@ export function xlateArgument(value) {
     if (lastIndex < value.length) {
       parts.push(string(value.substring(lastIndex, value.length)))
     }
-    return parts.join('')
+    return parts.map(String).join('')
   } else {
     return string(value)
   }
@@ -113,9 +113,6 @@ function handleFormatCommand(message, _sender, sendResponse) {
   } else if (message.storeVar) {
     variables.set(message.storeVar, message.storeStr)
     return sendResponse(true)
-  } else if (message.echoStr) {
-    logger.log('echo: ' + message.echoStr)
-    return sendResponse(true)
   } else if (
     message.log &&
     output.logs[output.logs.length - 1].message.indexOf(message.log.message) ===

packages/selenium-ide/src/neo/IO/playback/webdriver.js

@@ -409,7 +409,7 @@ export default class WebDriverExecutor {
   // other commands
 
   async doEcho(string) {
-    this.logger.log(string)
+    this.logger.log(`echo: ${string}`)
     return Promise.resolve()
   }
 

packages/selenium-ide/src/neo/__test__/IO/playback/formatCommand.spec.js

@@ -15,13 +15,32 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import { interpolateScript } from '../../../IO/SideeX/formatCommand'
+import {
+  interpolateScript,
+  xlateArgument,
+} from '../../../IO/SideeX/formatCommand'
 import variables from '../../../stores/view/Variables'
 
-describe('interpolate script', () => {
-  afterEach(() => {
-    variables.clear()
+afterEach(() => {
+  variables.clear()
+})
+
+describe('interpolate string', () => {
+  it('should interpolate false values', () => {
+    variables.set('a', undefined)
+    expect(xlateArgument('${a}')).toBe('undefined')
+    variables.set('a', null)
+    expect(xlateArgument('${a}')).toBe('null')
+    variables.set('a', false)
+    expect(xlateArgument('${a}')).toBe('false')
+    variables.set('a', 0)
+    expect(xlateArgument('${a}')).toBe('0')
+    variables.set('a', '')
+    expect(xlateArgument('${a}')).toBe('')
   })
+})
+
+describe('interpolate script', () => {
   it('should not interpolate a script without variables', () => {
     const script = 'return 1'
     expect(interpolateScript(script).script).toEqual(script)

packages/selenium-side-runner/src/index.js

@@ -303,6 +303,7 @@ function runProject(project) {
 function runJest(project) {
   return new Promise((resolve, reject) => {
     const args = [
+      '--no-watchman',
       '--testMatch',
       `{**/*${program.filter}*/*.test.js,**/*${program.filter}*.test.js}`,
     ]