forked from facebookarchive/WebDriverAgent
-
Notifications
You must be signed in to change notification settings - Fork 401
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.
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
feat: Add velocity argument to swipes #392
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| /** | ||
| * Copyright (c) 2015-present, Facebook, Inc. | ||
| * All rights reserved. | ||
| * | ||
| * This source code is licensed under the BSD-style license found in the | ||
| * LICENSE file in the root directory of this source tree. An additional grant | ||
| * of patent rights can be found in the PATENTS file in the same directory. | ||
| */ | ||
| #import <XCTest/XCTest.h> | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| @interface XCUIElement (FBSwiping) | ||
|
|
||
| /** | ||
| * Performs swipe gesture on the element | ||
| * | ||
| * @param direction Swipe direction. The following values are supported: up, down, left and right | ||
| * @param velocity Swipe speed in pixels per second. This parameter is only supported since Xcode 11.4 | ||
| * nil value means that the default velocity is going to be used. | ||
| */ | ||
| - (void)fb_swipeWithDirection:(NSString *)direction velocity:(nullable NSNumber*)velocity; | ||
|
|
||
| @end | ||
|
|
||
| NS_ASSUME_NONNULL_END |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /** | ||
| * Copyright (c) 2015-present, Facebook, Inc. | ||
| * All rights reserved. | ||
| * | ||
| * This source code is licensed under the BSD-style license found in the | ||
| * LICENSE file in the root directory of this source tree. An additional grant | ||
| * of patent rights can be found in the PATENTS file in the same directory. | ||
| */ | ||
|
|
||
| #import "XCUIElement+FBSwiping.h" | ||
|
|
||
| #import "FBLogger.h" | ||
| #import "XCUIElement.h" | ||
|
|
||
| @implementation XCUIElement (FBSwiping) | ||
|
|
||
| - (void)fb_swipeWithDirection:(NSString *)direction velocity:(nullable NSNumber*)velocity | ||
| { | ||
| double velocityValue = .0; | ||
| if (nil != velocity) { | ||
| if ([self respondsToSelector:@selector(swipeUpWithVelocity:)]) { | ||
| velocityValue = [velocity doubleValue]; | ||
| } else { | ||
| [FBLogger log:@"Custom velocity values are only supported since Xcode SDK 11.4. The default velocity will be used instead"]; | ||
| } | ||
| } | ||
|
|
||
| #pragma clang diagnostic push | ||
| #pragma clang diagnostic ignored "-Warc-performSelector-leaks" | ||
| if (velocityValue > 0) { | ||
| SEL selector = NSSelectorFromString([NSString stringWithFormat:@"swipe%@WithVelocity:", direction.lowercaseString.capitalizedString]); | ||
| [self performSelector:selector withObject:@(velocityValue)]; | ||
| } else { | ||
| SEL selector = NSSelectorFromString([NSString stringWithFormat:@"swipe%@", direction.lowercaseString.capitalizedString]); | ||
| [self performSelector:selector]; | ||
| } | ||
| #pragma clang diagnostic pop | ||
| } | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
WebDriverAgentTests/IntegrationTests/FBElementSwipingTests.m
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /** | ||
| * Copyright (c) 2015-present, Facebook, Inc. | ||
| * All rights reserved. | ||
| * | ||
| * This source code is licensed under the BSD-style license found in the | ||
| * LICENSE file in the root directory of this source tree. An additional grant | ||
| * of patent rights can be found in the PATENTS file in the same directory. | ||
| */ | ||
|
|
||
| #import <XCTest/XCTest.h> | ||
|
|
||
| #import "FBIntegrationTestCase.h" | ||
| #import "FBTestMacros.h" | ||
| #import "XCUIElement+FBWebDriverAttributes.h" | ||
| #import "FBXCodeCompatibility.h" | ||
| #import "XCUIElement+FBSwiping.h" | ||
|
|
||
| @interface FBElementSwipingTests : FBIntegrationTestCase | ||
| @property (nonatomic, strong) XCUIElement *scrollView; | ||
| @end | ||
|
|
||
| @implementation FBElementSwipingTests | ||
|
|
||
| - (void)setUp | ||
| { | ||
| [super setUp]; | ||
| static dispatch_once_t onceToken; | ||
| dispatch_once(&onceToken, ^{ | ||
| [self launchApplication]; | ||
| [self goToScrollPageWithCells:YES]; | ||
| self.scrollView = [[self.testedApplication.query descendantsMatchingType:XCUIElementTypeAny] matchingIdentifier:@"scrollView"].element; | ||
| }); | ||
| } | ||
|
|
||
| - (void)testSwipeUp | ||
| { | ||
| [self.scrollView fb_swipeWithDirection:@"up" velocity:nil]; | ||
| FBAssertInvisibleCell(@"0"); | ||
| } | ||
|
|
||
| - (void)testSwipeDown | ||
| { | ||
| [self.scrollView fb_swipeWithDirection:@"up" velocity:nil]; | ||
| FBAssertInvisibleCell(@"0"); | ||
| [self.scrollView fb_swipeWithDirection:@"down" velocity:nil]; | ||
| FBAssertVisibleCell(@"0"); | ||
| } | ||
|
|
||
| - (void)testSwipeDownWithVelocity | ||
| { | ||
| [self.scrollView fb_swipeWithDirection:@"up" velocity:@2500]; | ||
| FBAssertInvisibleCell(@"0"); | ||
| [self.scrollView fb_swipeWithDirection:@"down" velocity:@2500]; | ||
| FBAssertVisibleCell(@"0"); | ||
| } | ||
|
|
||
| @end | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍