fix incorrect selector chain message when with method is used (closes

DevExpress#3874)

src/client-functions/client-function-builder.js

@@ -39,16 +39,20 @@ export default class ClientFunctionBuilder {
         clientFn[functionBuilderSymbol] = this;
 
         clientFn.with = options => {
-            if (typeof options === 'object')
-                options = assign({}, this.options, options);
+            return this._getClientFnWithOverriddenOptions(options);
+        };
+    }
 
-            const builder = new this.constructor(this.fn, options, {
-                instantiation: 'with',
-                execution:     this.callsiteNames.execution
-            });
+    _getClientFnWithOverriddenOptions (options) {
+        if (typeof options === 'object')
+            options = assign({}, this.options, options);
 
-            return builder.getFunction();
-        };
+        const builder = new this.constructor(this.fn, options, {
+            instantiation: 'with',
+            execution:     this.callsiteNames.execution
+        });
+
+        return builder.getFunction();
     }
 
     getBoundTestRun () {

src/client-functions/selectors/selector-builder.js

@@ -184,6 +184,10 @@ export default class SelectorBuilder extends ClientFunctionBuilder {
         addAPI(selectorFn, () => selectorFn, SelectorBuilder, this.options.customDOMProperties, this.options.customMethods);
     }
 
+    _getClientFnWithOverriddenOptions (options) {
+        return super._getClientFnWithOverriddenOptions(Object.assign(options, { apiFn: null }));
+    }
+
     _processResult (result, selectorArgs) {
         const snapshot = super._processResult(result, selectorArgs);
 

test/functional/fixtures/regression/gh-2568/test.js

@@ -188,4 +188,15 @@ describe('[Regression](GH-2568)', function () {
                 `);
             });
     });
+
+    it('with', function () {
+        return runTests('testcafe-fixtures/index.js', 'with', { selectorTimeout: 100, shouldFail: true })
+            .catch(function (errs) {
+                assertSelectorCallstack(errs[0], `
+                    The specified selector does not match any element in the DOM tree.
+                      > | Selector('non-existing-element')
+                        |   .find('ul')
+                `);
+            });
+    });
 });

test/functional/fixtures/regression/gh-2568/testcafe-fixtures/index.js

@@ -138,3 +138,7 @@ test('custom methods', async t => {
 
     await t.click(selector);
 });
+
+test('with', async t => {
+    await t.click(Selector('non-existing-element').with({ timeout: 100 }).find('ul'));
+});