Fix filtering by index (closes DevExpress#1240)

AlexanderMoskovkin · Feb 22, 2017 · 76b3b7e · 76b3b7e
1 parent 687dc18
commit 76b3b7e
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/src/client-functions/selector-builder/add-api.js b/src/client-functions/selector-builder/add-api.js
@@ -11,8 +11,11 @@ const SNAPSHOT_PROPERTIES = NODE_SNAPSHOT_PROPERTIES.concat(ELEMENT_SNAPSHOT_PRO
 
 
 var filterNodes = (new ClientFunctionBuilder((nodes, filter, querySelectorRoot, originNode) => {
-    if (typeof filter === 'number')
-        return filter < 0 ? [nodes[nodes.length + filter]] : [nodes[filter]];
+    if (typeof filter === 'number') {
+        var matchingNode = filter < 0 ? nodes[nodes.length + filter] : nodes[filter];
+
+        return matchingNode ? [matchingNode] : [];
+    }
 
     var result = [];
 

diff --git a/test/functional/fixtures/regression/gh-1240/pages/index.html b/test/functional/fixtures/regression/gh-1240/pages/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>GH-1240</title>
+</head>
+<body>
+<div id="div">
+    <span>Span</span>
+</div>
+</body>
+</html>
diff --git a/test/functional/fixtures/regression/gh-1240/test.js b/test/functional/fixtures/regression/gh-1240/test.js
@@ -0,0 +1,5 @@
+describe('[Regression](GH-1240)', function () {
+    it('Test should not raise an error when try to get a non-existent child', function () {
+        return runTests('testcafe-fixtures/index-test.js', 'Check a non-existent child', { only: ['chrome'] });
+    });
+});
diff --git a/test/functional/fixtures/regression/gh-1240/testcafe-fixtures/index-test.js b/test/functional/fixtures/regression/gh-1240/testcafe-fixtures/index-test.js
@@ -0,0 +1,10 @@
+import { Selector } from 'testcafe';
+
+fixture `gh-1240`
+    .page `file://d:/git/testcafe/test/functional/fixtures/regression/gh-1240/pages/index.html`;
+
+test('Check a non-existent child', async t => {
+    const span = Selector('#div').child(2);
+
+    await t.expect(span.exists).notOk();
+});