add some oss commands to w3c module(#38)

* add some oss commands to w3c

* fix rubocop

* update changelog

* fix unit tests

Author: KazuCocoa

CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 ### Enhancements
 
 ### Bug fixes
+- Fix some w3c methods to work with Appium part 2 [#38](https://github.com/appium/ruby_lib_core/pull/38)
+
+### Deprecations
+
+## [1.2.3]
+### Enhancements
+
+### Bug fixes
+- Fix some w3c methods to work with Appium part 2 [#38](https://github.com/appium/ruby_lib_core/pull/38)
 
 ### Deprecations
 

lib/appium_lib_core/common/base/w3c_bridge.rb

@@ -16,6 +16,7 @@ def commands(command)
         # - https://seleniumhq.github.io/selenium/docs/api/rb/Selenium/WebDriver/KeyActions.html
         #
         # @private
+        # For Appium
         # override
         #
         # @example
@@ -31,6 +32,7 @@ def action(async = false)
         end
         alias actions action
 
+        # For Appium
         # override
         def page_source
           # For W3C
@@ -40,13 +42,15 @@ def page_source
           execute :get_page_source
         end
 
+        # For Appium
         # override
         def element_attribute(element, name)
           # For W3C
           # execute_atom :getAttribute, element, name
           execute :get_element_attribute, id: element.ref, name: name
         end
 
+        # For Appium
         # override
         def find_element_by(how, what, parent = nil)
           how, what = convert_locators(how, what)
@@ -59,6 +63,7 @@ def find_element_by(how, what, parent = nil)
           ::Selenium::WebDriver::Element.new self, element_id_from(id)
         end
 
+        # For Appium
         # override
         def find_elements_by(how, what, parent = nil)
           how, what = convert_locators(how, what)
@@ -72,6 +77,32 @@ def find_elements_by(how, what, parent = nil)
           ids.map { |id| ::Selenium::WebDriver::Element.new self, element_id_from(id) }
         end
 
+        # For Appium
+        # override
+        def location
+          obj = execute(:get_location) || {}
+          Location.new obj['latitude'], obj['longitude'], obj['altitude']
+        end
+
+        # For Appium
+        # override
+        def set_location(lat, lon, alt)
+          loc = { latitude: lat, longitude: lon, altitude: alt }
+          execute :set_location, {}, { location: loc }
+        end
+
+        # For Appium
+        # override
+        def network_connection
+          execute :get_network_connection
+        end
+
+        # For Appium
+        # override
+        def network_connection=(type)
+          execute :set_network_connection, {}, { parameters: { type: type } }
+        end
+
         private
 
         # Don't convert locators for Appium Client

lib/appium_lib_core/common/command.rb

@@ -89,6 +89,17 @@ module Commands
           # The fix will be included in selenium-3.8.2
           get_page_source: [:get, 'session/:session_id/source'.freeze],
 
+          ## Add to W3C commands
+          # rotatable
+          get_screen_orientation: [:get, 'session/:session_id/orientation'.freeze],
+          set_screen_orientation: [:post, 'session/:session_id/orientation'.freeze],
+
+          get_location: [:get, 'session/:session_id/location'.freeze],
+          set_location: [:post, 'session/:session_id/location'.freeze],
+
+          get_network_connection: [:get, 'session/:session_id/network_connection'.freeze],
+          set_network_connection: [:post, 'session/:session_id/network_connection'.freeze],
+
           # For IME
           ime_get_available_engines: [:get,  'session/:session_id/ime/available_engines'.freeze],
           ime_get_active_engine:     [:get,  'session/:session_id/ime/active_engine'.freeze],

test/functional/android/android/device_test.rb

@@ -71,16 +71,16 @@ def test_context_related
         @@core.wait { scroll_to('Views') }.click
         @@core.wait { scroll_to('WebView') }.click
 
-        assert_equal 'NATIVE_APP', @@driver.current_context
+        @@core.wait { assert_equal 'NATIVE_APP', @@driver.current_context }
 
         contexts = @@driver.available_contexts
         webview_context = contexts.detect { |e| e.start_with?('WEBVIEW') }
 
         @@driver.set_context webview_context
-        assert @@driver.current_context.start_with? 'WEBVIEW'
+        @@core.wait { assert @@driver.current_context.start_with? 'WEBVIEW' }
 
         @@driver.switch_to_default_context
-        assert_equal 'NATIVE_APP', @@driver.current_context
+        @@core.wait { assert_equal 'NATIVE_APP', @@driver.current_context }
       end
 
       def test_app_string

test/functional/android/android/search_context_test.rb

@@ -3,7 +3,7 @@
 # $ rake test:func:android TEST=test/functional/android/android/search_context_test.rb
 # rubocop:disable Style/ClassVars
 class AppiumLibCoreTest
-  module Ios
+  module Android
     class SearchContextTest < AppiumLibCoreTest::Function::TestCase
       def setup
         @@core ||= ::Appium::Core.for(self, Caps::ANDROID_OPS)

test/functional/android/webdriver/device_test.rb

@@ -67,7 +67,7 @@ def test_accept_alert
         # 'Could not proxy. Proxy error: Could not proxy command to remote server. Original error: 404 - ""'
         # assert @@driver.switch_to.alert.text.start_with?('Lorem ipsum dolor sit aie consectetur')
         # assert @@driver.switch_to.alert.dismiss
-        assert_equal 'OK', @@driver.find_element(:id, 'android:id/button1').name
+        @@core.wait { assert_equal 'OK', @@driver.find_element(:id, 'android:id/button1').name.upcase }
         assert @@driver.find_element(:id, 'android:id/button1').click
       end
 
@@ -82,7 +82,7 @@ def test_dismiss_alert
         # assert @@driver.switch_to.alert.dismiss
 
         # Because the results depends on OS version.
-        assert_equal 'CANCEL', @@driver.find_element(:id, 'android:id/button2').name.upcase
+        @@core.wait { assert_equal 'CANCEL', @@driver.find_element(:id, 'android:id/button2').name.upcase }
         assert @@driver.find_element(:id, 'android:id/button2').click
       end
 

test/unit/script/commands_test.rb

@@ -30,7 +30,7 @@ def test_implemented_mjsonwp_commands
     end
 
     def test_implemented_w3c_commands
-      assert_equal 96, @c.implemented_w3c_commands.length
+      assert_equal 98, @c.implemented_w3c_commands.length
       assert_equal ['session/:session_id/contexts', [:get]], @c.implemented_w3c_commands.first
 
       # pick up an arbitrary command