Merge branch 'appium:master' into refactor-remove-applications-fallbacks-1308480277413524913

Author: Dor-bl

appium/webdriver/extensions/android/gsm.py

@@ -12,15 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from selenium.common.exceptions import UnknownMethodException
 from typing_extensions import Self
 
 from appium.common.helper import extract_const_attributes
 from appium.common.logger import logger
 from appium.protocols.webdriver.can_execute_commands import CanExecuteCommands
 from appium.protocols.webdriver.can_execute_scripts import CanExecuteScripts
-from appium.protocols.webdriver.can_remember_extension_presence import CanRememberExtensionPresence
-from appium.webdriver.mobilecommand import MobileCommand as Command
 
 
 class GsmCallActions:
@@ -48,7 +45,7 @@ class GsmVoiceState:
     ON = 'on'
 
 
-class Gsm(CanExecuteCommands, CanExecuteScripts, CanRememberExtensionPresence):
+class Gsm(CanExecuteCommands, CanExecuteScripts):
     def make_gsm_call(self, phone_number: str, action: str) -> Self:
         """Make GSM call (Emulator only)
 
@@ -73,11 +70,7 @@ def make_gsm_call(self, phone_number: str, action: str) -> Self:
                 f'(e.g. {GsmCallActions.__name__}.CALL)'
             )
         args = {'phoneNumber': phone_number, 'action': action}
-        try:
-            self.assert_extension_exists(ext_name).execute_script(ext_name, args)
-        except UnknownMethodException:
-            # TODO: Remove the fallback
-            self.mark_extension_absence(ext_name).execute(Command.MAKE_GSM_CALL, args)
+        self.execute_script(ext_name, args)
         return self
 
     def set_gsm_signal(self, strength: int) -> Self:
@@ -102,13 +95,7 @@ def set_gsm_signal(self, strength: int) -> Self:
                 f'{strength} is out of range. Consider using one of {list(constants.keys())} constants. '
                 f'(e.g. {GsmSignalStrength.__name__}.GOOD)'
             )
-        try:
-            self.assert_extension_exists(ext_name).execute_script(ext_name, {'strength': strength})
-        except UnknownMethodException:
-            # TODO: Remove the fallback
-            self.mark_extension_absence(ext_name).execute(
-                Command.SET_GSM_SIGNAL, {'signalStrength': strength, 'signalStrengh': strength}
-            )
+        self.execute_script(ext_name, {'strength': strength})
         return self
 
     def set_gsm_voice(self, state: str) -> Self:
@@ -134,14 +121,8 @@ def set_gsm_voice(self, state: str) -> Self:
                 f'(e.g. {GsmVoiceState.__name__}.HOME)'
             )
         args = {'state': state}
-        try:
-            self.assert_extension_exists(ext_name).execute_script(ext_name, args)
-        except UnknownMethodException:
-            # TODO: Remove the fallback
-            self.mark_extension_absence(ext_name).execute(Command.SET_GSM_VOICE, args)
+        self.execute_script(ext_name, args)
         return self
 
     def _add_commands(self) -> None:
-        self.command_executor.add_command(Command.MAKE_GSM_CALL, 'POST', '/session/$sessionId/appium/device/gsm_call')
-        self.command_executor.add_command(Command.SET_GSM_SIGNAL, 'POST', '/session/$sessionId/appium/device/gsm_signal')
-        self.command_executor.add_command(Command.SET_GSM_VOICE, 'POST', '/session/$sessionId/appium/device/gsm_voice')
+        pass

appium/webdriver/extensions/location.py

@@ -14,7 +14,6 @@
 
 from typing import Dict, Union
 
-from selenium.common.exceptions import UnknownMethodException
 from typing_extensions import Self
 
 from appium.protocols.webdriver.can_execute_commands import CanExecuteCommands
@@ -33,11 +32,7 @@ def toggle_location_services(self) -> Self:
         Returns:
             Union['WebDriver', 'Location']: Self instance
         """
-        try:
-            self.execute_script('mobile: toggleGps')
-        except UnknownMethodException:
-            # TODO: Remove the fallback
-            self.execute(Command.TOGGLE_LOCATION_SERVICES)
+        self.execute_script('mobile: toggleGps')
         return self
 
     def set_location(
@@ -89,10 +84,5 @@ def location(self) -> Dict[str, float]:
 
     def _add_commands(self) -> None:
         """Add location endpoints. They are not int w3c spec."""
-        self.command_executor.add_command(
-            Command.TOGGLE_LOCATION_SERVICES,
-            'POST',
-            '/session/$sessionId/appium/device/toggle_location_services',
-        )
         self.command_executor.add_command(Command.GET_LOCATION, 'GET', '/session/$sessionId/location')
         self.command_executor.add_command(Command.SET_LOCATION, 'POST', '/session/$sessionId/location')

appium/webdriver/mobilecommand.py

@@ -81,7 +81,6 @@ class MobileCommand:
     GET_SYSTEM_BARS = 'getSystemBars'
     GET_DISPLAY_DENSITY = 'getDisplayDensity'
     TOGGLE_WIFI = 'toggleWiFi'
-    TOGGLE_LOCATION_SERVICES = 'toggleLocationServices'
     GET_PERFORMANCE_DATA_TYPES = 'getPerformanceDataTypes'
     GET_PERFORMANCE_DATA = 'getPerformanceData'
     GET_NETWORK_CONNECTION = 'getNetworkConnection'

test/unit/webdriver/device/location_test.py

@@ -24,10 +24,12 @@ class TestWebDriverLocation(object):
     @httpretty.activate
     def test_toggle_location_services(self):
         driver = android_w3c_driver()
-        httpretty.register_uri(httpretty.POST, appium_command('/session/1234567890/appium/device/toggle_location_services'))
         httpretty.register_uri(httpretty.POST, appium_command('/session/1234567890/execute/sync'))
         assert isinstance(driver.toggle_location_services(), WebDriver)
 
+        d = get_httpretty_request_body(httpretty.last_request())
+        assert d['script'] == 'mobile: toggleGps'
+
     @httpretty.activate
     def test_set_location_float(self):
         driver = android_w3c_driver()