Skip to content
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

Jump to bottom

new Type compatibility with old clear before typing flags during runtime #1769

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+49 −16
Open

new Type compatibility with old clear before typing flags during runtime #1769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c9e6e1
fixing broken type test
AhmdZanoon Oct 2, 2024
8caefe3
new type method compatibility with old flags during runtime
AhmdZanoon Oct 2, 2024
e993905
Merge branch 'main' into fixingBrokenTests
AhmdZanoon Oct 2, 2024
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
12 changes: 7 additions & 5 deletions src/main/java/com/shaft/gui/element/internal/Actions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.shaft.gui.internal.image.ScreenshotHelper;
import com.shaft.gui.internal.locator.LocatorBuilder;
import com.shaft.gui.internal.locator.ShadowLocatorBuilder;
import com.shaft.properties.internal.PropertiesHelper;
import com.shaft.tools.internal.support.JavaHelper;
import com.shaft.tools.io.ReportManager;
import com.shaft.tools.io.internal.FailureReporter;
Expand Down Expand Up @@ -160,19 +161,20 @@
}
}
case TYPE -> {
PropertiesHelper.setClearBeforeTypingMode();

Check warning on line 164 in src/main/java/com/shaft/gui/element/internal/Actions.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/shaft/gui/element/internal/Actions.java#L164 

Added line #L164 was not covered by tests
String clearMode = SHAFT.Properties.flags.clearBeforeTypingMode();
switch(clearMode){

switch (clearMode) {
case "native":
foundElements.get().getFirst().clear();
break ;
break;

Check warning on line 170 in src/main/java/com/shaft/gui/element/internal/Actions.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/shaft/gui/element/internal/Actions.java#L170 

Added line #L170 was not covered by tests
case "backspace":
String text = parseElementText(foundElements.get().getFirst());
if (!text.isEmpty())
foundElements.get().getFirst().sendKeys(String.valueOf(Keys.BACK_SPACE).repeat(text.length()));
break ;
case"off":
break;

case "off":
break;
}
foundElements.get().getFirst().sendKeys((CharSequence) data);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/shaft/properties/internal/PropertiesHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static void postProcessing() {
setClearBeforeTypingMode();
}

private static void setClearBeforeTypingMode(){
public static void setClearBeforeTypingMode(){
if (!Properties.flags.attemptClearBeforeTyping() || SHAFT.Properties.flags.clearBeforeTypingMode().equals("off")) {
SHAFT.Properties.flags.set().clearBeforeTypingMode("off");
return ;
Expand Down
51 changes: 41 additions & 10 deletions src/test/java/testPackage/mockedTests/MultipleTypeCyclesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,18 @@ public void _01typeClearTypeTypeAppend() {
}



@Test
public void _02clearUsingBackSpace(){
SHAFT.Properties.flags.set().attemptClearBeforeTyping(false);
SHAFT.Properties.flags.set().attemptClearBeforeTypingUsingBackspace(true);
@Test(dependsOnMethods = "_01typeClearTypeTypeAppend")
public void _02clearUsingBackSpace() {
SHAFT.Properties.flags.set().attemptClearBeforeTypingUsingBackspace(true);
driver.get().browser().navigateToURL(testElement);
driver.get().element().type(locator, "first string")
.type(locator, "Second string")
.and().assertThat(locator).text().isEqualTo("Second string")
.perform();
.type(locator, "Second string")
.and().assertThat(locator).text().isEqualTo("Second string")
.perform();
}

@Test
public void _03NoClearBeforeTypingTest(){
@Test(dependsOnMethods = "_02clearUsingBackSpace")
public void _03NoClearBeforeTypingTest() {
SHAFT.Properties.flags.set().attemptClearBeforeTyping(false);
driver.get().browser().navigateToURL(testElement);
driver.get().element().type(locator, "first string")
Expand All @@ -44,6 +42,38 @@ public void _03NoClearBeforeTypingTest(){
.perform();
}

@Test(dependsOnMethods = "_03NoClearBeforeTypingTest")
public void _04typeClearNewFlagTypeTypeAppend() {
driver.get().browser().navigateToURL(testElement);
driver.get().element().type(locator, "first string")
.type(locator, "second ")
.typeAppend(locator, "string")
.and().assertThat(locator).text().isEqualTo("second string")
.perform();
}


@Test(dependsOnMethods = "_04typeClearNewFlagTypeTypeAppend")
public void _05clearUsingNewFlagBackSpace() {
SHAFT.Properties.flags.set().clearBeforeTypingMode("backspace");
driver.get().browser().navigateToURL(testElement);
driver.get().element().type(locator, "first string")
.type(locator, "Second string")
.and().assertThat(locator).text().isEqualTo("Second string")
.perform();
}

@Test(dependsOnMethods = "_05clearUsingNewFlagBackSpace")
public void _06NoClearBeforeTypingNewFlagTest() {
SHAFT.Properties.flags.set().clearBeforeTypingMode("off");
driver.get().browser().navigateToURL(testElement);
driver.get().element().type(locator, "first string")
.type(locator, " + Second string")
.and().assertThat(locator).text().isEqualTo("first string + Second string")
.perform();
}


@BeforeMethod
public void beforeMethod() {
driver.set(new SHAFT.GUI.WebDriver());
Expand All @@ -55,6 +85,7 @@ public void afterMethod() {
driver.get().quit();
driver.remove();
//Resetting flags to default values after each method
SHAFT.Properties.flags.set().clearBeforeTypingMode("native");
SHAFT.Properties.flags.set().attemptClearBeforeTyping(true);
SHAFT.Properties.flags.set().attemptClearBeforeTypingUsingBackspace(false);
}
Expand Down
Loading