Remove appium suffix from find element (#532)

* update find_element/s

* add some examples

* update migration

* remove appium surfix

* remove pry

* update migration.md

* fix some tests

Author: KazuCocoa

docs/migration.md

@@ -1,3 +1,28 @@
+### Breaking Changes in 9.3.7
+change `@selenium_driver.find_element/s_with_appium` to `@selenium_driver.find_element/s`.
+ref: https://github.com/appium/ruby_lib/pull/532
+
+A breaking change in v9.1.0 is reverted in this version.
+
+           Old | New
+            :--|:--
+`@selenium_driver.find_element/s_with_appium` | `@selenium_driver.find_element/s`
+
+- after
+
+```
+@selenium_driver.find_element :accessibility_id, "some ids"
+@selenium_driver.find_elements :accessibility_id, "some ids"
+```
+
+- before
+
+```
+@selenium_driver.find_element_with_appium :accessibility_id, "some ids"
+@selenium_driver.find_elements_with_appium :accessibility_id, "some ids"
+```
+
+
 ### Breaking Changes in 9.1.0
 change `@selenium_driver.find_element/s` to `@selenium_driver.find_element/s_with_appium`.
 ref: https://github.com/appium/ruby_lib/pull/383

ios_tests/appium.txt

@@ -1,6 +1,6 @@
 [caps]
 platformName = "ios"
-platformVersion = "10.2"
+platformVersion = "10.3"
 deviceName ="iPhone Simulator"
 automationName = 'XCUITest'
 app = "./UICatalog.app"

ios_tests/lib/ios/specs/driver.rb

@@ -33,21 +33,21 @@ def sauce?
   t 'verify Appium::Driver::Capabilities.init_caps_for_appium' do
     expected_app = File.absolute_path('UICatalog.app')
     caps = ::Appium::Driver::Capabilities.init_caps_for_appium(platformName:    'ios',
-                                                               platformVersion: '10.2',
+                                                               platformVersion: '10.3',
                                                                automationName:  'XCUITest',
                                                                deviceName:      'iPhone Simulator',
                                                                app:             expected_app,
                                                                some_capability: 'some_capability')
     caps_with_json = JSON.parse(caps.to_json)
     caps_with_json['platformName'].must_equal 'ios'
-    caps_with_json['platformVersion'].must_equal '10.2'
+    caps_with_json['platformVersion'].must_equal '10.3'
     caps_with_json['app'].must_equal expected_app
     caps_with_json['automationName'].must_equal 'XCUITest'
     caps_with_json['deviceName'].must_equal 'iPhone Simulator'
     caps_with_json['someCapability'].must_equal 'some_capability'
 
     caps[:platformName].must_equal 'ios'
-    caps[:platformVersion].must_equal '10.2'
+    caps[:platformVersion].must_equal '10.3'
     caps[:app].must_equal expected_app
     caps[:automationName].must_equal 'XCUITest'
     caps[:deviceName].must_equal 'iPhone Simulator'
@@ -77,14 +77,14 @@ def sauce?
       # actual[:caps].to_json send to Appium server
       caps_with_json = JSON.parse(actual[:caps].to_json)
       caps_with_json['platformName'].must_equal 'ios'
-      caps_with_json['platformVersion'].must_equal '10.2'
+      caps_with_json['platformVersion'].must_equal '10.3'
       caps_with_json['app'].must_equal expected_app
       caps_with_json['automationName'].must_equal 'XCUITest'
       caps_with_json['deviceName'].must_equal 'iPhone Simulator'
       caps_with_json['someCapability'].must_equal 'some_capability'
 
       actual[:caps][:platformName].must_equal 'ios'
-      actual[:caps][:platformVersion].must_equal '10.2'
+      actual[:caps][:platformVersion].must_equal '10.3'
       actual[:caps][:app].must_equal expected_app
       actual[:caps][:automationName].must_equal 'XCUITest'
       actual[:caps][:deviceName].must_equal 'iPhone Simulator'

lib/appium_lib/device/device.rb

@@ -433,7 +433,7 @@ def create_bridge_command(method)
       #   ```
       def extend_search_contexts
         Selenium::WebDriver::SearchContext.class_eval do
-          def find_element_with_appium(*args)
+          def find_element(*args)
             how, what = extract_args(args)
             by = _set_by_from_finders(how)
             begin
@@ -443,7 +443,7 @@ def find_element_with_appium(*args)
             end
           end
 
-          def find_elements_with_appium(*args)
+          def find_elements(*args)
             how, what = extract_args(args)
             by = _set_by_from_finders(how)
             begin

lib/appium_lib/driver.rb

@@ -697,13 +697,20 @@ def execute_script(script, *args)
     #
     # If you call `Appium.promote_appium_methods`, you can call `find_elements` directly.
     #
+    # ```
+    # @driver = Appium::Driver.new()
+    # @driver.find_elements :predicate, yyy
+    # ```
+    #
+    # If you call `Appium.promote_appium_methods`, you can call `find_elements` directly.
+    #
     # @param [*args] args The args to use
     # @return [Array<Element>] Array is empty when no elements are found.
     def find_elements(*args)
-      @driver.find_elements_with_appium(*args)
+      @driver.find_elements(*args)
     end
 
-    # Calls @driver.find_element_with_appium
+    # Calls @driver.find_element
     #
     # ```
     # @driver = Appium::Driver.new()
@@ -715,7 +722,7 @@ def find_elements(*args)
     # @param [*args] args The args to use
     # @return [Element]
     def find_element(*args)
-      @driver.find_element_with_appium(*args)
+      @driver.find_element(*args)
     end
 
     # Calls @driver.set_location

lib/appium_lib/ios/helper.rb

@@ -295,7 +295,7 @@ def find_eles_by_predicate(class_name: '*', value:)
                      %(type == "#{class_name}" && ) +
                        %((name ==[c] "#{value}" || label ==[c] "#{value}" || value ==[c] "#{value}"))
                    end
-      @driver.find_elements_with_appium :predicate, predicate
+      @driver.find_elements :predicate, predicate
     end
 
     # Get the first tag by attribute that exactly matches value.
@@ -340,7 +340,7 @@ def find_eles_by_predicate_include(class_name: '*', value:)
                     %(type == "#{class_name}" && ) +
                       %((name contains[c] "#{value}" || label contains[c] "#{value}" || value contains[c] "#{value}"))
                   end
-      @driver.find_elements_with_appium :predicate, predicate
+      @driver.find_elements :predicate, predicate
     end
 
     # Get the first tag that matches class_name
@@ -408,7 +408,7 @@ def tags_include(class_names:, value: nil)
                       c_names
                     end
 
-        elements = @driver.find_elements_with_appium :predicate, predicate
+        elements = @driver.find_elements :predicate, predicate
         select_visible_elements elements
       else
         class_names.flat_map do |class_name|
@@ -437,7 +437,7 @@ def tags_exact(class_names:, value: nil)
                       c_names
                     end
 
-        elements = @driver.find_elements_with_appium :predicate, predicate
+        elements = @driver.find_elements :predicate, predicate
         select_visible_elements elements
       else
         class_names.flat_map do |class_name|