fix: validate timeout type in wait element actions

eGavr · eGavr · commit 007a836918ea · 2017-12-05T14:56:45.000+03:00
diff --git a/lib/tests-api/actions-builder.js b/lib/tests-api/actions-builder.js
@@ -45,18 +45,22 @@ module.exports = class ActionsBuilder {
     }
 
     _waitElementAction(method, selector, options) {
+        options = _.defaults(options, {timeout: 1000});
+
         if (typeof selector !== 'string') {
             throw new TypeError(method.name + ' accepts only CSS selectors');
         }
 
-        const timeout = (typeof options.timeout !== 'undefined' ? options.timeout : 1000);
+        if (typeof options.timeout !== 'number') {
+            throw new TypeError(method.name + ' accepts only numeric timeout');
+        }
 
         this._pushAction(method, (browser) => {
-            return browser.waitForElementByCssSelector(selector, options.asserter, timeout)
+            return browser.waitForElementByCssSelector(selector, options.asserter, options.timeout)
                 .catch(() => {
                     //assuming its timeout error, no way to distinguish
                     return Promise.reject(new StateError(
-                        'Element ' + selector + ' ' + options.error + ' in ' + timeout + 'ms'));
+                        'Element ' + selector + ' ' + options.error + ' in ' + options.timeout + 'ms'));
                 });
         });
 
diff --git a/test/unit/tests-api/actions-builder.js b/test/unit/tests-api/actions-builder.js
@@ -162,4 +162,24 @@ describe('tests-api/actions-builder', () => {
             });
         });
     });
+
+    describe('waitForElementToShow', () => {
+        beforeEach(() => sandbox.stub(browser, 'waitForElementByCssSelector').resolves());
+
+        const waitForElementToShowAction = (selector, timeout) => mkAction('waitForElementToShow', browser)(selector, timeout);
+
+        it('should throw if passed timeout is not a number', () => {
+            assert.throws(() => waitForElementToShowAction('.some-selector', 'string'),
+                /waitForElementToShow accepts only numeric timeout/);
+        });
+
+        it('should not throw if timeout is not passed', () => {
+            assert.doesNotThrow(() => waitForElementToShowAction('.some-selector'));
+        });
+
+        it('should use passed numeric timeout', () => {
+            return waitForElementToShowAction('.some-selector', 100500)
+                .then(() => assert.calledOnceWith(browser.waitForElementByCssSelector, sinon.match.any, sinon.match.any, 100500));
+        });
+    });
 });
