Skip to content

Commit

Permalink
Merge pull request #200 from dstepkin-wiley/master
Browse files Browse the repository at this point in the history
[NullTeasyElement] added public getter of elementData
  • Loading branch information
vefimofff committed Apr 11, 2019
2 parents 487b4ec + 4a1bfd8 commit bcb5bc4
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/main/java/com/wiley/elements/TeasyElement.java
Expand Up @@ -54,6 +54,13 @@ public interface TeasyElement extends WebElement {
*/
Locatable getLocatable();

/**
* Gets data used for element creation (e.g. search context, locator)
*
* @return - {@link TeasyElementData}
*/
TeasyElementData getElementData();

/**
* {@link #should(SearchStrategy)} with default {@link SearchStrategy}
*/
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/com/wiley/elements/types/BaseTeasyElement.java
Expand Up @@ -32,6 +32,7 @@
*/
public abstract class BaseTeasyElement implements TeasyElement, org.openqa.selenium.interactions.Locatable {

private TeasyElementData elementData;
private WebElement wrappedElement;
private Locatable locatable;
private int repeatLocateElementCounter;
Expand All @@ -41,6 +42,7 @@ public abstract class BaseTeasyElement implements TeasyElement, org.openqa.selen
private static final int MAX_NUMBER_OF_REPEAT_LOCATE_ELEMENT = 20;

BaseTeasyElement(TeasyElementData elementData) {
this.elementData = elementData;
this.locatable = new LocatableFactory(elementData, getDriver()).get();
this.repeatLocateElementCounter = 0;
this.wrappedElement = getWrappedElement(elementData);
Expand Down Expand Up @@ -369,6 +371,11 @@ public Locatable getLocatable() {
return locatable;
}

@Override
public TeasyElementData getElementData() {
return elementData;
}

@Override
public <X> X getScreenshotAs(OutputType<X> target) {
if (getDriver().getClass() == RemoteWebDriver.class) {
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/wiley/elements/types/NullTeasyElement.java
Expand Up @@ -148,6 +148,11 @@ public Locatable getLocatable() {
return locatable;
}

@Override
public TeasyElementData getElementData() {
return elementData;
}

@Override
public TeasyElement getParent() {
throw noSuchElementException();
Expand Down

0 comments on commit bcb5bc4

Please sign in to comment.