simplify a bit and move tests to suitable file (#441)

Author: KazuCocoa

.rubocop.yml

@@ -40,3 +40,12 @@ Style/VariableNumber:
   EnforcedStyle: 'snake_case'
 Lint/NestedMethodDefinition:
   Enabled: false
+# Should enable and fix for Ruby3
+Style/FrozenStringLiteralComment:
+  Enabled: false
+# Can use over Ruby2.3
+Style/SafeNavigation:
+  Enabled: false
+# Can use over Ruby2.3
+Style/NumericPredicate:
+  Enabled: false

.travis.yml

@@ -2,7 +2,10 @@ sudo: false
 cache: bundler
 language: ruby
 rvm:
-  - 2.2.2
+  - 2.2.5
+  - 2.3.3
+  - 2.4.0
+
 before_install: gem update --remote bundler
 install:
   - bundle install --retry=3

android_tests/lib/android/specs/android/element/textfield.rb

@@ -58,15 +58,5 @@ def after_last
     hide_keyboard
   end
 
-  t 'set_immediate_value' do
-    message = 'hello'
-
-    wait do
-      elem = textfield(1)
-      set_immediate_value(elem, message)
-      elem.text.must_equal message
-    end
-  end
-
   t { after_last }
 end

android_tests/lib/android/specs/driver.rb

@@ -152,6 +152,21 @@ def validate_path(path)
     #   absolute_app_path # tested already by starting the driver for this test
     #   server_url # sauce labs only
 
+    t 'set_immediate_value' do
+      wait { find('app').click }
+      wait { find('activity').click }
+      wait { find('custom title').click }
+
+      message = 'hello'
+
+      wait do
+        elem = textfield(1)
+        elem.clear
+        set_immediate_value(elem, message)
+        elem.text.must_equal message
+      end
+    end
+
     t 'restart' do
       set_wait 1 # ensure wait is 1 before we restart.
       restart

ios_tests/lib/ios/specs/driver.rb

@@ -170,6 +170,22 @@ def sauce?
       client_version.must_equal expected
     end
 
+    t 'set_immediate_value' do
+      go_to_textfields
+
+      message = 'hello'
+
+      element = textfield(1)
+      element.click
+      element.clear
+
+      set_immediate_value(element, message)
+      element.text.must_equal message
+
+      set_wait 10
+      leave_textfields
+    end
+
     t 'restart' do
       restart
       text 'buttons'

ios_tests/lib/ios/specs/ios/element/textfield.rb

@@ -124,22 +124,6 @@ def must_raise_no_element
     textfields_exact('does not exist').length.must_equal 0
   end
 
-  t 'set_immediate_value' do
-    go_to_textfields
-
-    message = 'hello'
-
-    element = textfield(1)
-    element.click
-    element.clear
-
-    set_immediate_value(element, message)
-    element.text.must_equal message
-
-    set_wait 10
-    leave_textfields
-  end
-
   t 'after_last' do
     after_last
   end

ios_tests/lib/ios/specs/ios/patch.rb

@@ -28,6 +28,7 @@ def after_last
 
     ele = first_textfield
 
+    ele.clear
     ele.type 'ok'
     ele.text.must_equal 'ok'
   end

lib/appium_lib/device/device.rb

@@ -166,7 +166,7 @@ def start_activity(opts)
             app_package = opts[:app_package]
             raise 'app_package is required' unless app_package
             app_activity = opts[:app_activity]
-            raise 'app_activity is required' unless opts[:app_activity]
+            raise 'app_activity is required' unless app_activity
             app_wait_package  = opts.fetch(:app_wait_package, '')
             app_wait_activity = opts.fetch(:app_wait_activity, '')
 
@@ -313,11 +313,7 @@ def set_network_connection(mode)
 
       # @private
       def add_endpoint_method(method)
-        if block_given?
-          create_bridge_command method, &Proc.new
-        else
-          create_bridge_command method
-        end
+        block_given? ? create_bridge_command(method, &Proc.new) : create_bridge_command(method)
 
         delegate_driver_method method
         delegate_from_appium_driver method
@@ -345,11 +341,7 @@ def delegate_from_appium_driver(method, delegation_target = :driver)
       # @private
       def create_bridge_command(method)
         Selenium::WebDriver::Remote::Bridge.class_eval do
-          if block_given?
-            class_eval(&Proc.new)
-          else
-            define_method(method) { execute method }
-          end
+          block_given? ? class_eval(&Proc.new) : define_method(method) { execute method }
         end
       end
 
@@ -365,11 +357,7 @@ def extend_search_contexts
         Selenium::WebDriver::SearchContext.class_eval do
           def find_element_with_appium(*args)
             how, what = extract_args(args)
-
-            finders = ::Selenium::WebDriver::SearchContext::FINDERS.merge ::Appium::Driver::SearchContext::FINDERS
-            by = finders[how.to_sym]
-            raise ArgumentError, "cannot find element by #{how.inspect}" unless by
-
+            by = _set_by_from_finders(how)
             begin
               bridge.find_element_by by, what.to_s, ref
             rescue Selenium::WebDriver::Error::TimeOutError
@@ -379,17 +367,20 @@ def find_element_with_appium(*args)
 
           def find_elements_with_appium(*args)
             how, what = extract_args(args)
-
-            finders = ::Selenium::WebDriver::SearchContext::FINDERS.merge ::Appium::Driver::SearchContext::FINDERS
-            by = finders[how.to_sym]
-            raise ArgumentError, "cannot find element by #{how.inspect}" unless by
-
+            by = _set_by_from_finders(how)
             begin
               bridge.find_elements_by by, what.to_s, ref
             rescue Selenium::WebDriver::Error::TimeOutError
               raise Selenium::WebDriver::Error::NoSuchElementError
             end
           end
+
+          def _set_by_from_finders(how)
+            finders = ::Selenium::WebDriver::SearchContext::FINDERS.merge ::Appium::Driver::SearchContext::FINDERS
+            by = finders[how.to_sym]
+            raise ArgumentError, "cannot find element by #{how.inspect}" unless by
+            by
+          end
         end
       end