Merge pull request #358 from angrykoala/dev

Wendigo 2.0.2

@types/is-class/index.d.ts

@@ -1 +1,4 @@
-declare module 'is-class';
+declare module 'is-class' {
+    function isClass(a: any): boolean;
+    export = isClass;
+}

CHANGELOG.md

@@ -1,3 +1,10 @@
+2.0.2 / 2019-05-21
+==================
+
+* FindByText and FindByTextContaining now support simple quotes (')
+* Proper support for XPath on waitFor and watAndClick
+* Some dependencies updated
+
 2.0.1 / 2019-05-08
 ==================
 

README.md

@@ -385,7 +385,7 @@ await browser.url(); // my-page/home
 **waitAndClick(selector, timeout=500)**  
 Waits for an element to exists and be visible before clicking it. Useful for clicking elements that may have a delay before appearing.
 
-> Only Css Selectors supported.
+> DomElements selectors not supported.
 
 **tap(selector, index?)**  
 Performs a touchscreen tap action on all the elements matching the given selector, if the index parameter is set, only the nth element will be tapped. Returns the number of elements tapped. The interface is compatible with browser.click.
@@ -502,7 +502,7 @@ await browser.waitFor((s) => { // Waits for 2 or more elements to be in the page
 }, 600, ".my-elements");
 ```
 
-> Css selectors supported only.
+> DomElements selectors not supported.
 
 **waitUntilNotVisible(selector, timeout=500)**  
 Waits until the given selector is no longer visible or doesn't exists, with the given timeout in milliseconds.

lib/browser/mixins/browser_queries.ts

@@ -4,7 +4,7 @@ import { ElementHandle } from 'puppeteer';
 import DomElement from '../../models/dom_element';
 import { FatalError, WendigoError } from '../../errors';
 import { WendigoSelector } from '../../types';
-import { isXPathQuery } from '../../utils/utils';
+import { isXPathQuery, cleanStringForXpath } from '../../utils/utils';
 
 export default abstract class BrowserQueries extends BrowserCore {
     public async query(selector: WendigoSelector, optionalSelector?: string): Promise<DomElement | null> {
@@ -57,7 +57,7 @@ export default abstract class BrowserQueries extends BrowserCore {
     public async findByText(text: string | DomElement, optionalText?: string): Promise<Array<DomElement>> {
         this._failIfNotLoaded("findByText");
         const xPathText = optionalText || text as string;
-        const xPath = `//*[text()='${xPathText}']`;
+        const xPath = `//*[text()=${cleanStringForXpath(xPathText)}]`;
 
         if (optionalText) {
             try {
@@ -73,7 +73,7 @@ export default abstract class BrowserQueries extends BrowserCore {
     public async findByTextContaining(text: string | DomElement, optionalText?: string): Promise<Array<DomElement>> {
         this._failIfNotLoaded("findByTextContaining");
         const xPathText = optionalText || text as string;
-        const xPath = `//*[contains(text(),'${xPathText}')]`;
+        const xPath = `//*[contains(text(),${cleanStringForXpath(xPathText)})]`;
         if (optionalText) {
             try {
                 return await this.queryAll(text, xPath);

lib/browser_factory.ts

@@ -1,6 +1,6 @@
-import * as compose from 'compositer';
+import compose from 'compositer';
+import isClass from 'is-class';
 import { Page } from 'puppeteer';
-import { isClass } from './utils/utils';
 
 import Browser from './browser/browser';
 import BrowserAssertion from './browser/browser_assertions';

lib/modules/requests/request_mock.ts

@@ -1,4 +1,4 @@
-import * as  EventEmitter from 'events';
+import EventEmitter from 'events';
 import { URL } from 'url';
 import { Request } from 'puppeteer';
 

lib/utils/utils.ts

@@ -1,6 +1,5 @@
 import * as querystring from 'querystring';
 import { URL } from 'url';
-import * as isClassModule from 'is-class';
 
 export function isNumber(n: any): n is number {
     return !Number.isNaN(Number(n));
@@ -95,6 +94,15 @@ export function arrayfy<T>(raw: T | Array<T>): Array<T> {
     else return [raw];
 }
 
-export function isClass(c: any): boolean { // Wrapper to allow typing on isClass
-    return Boolean(isClassModule(c));
+export function cleanStringForXpath(str: string): string {
+    const parts = str.split('\'');
+    if (parts.length === 1) return `'${parts[0]}'`;
+
+    const formattedParts = parts.map((part: string): string => {
+        if (part === "") {
+            return '"\'"';
+        }
+        return "'" + part + "'";
+    });
+    return "concat(" + formattedParts.join(",") + ")";
 }

main.ts

@@ -1,5 +1,5 @@
 import * as process from 'process';
-import * as puppeteer from 'puppeteer';
+import puppeteer from 'puppeteer';
 import BrowserFactory from './lib/browser_factory';
 import * as Errors from './lib/errors';
 import { WendigoPluginInterface, BrowserSettings, FinalBrowserSettings, WendigoPluginAssertionInterface, PluginModule } from './lib/types';