8000 [R] Added is("selector") function to SeleniumQueryFunctions · seleniumQuery/seleniumQuery@106bd86 · GitHub
[go: up one dir, main page]
Skip to content

Commit 106bd86

Browse files
acdcjunioracdcjunior
committed
[R] Added is("selector") function to SeleniumQueryFunctions
1 parent 762d11b commit 106bd86

File tree

4 files changed

+31
-6
lines changed

4 files changed

+31
-6
lines changed

‎src/main/java/io/github/seleniumquery/SeleniumQueryObject.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ public String html() {
509509
* @since 0.9.0
510510
*/
511511
public boolean is(String selector) {
512-
return IsFunction.is(this, selector);
512+
return seleniumQueryFunctions.isFunction(this, selector);
513513
}
514514

515515
/**

‎src/main/java/io/github/seleniumquery/functions/SeleniumQueryFunctions.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import io.github.seleniumquery.functions.jquery.attributes.PropFunction;
2222
import io.github.seleniumquery.functions.jquery.forms.ValFunction;
2323
import io.github.seleniumquery.functions.jquery.traversing.filtering.FilterFunction;
24+
import io.github.seleniumquery.functions.jquery.traversing.filtering.IsFunction;
2425
import org.openqa.selenium.WebElement;
2526

2627
public class SeleniumQueryFunctions {
@@ -49,4 +50,8 @@ public SeleniumQueryObject filterFunction(SeleniumQueryObject seleniumQueryObjec
4950
return new FilterFunction().filter(seleniumQueryObject, filterFunction);
5051
}
5152

53+
public boolean isFunction(SeleniumQueryObject seleniumQueryObject, String selector) {
54+
return IsFunction.is(seleniumQueryObject, selector);
55+
}
56+
5257
}

‎src/test/java/endtoend/functions/jquery/traversing/IsFunctionTest.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,25 @@ public class IsFunctionTest {
3131

3232
@Test
3333
public void is_function() {
34-
assertThat($("#myDiv").is("div"), is(true));
34+
assertThat($("#myDiv").is("div"), is(true));
3535
assertThat($("#myDiv").is(".classOne"), is(true));
3636
assertThat($("#myDiv").is(".classTwo"), is(true));
3737
assertThat($("#myDiv").is(":not(.classThree)"), is(true));
3838
assertThat($("#myDiv").is(".classOne.classTwo"), is(true));
3939
assertThat($("#myDiv").is(".classOne.classTwo:not(.classThree)"), is(true));
40-
40+
4141
assertThat($("#otherDiv").is(".classThree"), is(true));
4242
assertThat($("#otherDiv").is(":not(.classOne)"), is(true));
43-
43+
4444
assertThat($("#o1").is("option"), is(true));
4545
assertThat($("#o2").is("option"), is(true));
4646
assertThat($("#o1").is(":not(:selected)"), is(true));
4747
assertThat($("#o2").is(":selected"), is(true));
48-
48+
49+
}
50+
51+
@Test
52+
public void is_function__with_deep_composed_pseudos() {
4953
assertThat($("#o1").is(":not(:not(:not(:selected)))"), is(true));
5054
assertThat($("#o2").is(":not(:not(:selected))"), is(true));
5155
}

‎src/test/java/io/github/seleniumquery/SeleniumQueryObjectTest.java

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public void valWriteNumber() {
111111
}
112112

113113
@Test
114-
public void filterFunction() {
114+
public void filterPredicateFunction() {
115115
// given
116116
SeleniumQueryFunctions seleniumQueryFunctions = createMockSeleniumQueryFunctions();
117117
SeleniumQueryObject seleniumQueryObject = createStubSeleniumQueryObjectWithSeleniumQueryFunctions(seleniumQueryFunctions);
@@ -125,4 +125,20 @@ public void filterFunction() {
125125
assertThat(returnedObject, is(configuredReturningObject));
126126
}
127127

128+
@Test
129+
@SuppressWarnings("ConstantConditions")
130+
public void isSelectorFunction() {
131+
// given
132+
SeleniumQueryFunctions seleniumQueryFunctions = createMockSeleniumQueryFunctions();
133+
SeleniumQueryObject seleniumQueryObject = createStubSeleniumQueryObjectWithSeleniumQueryFunctions(seleniumQueryFunctions);
134+
boolean configuredReturningValue = true;
135+
136+
String configuredSelector = "selector";
137+
given(seleniumQueryFunctions.isFunction(seleniumQueryObject, configuredSelector)).willReturn(configuredReturningValue);
138+
// when
139+
boolean returnedValue = seleniumQueryObject.is(configuredSelector);
140+
// then
141+
assertThat(returnedValue, is(configuredReturningValue));
142+
}
143+
128144
}

0 commit comments

Comments
 (0)
0