Skip to content

feat: roll beta driver, remove layout selectors #926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 13, 2022
Merged

feat: roll beta driver, remove layout selectors #926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7aaf182
feat: roll beta driver, remove layout selectors
yury-s May 12, 2022
f61d2ca
feat: support cyclic references
yury-s May 13, 2022
c8afca1
Update tests
yury-s May 13, 2022
966eac0
One more test
yury-s May 13, 2022
68a48a0
Merge branch 'ciclic-refs' into roll-driver-05-12-22
yury-s May 13, 2022
d231788
Update TestWheel
yury-s May 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 0 additions & 95 deletions playwright/src/main/java/com/microsoft/playwright/Frame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,22 +1218,6 @@ public IsVisibleOptions setTimeout(double timeout) {
}
}
class LocatorOptions {
/**
* Matches elements that are above any of the elements matching the inner locator, at any horizontal position. Inner
* locator is queried against the same root as the outer one. More details in <a
* href="https://playwright.dev/java/docs/selectors#selecting-elements-based-on-layout">layout selectors</a> guide.
*
* <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
*/
public Locator above;
/**
* Matches elements that are below any of the elements matching the inner locator, at any horizontal position. Inner
* locator is queried against the same root as the outer one. More details in <a
* href="https://playwright.dev/java/docs/selectors#selecting-elements-based-on-layout">layout selectors</a> guide.
*
* <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
*/
public Locator below;
/**
* Matches elements containing an element that matches an inner locator. Inner locator is queried against the outer one.
* For example, {@code article} that has {@code text=Playwright} matches {@code <article><div>Playwright</div></article>}.
Expand All @@ -1247,53 +1231,7 @@ class LocatorOptions {
* {@code <article><div>Playwright</div></article>}.
*/
public Object hasText;
/**
* Matches elements that are to the left of any element matching the inner locator, at any vertical position. Inner locator
* is queried against the same root as the outer one. More details in <a
* href="https://playwright.dev/java/docs/selectors#selecting-elements-based-on-layout">layout selectors</a> guide.
*
* <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
*/
public Locator leftOf;
/**
* Matches elements that are near (<= 50 css pixels) any of the elements matching the inner locator. Inner locator is
* queried against the same root as the outer one. More details in <a
* href="https://playwright.dev/java/docs/selectors#selecting-elements-based-on-layout">layout selectors</a> guide.
*
* <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
*/
public Locator near;
/**
* Matches elements that are to the right of any element matching the inner locator, at any vertical position. Inner
* locator is queried against the same root as the outer one. More details in <a
* href="https://playwright.dev/java/docs/selectors#selecting-elements-based-on-layout">layout selectors</a> guide.
*
* <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
*/
public Locator rightOf;

/**
* Matches elements that are above any of the elements matching the inner locator, at any horizontal position. Inner
* locator is queried against the same root as the outer one. More details in <a
* href="https://playwright.dev/java/docs/selectors#selecting-elements-based-on-layout">layout selectors</a> guide.
*
* <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
*/
public LocatorOptions setAbove(Locator above) {
this.above = above;
return this;
}
/**
* Matches elements that are below any of the elements matching the inner locator, at any horizontal position. Inner
* locator is queried against the same root as the outer one. More details in <a
* href="https://playwright.dev/java/docs/selectors#selecting-elements-based-on-layout">layout selectors</a> guide.
*
* <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
*/
public LocatorOptions setBelow(Locator below) {
this.below = below;
return this;
}
/**
* Matches elements containing an element that matches an inner locator. Inner locator is queried against the outer one.
* For example, {@code article} that has {@code text=Playwright} matches {@code <article><div>Playwright</div></article>}.
Expand Down Expand Up @@ -1322,39 +1260,6 @@ public LocatorOptions setHasText(Pattern hasText) {
this.hasText = hasText;
return this;
}
/**
* Matches elements that are to the left of any element matching the inner locator, at any vertical position. Inner locator
* is queried against the same root as the outer one. More details in <a
* href="https://playwright.dev/java/docs/selectors#selecting-elements-based-on-layout">layout selectors</a> guide.
*
* <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
*/
public LocatorOptions setLeftOf(Locator leftOf) {
this.leftOf = leftOf;
return this;
}
/**
* Matches elements that are near (<= 50 css pixels) any of the elements matching the inner locator. Inner locator is
* queried against the same root as the outer one. More details in <a
* href="https://playwright.dev/java/docs/selectors#selecting-elements-based-on-layout">layout selectors</a> guide.
*
* <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
*/
public LocatorOptions setNear(Locator near) {
this.near = near;
return this;
}
/**
* Matches elements that are to the right of any element matching the inner locator, at any vertical position. Inner
* locator is queried against the same root as the outer one. More details in <a
* href="https://playwright.dev/java/docs/selectors#selecting-elements-based-on-layout">layout selectors</a> guide.
*
* <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
*/
public LocatorOptions setRightOf(Locator rightOf) {
this.rightOf = rightOf;
return this;
}
}
class PressOptions {
/**
Expand Down
95 changes: 0 additions & 95 deletions playwright/src/main/java/com/microsoft/playwright/FrameLocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,6 @@
*/
public interface FrameLocator {
class LocatorOptions {
/**
* Matches elements that are above any of the elements matching the inner locator, at any horizontal position. Inner
* locator is queried against the same root as the outer one. More details in <a
* href="https://playwright.dev/java/docs/selectors#selecting-elements-based-on-layout">layout selectors</a> guide.
*
* <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
*/
public Locator above;
/**
* Matches elements that are below any of the elements matching the inner locator, at any horizontal position. Inner
* locator is queried against the same root as the outer one. More details in <a
* href="https://playwright.dev/java/docs/selectors#selecting-elements-based-on-layout">layout selectors</a> guide.
*
* <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
*/
public Locator below;
/**
* Matches elements containing an element that matches an inner locator. Inner locator is queried against the outer one.
* For example, {@code article} that has {@code text=Playwright} matches {@code <article><div>Playwright</div></article>}.
Expand All @@ -78,53 +62,7 @@ class LocatorOptions {
* {@code <article><div>Playwright</div></article>}.
*/
public Object hasText;
/**
* Matches elements that are to the left of any element matching the inner locator, at any vertical position. Inner locator
* is queried against the same root as the outer one. More details in <a
* href="https://playwright.dev/java/docs/selectors#selecting-elements-based-on-layout">layout selectors</a> guide.
*
* <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
*/
public Locator leftOf;
/**
* Matches elements that are near (<= 50 css pixels) any of the elements matching the inner locator. Inner locator is
* queried against the same root as the outer one. More details in <a
* href="https://playwright.dev/java/docs/selectors#selecting-elements-based-on-layout">layout selectors</a> guide.
*
* <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
*/
public Locator near;
/**
* Matches elements that are to the right of any element matching the inner locator, at any vertical position. Inner
* locator is queried against the same root as the outer one. More details in <a
* href="https://playwright.dev/java/docs/selectors#selecting-elements-based-on-layout">layout selectors</a> guide.
*
* <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
*/
public Locator rightOf;

/**
* Matches elements that are above any of the elements matching the inner locator, at any horizontal position. Inner
* locator is queried against the same root as the outer one. More details in <a
* href="https://playwright.dev/java/docs/selectors#selecting-elements-based-on-layout">layout selectors</a> guide.
*
* <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
*/
public LocatorOptions setAbove(Locator above) {
this.above = above;
return this;
}
/**
* Matches elements that are below any of the elements matching the inner locator, at any horizontal position. Inner
* locator is queried against the same root as the outer one. More details in <a
* href="https://playwright.dev/java/docs/selectors#selecting-elements-based-on-layout">layout selectors</a> guide.
*
* <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
*/
public LocatorOptions setBelow(Locator below) {
this.below = below;
return this;
}
/**
* Matches elements containing an element that matches an inner locator. Inner locator is queried against the outer one.
* For example, {@code article} that has {@code text=Playwright} matches {@code <article><div>Playwright</div></article>}.
Expand Down Expand Up @@ -153,39 +91,6 @@ public LocatorOptions setHasText(Pattern hasText) {
this.hasText = hasText;
return this;
}
/**
* Matches elements that are to the left of any element matching the inner locator, at any vertical position. Inner locator
* is queried against the same root as the outer one. More details in <a
* href="https://playwright.dev/java/docs/selectors#selecting-elements-based-on-layout">layout selectors</a> guide.
*
* <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
*/
public LocatorOptions setLeftOf(Locator leftOf) {
this.leftOf = leftOf;
return this;
}
/**
* Matches elements that are near (<= 50 css pixels) any of the elements matching the inner locator. Inner locator is
* queried against the same root as the outer one. More details in <a
* href="https://playwright.dev/java/docs/selectors#selecting-elements-based-on-layout">layout selectors</a> guide.
*
* <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
*/
public LocatorOptions setNear(Locator near) {
this.near = near;
return this;
}
/**
* Matches elements that are to the right of any element matching the inner locator, at any vertical position. Inner
* locator is queried against the same root as the outer one. More details in <a
* href="https://playwright.dev/java/docs/selectors#selecting-elements-based-on-layout">layout selectors</a> guide.
*
* <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
*/
public LocatorOptions setRightOf(Locator rightOf) {
this.rightOf = rightOf;
return this;
}
}
/**
* Returns locator to the first matching frame.
Expand Down
Loading