chore: remove code for old os versions (#694)

appium · May 15, 2023 · 4a9faa5 · 4a9faa5
1 parent ff2f5b5
commit 4a9faa5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 24 deletions.
diff --git a/WebDriverAgentLib/Commands/FBElementCommands.m b/WebDriverAgentLib/Commands/FBElementCommands.m
@@ -696,14 +696,12 @@ + (XCUICoordinate *)gestureCoordinateWithCoordinate:(CGPoint)coordinate
    See issue #732: https://github.com/facebook/WebDriverAgent/issues/732
    */
   XCUIElement *element = application;
-  if (isSDKVersionGreaterThanOrEqualTo(@"11.0")) {
-    XCUIElement *window = application.windows.allElementsBoundByIndex.firstObject;
-    if (window) {
-      element = window;
-      id<FBXCElementSnapshot> snapshot = element.fb_cachedSnapshot ?: element.fb_takeSnapshot;
-      point.x -= snapshot.frame.origin.x;
-      point.y -= snapshot.frame.origin.y;
-    }
+  XCUIElement *window = application.windows.allElementsBoundByIndex.firstObject;
+  if (window) {
+    element = window;
+    id<FBXCElementSnapshot> snapshot = element.fb_cachedSnapshot ?: element.fb_takeSnapshot;
+    point.x -= snapshot.frame.origin.x;
+    point.y -= snapshot.frame.origin.y;
   }
   return [self gestureCoordinateWithCoordinate:point element:element];
 }

diff --git a/WebDriverAgentLib/Utilities/FBConfiguration.m b/WebDriverAgentLib/Utilities/FBConfiguration.m
@@ -275,9 +275,7 @@ + (void)configureDefaultKeyboardPreferences
 
   // To dismiss keyboard tutorial on iOS 11+ (iPad)
   if ([controller respondsToSelector:@selector(setValue:forPreferenceKey:)]) {
-    if (isSDKVersionGreaterThanOrEqualTo(@"11.0")) {
-      [controller setValue:@YES forPreferenceKey:@"DidShowGestureKeyboardIntroduction"];
-    }
+    [controller setValue:@YES forPreferenceKey:@"DidShowGestureKeyboardIntroduction"];
     if (isSDKVersionGreaterThanOrEqualTo(@"13.0")) {
       [controller setValue:@YES forPreferenceKey:@"DidShowContinuousPathIntroduction"];
     }

diff --git a/WebDriverAgentTests/IntegrationTests/FBAutoAlertsHandlerTests.m b/WebDriverAgentTests/IntegrationTests/FBAutoAlertsHandlerTests.m
@@ -49,10 +49,6 @@ - (void)tearDown
 // The test is flaky on slow Travis CI
 - (void)disabled_testAutoAcceptingOfAlerts
 {
-  if (SYSTEM_VERSION_LESS_THAN(@"11.0")) {
-    return;
-  }
-
   self.session = [FBSession
                   initWithApplication:FBApplication.fb_activeApplication
                   defaultAlertAction:@"accept"];
@@ -66,10 +62,6 @@ - (void)disabled_testAutoAcceptingOfAlerts
 // The test is flaky on slow Travis CI
 - (void)disabled_testAutoDismissingOfAlerts
 {
-  if (SYSTEM_VERSION_LESS_THAN(@"11.0")) {
-    return;
-  }
-
   self.session = [FBSession
                   initWithApplication:FBApplication.fb_activeApplication
                   defaultAlertAction:@"dismiss"];

diff --git a/WebDriverAgentTests/IntegrationTests/FBConfigurationTests.m b/WebDriverAgentTests/IntegrationTests/FBConfigurationTests.m
@@ -33,11 +33,7 @@ - (void)testReduceMotion
   XCTAssertTrue([FBConfiguration reduceMotionEnabled]);
 
   [FBConfiguration setReduceMotionEnabled:defaultReduceMotionEnabled];
-  if (isSDKVersionLessThan(@"10.0")) {
-    XCTAssertFalse([FBConfiguration reduceMotionEnabled]);
-  } else {
-    XCTAssertEqual([FBConfiguration reduceMotionEnabled], defaultReduceMotionEnabled);
-  }
+  XCTAssertEqual([FBConfiguration reduceMotionEnabled], defaultReduceMotionEnabled);
 }
 
 @end