Fix switchTo to accept regex (#1151)

* #1147 Fix switchTo to accept regex

- update empty string check
- add tests for regex switchTo
- update wait for readystate to timeout on navigation timeout instead of default.

* Bump up version to 1.0.7

* Revert "Bump up version to 1.0.7"

This reverts commit 3f0628a.

lib/doActionAwaitingNavigation.js

@@ -112,10 +112,10 @@ const waitForNavigation = (timeout, promises = []) => {
             );
           },
           defaultConfig.retryInterval,
-          defaultConfig.retryTimeout,
+          timeout,
         )
           .then(resolve)
-          .catch(reject);
+          .catch(() => reject('Timedout'));
       })
       .catch(reject);
     const timeoutId = setTimeout(() => reject('Timedout'), timeout);

lib/taiko.js

@@ -422,7 +422,7 @@ module.exports.switchTo = async arg => {
         'The "targetUrl" argument must be of type string or regex. Received type ' + typeof arg,
       );
     }
-    if (arg.trim() == '') {
+    if (typeof arg === 'string' && arg.trim() === '') {
       throw new Error(
         'Cannot switch to tab or window. Hint: The targetUrl is empty. Please use a valid string or regex',
       );

test/unit-tests/switchTo.test.js

@@ -6,8 +6,13 @@ const taiko = rewire('../../lib/taiko');
 chai.use(chaiAsPromised);
 
 describe('switchTo', () => {
+  let argument;
   before(async () => {
     taiko.__set__('validate', () => {});
+    taiko.__set__('targetHandler.getCriTargets', arg => {
+      argument = arg;
+      return { matching: [] };
+    });
   });
 
   it('should throw error if no url specified', async () => {
@@ -25,4 +30,11 @@ describe('switchTo', () => {
       'Cannot switch to tab or window. Hint: The targetUrl is empty. Please use a valid string or regex',
     );
   });
+
+  it('should accept regex and call targetHandler with RegExp', async () => {
+    await expect(taiko.switchTo(/http(s):\/\/www.google.com/)).to.eventually.rejectedWith(
+      'No tab(s) matching /http(s):\\/\\/www.google.com/ found',
+    );
+    await expect(argument).to.deep.equal(new RegExp(/http(s):\/\/www.google.com/));
+  });
 });