Skip to content

Commit

Permalink
fix: complicated locator (#4170)
Browse files Browse the repository at this point in the history
  • Loading branch information
@kobenguyent
kobenguyent authored Feb 3, 2024
1 parent 1c2d957 commit 91c1840
Show file tree
Hide file tree
Showing 2 changed files with 139 additions and 17 deletions.
2 changes: 1 addition & 1 deletion lib/locator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ class Locator {
*/
toXPath(pseudoSelector = '') {
const locator = `${this.value}${pseudoSelector}`;
const limitation = [':nth-of-type', ':first-of-type', ':last-of-type', ':nth-last-child', ':nth-last-of-type', ':checked', ':disabled', ':enabled', ':required', ':lang'];
const limitation = [':nth-of-type', ':first-of-type', ':last-of-type', ':nth-last-child', ':nth-last-of-type', ':checked', ':disabled', ':enabled', ':required', ':lang', ':nth-child'];

if (limitation.some(item => locator.includes(item))) {
cssToXPath = require('css-to-xpath');
Expand Down
154 changes: 138 additions & 16 deletions test/unit/locator_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,142 @@ const xml = `<body>
</div>
<input type="hidden" name="return_url" value="" id="return_url" />
<div class="ps-submenu-root">
<ul class="ps-submenu-root">
<li class="ps-menu-button">Adhemar da Silva</li>
<li class="ps-menu-button">HelloWorld</li>
<li class="ps-menu-button">Hallo</li>
</ul>
<ul class="ps-submenu-root">
<li class="ps-menu-button">Adhemar da Silva</li>
<li class="ps-menu-button">HelloWorld</li>
<li class="ps-menu-button">Authoring</li>
</ul>
</div>
<ul class="css-ewdv3l">
<li class="ps-menuitem-root css-dq4uaz">
<a
aria-current="page"
class="ps-menu-button active"
data-testid="ps-menu-button-test-id"
tabindex="0"
title="aaa"
href="/"
><span class="ps-menu-icon css-2wa2k3"
><i aria-hidden="true" class="icon home lg outline"></i></span
><span class="ps-menu-label css-12w9als">aaa</span></a
>
</li>
<li class="ps-menuitem-root ps-submenu-root css-x7nyah">
<a
class="ps-menu-button"
data-testid="ps-menu-button-test-id"
title="Dashboard"
tabindex="0"
><span class="ps-menu-icon css-2wa2k3"
><i
aria-hidden="true"
class="icon tachometer alternate"
></i></span
><span class="ps-menu-label css-12w9als">aaa</span
><span class="ps-submenu-expand-icon css-1cuxlhl"
><span class="css-honxw6"></span></span
></a>
</li>
<li class="ps-menuitem-root ps-submenu-root css-x7nyah">
<a
class="ps-menu-button"
data-testid="ps-menu-button-test-id"
title="aaa"
tabindex="0"
><span class="ps-menu-icon css-2wa2k3"
><i aria-hidden="true" class="icon books"></i></span
><span class="ps-menu-label css-12w9als">Authoring</span
><span class="ps-submenu-expand-icon css-1cuxlhl"
><span class="css-honxw6"></span></span
></a>
</li>
<li class="ps-menuitem-root ps-submenu-root css-x7nyah">
<a
class="ps-menu-button"
data-testid="ps-menu-button-test-id"
title="aaa"
tabindex="0"
><span class="ps-menu-icon css-2wa2k3"
><i aria-hidden="true" class="icon ballot check"></i></span
><span class="ps-menu-label css-12w9als">aaa</span
><span class="ps-submenu-expand-icon css-1cuxlhl"
><span class="css-honxw6"></span></span
></a>
</li>
<li class="ps-menuitem-root ps-submenu-root css-x7nyah">
<a
class="ps-menu-button"
data-testid="ps-menu-button-test-id"
title="aaa"
tabindex="0"
><span class="ps-menu-icon css-2wa2k3"
><i aria-hidden="true" class="icon book reader"></i></span
><span class="ps-menu-label css-12w9als">aaa</span
><span class="ps-submenu-expand-icon css-1cuxlhl"
><span class="css-honxw6"></span></span
></a>
</li>
<li class="ps-menuitem-root ps-submenu-root css-x7nyah">
<a
class="ps-menu-button"
data-testid="ps-menu-button-test-id"
title="aaa"
tabindex="0"
><span class="ps-menu-icon css-2wa2k3"
><i aria-hidden="true" class="icon school"></i></span
><span class="ps-menu-label css-12w9als">aaa</span
><span class="ps-submenu-expand-icon css-1cuxlhl"
><span class="css-honxw6"></span></span
></a>
</li>
<li class="ps-menuitem-root ps-submenu-root css-x7nyah">
<a
class="ps-menu-button"
data-testid="ps-menu-button-test-id"
title="aaa"
tabindex="0"
><span class="ps-menu-icon css-2wa2k3"
><i aria-hidden="true" class="icon user"></i></span
><span class="ps-menu-label css-12w9als">aaa</span
><span class="ps-submenu-expand-icon css-1cuxlhl"
><span class="css-honxw6"></span></span
></a>
</li>
<li class="ps-menuitem-root ps-submenu-root css-x7nyah">
<a
class="ps-menu-button"
data-testid="ps-menu-button-test-id"
title="aaa"
tabindex="0"
><span class="ps-menu-icon css-2wa2k3"
><i aria-hidden="true" class="icon cog"></i></span
><span class="ps-menu-label css-12w9als">aaa</span
><span class="ps-submenu-expand-icon css-1cuxlhl"
><span class="css-honxw6"></span></span
></a>
</li>
<li class="ps-menuitem-root ps-submenu-root css-x7nyah">
<a
class="ps-menu-button"
data-testid="ps-menu-button-test-id"
title="aaa"
tabindex="0"
><span class="ps-menu-icon css-2wa2k3"
><i aria-hidden="true" class="icon tablet alternate"></i></span
><span class="ps-menu-label css-12w9als">aaa</span
><span class="ps-submenu-expand-icon css-1cuxlhl"
><span class="css-honxw6"></span></span
></a>
</li>
<li class="ps-menuitem-root ps-submenu-root css-x7nyah">
<a
class="ps-menu-button"
data-testid="ps-menu-button-test-id"
title="aaa"
tabindex="0"
><span class="ps-menu-icon css-2wa2k3"
><i aria-hidden="true" class="icon tools"></i></span
><span class="ps-menu-label css-12w9als">aaa</span
><span class="ps-submenu-expand-icon css-1cuxlhl"
><span class="css-honxw6"></span></span
></a>
</li>
</ul>
</body>`;

describe('Locator', () => {
Expand Down Expand Up @@ -294,13 +418,11 @@ describe('Locator', () => {
});

it('should be able to locate complicated locator', () => {
const l = Locator.build('.ps-menu-button')
.withText('Authoring')
.inside('.ps-submenu-root:nth-child(2)');
const l = Locator.build('.ps-menu-button').withText('Authoring').inside('.ps-submenu-root:nth-child(3)');

const nodes = xpath.select(l.toXPath(), doc);
expect(nodes).to.have.length(1, l.toXPath());
expect(nodes[0].firstChild.data).to.eql('Authoring', l.toXPath());
expect(nodes[0].firstChild.nextSibling.firstChild.data).to.eql('Authoring', l.toXPath());
});

it('should find element with last of type with text', () => {
Expand Down

0 comments on commit 91c1840

Please sign in to comment.