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

fix: Scroll issue in flutter integration driver #2227

Merged
merged 2 commits into from
Aug 29, 2024
Merged

fix: Scroll issue in flutter integration driver #2227

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5532d00
fix: scroll issue in flutter integration driver
MummanaSubramanya Aug 29, 2024
fa01529
fix iOS test
MummanaSubramanya Aug 29, 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
31 changes: 26 additions & 5 deletions src/e2eFlutterTest/java/io/appium/java_client/android/CommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
import org.openqa.selenium.WebElement;

import java.io.IOException;
import java.time.Duration;

import static java.lang.Boolean.parseBoolean;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
Expand Down Expand Up @@ -52,18 +54,37 @@ void testScrollTillVisibleCommand() {
openScreen("Vertical Swiping");

WebElement firstElement = driver.scrollTillVisible(new ScrollParameter(AppiumBy.flutterText("Java")));
assertTrue(Boolean.parseBoolean(firstElement.getAttribute("displayed")));
assertTrue(parseBoolean(firstElement.getAttribute("displayed")));

WebElement lastElement = driver.scrollTillVisible(new ScrollParameter(AppiumBy.flutterText("Protractor")));
assertTrue(Boolean.parseBoolean(lastElement.getAttribute("displayed")));
assertFalse(Boolean.parseBoolean(firstElement.getAttribute("displayed")));
assertTrue(parseBoolean(lastElement.getAttribute("displayed")));
assertFalse(parseBoolean(firstElement.getAttribute("displayed")));

firstElement = driver.scrollTillVisible(
new ScrollParameter(AppiumBy.flutterText("Java"),
ScrollParameter.ScrollDirection.UP)
);
assertTrue(Boolean.parseBoolean(firstElement.getAttribute("displayed")));
assertFalse(Boolean.parseBoolean(lastElement.getAttribute("displayed")));
assertTrue(parseBoolean(firstElement.getAttribute("displayed")));
assertFalse(parseBoolean(lastElement.getAttribute("displayed")));
}

@Test
void testScrollTillVisibleWithScrollParametersCommand() {
WebElement loginButton = driver.findElement(BaseFlutterTest.LOGIN_BUTTON);
loginButton.click();
openScreen("Vertical Swiping");

ScrollParameter scrollParameter = new ScrollParameter(AppiumBy.flutterText("Protractor"));
scrollParameter
.setScrollView(AppiumBy.flutterType("Scrollable"))
.setMaxScrolls(30)
.setDelta(30)
// Drag duration currently works when the value is greater than 34 secs
.setDragDuration(Duration.ofMillis(35000))
.setSettleBetweenScrollsTimeout(10);

WebElement element = driver.scrollTillVisible(scrollParameter);
assertTrue(parseBoolean(element.getAttribute("displayed")));
}

@Test
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/io/appium/java_client/flutter/commands/ScrollParameter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.internal.Require;

import java.time.Duration;
Expand All @@ -18,7 +17,7 @@
@Setter
public class ScrollParameter extends FlutterCommandParameter {
private AppiumBy.FlutterBy scrollTo;
private WebElement scrollView;
private AppiumBy.FlutterBy scrollView;
private ScrollDirection scrollDirection;
private Integer delta;
private Integer maxScrolls;
Expand Down Expand Up @@ -56,13 +55,13 @@ public Map<String, Object> toJson() {

params.put("finder", parseFlutterLocator(scrollTo));
Optional.ofNullable(scrollView)
.ifPresent(scrollView -> params.put("scrollView", scrollView));
.ifPresent(scrollView -> params.put("scrollView", parseFlutterLocator(scrollView)));
Optional.ofNullable(delta)
.ifPresent(delta -> params.put("delta", delta));
Optional.ofNullable(maxScrolls)
.ifPresent(maxScrolls -> params.put("delta", maxScrolls));
.ifPresent(maxScrolls -> params.put("maxScrolls", maxScrolls));
Optional.ofNullable(settleBetweenScrollsTimeout)
.ifPresent(timeout -> params.put("delta", settleBetweenScrollsTimeout));
.ifPresent(timeout -> params.put("settleBetweenScrollsTimeout", settleBetweenScrollsTimeout));
Optional.ofNullable(scrollDirection)
.ifPresent(direction -> params.put("scrollDirection", direction.getDirection()));
Optional.ofNullable(dragDuration)
Expand Down
Loading