refactor: Separate xcuitest more (#639)

* add test sample

* add rake style

* update parallel tests

* separate xcuitest related code more

* separate some methods and stop using  for tests

* rename test methods

* remove unused methods from xcuitest and appium

* fix rubocop

Author: KazuCocoa

ios_tests/lib/common.rb

@@ -18,67 +18,73 @@ def leave_textfields
 def go_to_textfields
   screen.must_equal catalog
   wait_true do
-    UI::Inventory.xcuitest? ? find_element(:name, 'TextFields').click : text('textfield').click
+    automation_name_is_xcuitest? ? find_element(:name, 'TextFields').click : text('textfield').click
     screen == 'TextFields' # wait for screen transition
   end
 end
 
 def screen
-  $driver.find_element(:class, UI::Inventory.navbar).name
+  $driver.find_element(:class, ui_ios.navbar).name
 end
 
 def catalog
   'UICatalog'
 end
 
-module UI
-  module Inventory
-    def self.xcuitest?
-      $driver.automation_name_is_xcuitest?
-    end
+def ui_ios
+  UI.new($driver)
+end
 
-    def self.navbar
-      xcuitest? ? 'XCUIElementTypeNavigationBar' : 'UIANavigationBar'
-    end
+class UI
+  def initialize(driver)
+    @driver = driver
+  end
 
-    def self.button
-      xcuitest? ? 'XCUIElementTypeButton' : 'UIAButton'
-    end
+  def xcuitest?
+    @driver.automation_name_is_xcuitest?
+  end
 
-    def self.static_text
-      xcuitest? ? 'XCUIElementTypeStaticText' : 'UIAStaticText'
-    end
+  def navbar
+    xcuitest? ? 'XCUIElementTypeNavigationBar' : 'UIANavigationBar'
+  end
 
-    def self.text_field
-      xcuitest? ? 'XCUIElementTypeTextField' : 'UIATextField'
-    end
+  def button
+    xcuitest? ? 'XCUIElementTypeButton' : 'UIAButton'
+  end
 
-    def self.secure_text_field
-      xcuitest? ? 'XCUIElementTypeSecureTextField' : 'UIASecureTextField'
-    end
+  def static_text
+    xcuitest? ? 'XCUIElementTypeStaticText' : 'UIAStaticText'
+  end
 
-    def self.picker
-      xcuitest? ? 'XCUIElementTypePicker' : 'UIAPicker'
-    end
+  def text_field
+    xcuitest? ? 'XCUIElementTypeTextField' : 'UIATextField'
+  end
 
-    def self.action_sheet
-      xcuitest? ? 'XCUIElementTypeActionSheet' : 'UIActionSheet'
-    end
+  def secure_text_field
+    xcuitest? ? 'XCUIElementTypeSecureTextField' : 'UIASecureTextField'
+  end
 
-    def self.table
-      xcuitest? ? 'XCUIElementTypeTable' : 'UIATable'
-    end
+  def picker
+    xcuitest? ? 'XCUIElementTypePicker' : 'UIAPicker'
+  end
+
+  def action_sheet
+    xcuitest? ? 'XCUIElementTypeActionSheet' : 'UIActionSheet'
+  end
 
-    def self.table_cell
-      xcuitest? ? 'XCUIElementTypeCell' : 'UIATableCell'
-    end
+  def table
+    xcuitest? ? 'XCUIElementTypeTable' : 'UIATable'
+  end
 
-    def self.other
-      xcuitest? ? 'XCUIElementTypeOther' : raise('unknown UIA element: other')
-    end
+  def table_cell
+    xcuitest? ? 'XCUIElementTypeCell' : 'UIATableCell'
+  end
+
+  def other
+    xcuitest? ? 'XCUIElementTypeOther' : raise('unknown UIA element: other')
+  end
 
-    def self.status_bar
-      xcuitest? ? 'XCUIElementTypeStatusBar' : 'UIAStatusBar'
-    end
+  def status_bar
+    xcuitest? ? 'XCUIElementTypeStatusBar' : 'UIAStatusBar'
   end
 end

ios_tests/lib/ios/specs/common/helper.rb

@@ -70,18 +70,18 @@ def before_first
 
   t 'back' do
     # start page
-    tag(UI::Inventory.navbar).name.must_equal 'UICatalog'
+    tag(ui_ios.navbar).name.must_equal 'UICatalog'
     # nav to new page.
     wait_true do
       text('buttons').click
-      tag(UI::Inventory.navbar).name == 'Buttons'
+      tag(ui_ios.navbar).name == 'Buttons'
     end
 
-    tag(UI::Inventory.navbar).name.must_equal 'Buttons'
+    tag(ui_ios.navbar).name.must_equal 'Buttons'
     # go back
     back_click
     # start page
-    tag(UI::Inventory.navbar).name.must_equal 'UICatalog'
+    tag(ui_ios.navbar).name.must_equal 'UICatalog'
   end
 
   t 'session_id' do
@@ -90,25 +90,25 @@ def before_first
   end
 
   t 'xpath' do
-    xpath("//#{UI::Inventory.static_text}").name.must_equal 'UICatalog'
+    xpath("//#{ui_ios.static_text}").name.must_equal 'UICatalog'
   end
 
   t 'xpaths' do
-    xpaths("//#{UI::Inventory.static_text}").length.must_equal 25
+    xpaths("//#{ui_ios.static_text}").length.must_equal 25
   end
 
   def uibutton_text
     'Buttons'
   end
 
   t 'ele_index' do
-    ele_index(UI::Inventory.static_text, 2).name.must_equal uibutton_text
+    ele_index(ui_ios.static_text, 2).name.must_equal uibutton_text
   end
 
   # TODO: 'string_attr_exact'
 
   t 'find_ele_by_attr' do
-    el_id = find_ele_by_attr(UI::Inventory.static_text, 'name', uibutton_text).instance_variable_get :@id
+    el_id = find_ele_by_attr(ui_ios.static_text, 'name', uibutton_text).instance_variable_get :@id
     el_id.must_match(/\d+/)
   end
 
@@ -117,10 +117,10 @@ def uibutton_text
     # no space after the !
     set_wait 1
     # empty array returned when no match
-    found = !find_eles_by_attr(UI::Inventory.static_text, 'name', uibutton_text).empty?
+    found = !find_eles_by_attr(ui_ios.static_text, 'name', uibutton_text).empty?
     found.must_equal true
 
-    found = !find_eles_by_attr(UI::Inventory.static_text, 'name', 'zz').empty?
+    found = !find_eles_by_attr(ui_ios.static_text, 'name', 'zz').empty?
     found.must_equal false
     set_wait
   end
@@ -144,16 +144,16 @@ def uibutton_text
   # TODO: 'string_attr_include'
 
   t 'find_ele_by_attr_include' do
-    el_text = find_ele_by_attr_include(UI::Inventory.static_text, :name, 'button').text
+    el_text = find_ele_by_attr_include(ui_ios.static_text, :name, 'button').text
     el_text.must_equal uibutton_text
 
-    el_name = find_ele_by_attr_include(UI::Inventory.static_text, :name, 'button').name
+    el_name = find_ele_by_attr_include(ui_ios.static_text, :name, 'button').name
     el_name.must_equal uibutton_text
   end
 
   t 'find_eles_by_attr_include' do
-    ele_count = find_eles_by_attr_include(UI::Inventory.static_text, :name, 'e').length
-    expected = UI::Inventory.xcuitest? ? 20 : 19
+    ele_count = find_eles_by_attr_include(ui_ios.static_text, :name, 'e').length
+    expected = automation_name_is_xcuitest? ? 20 : 19
     ele_count.must_equal expected
   end
 
@@ -170,13 +170,13 @@ def uibutton_text
   end
 
   t 'first_ele' do
-    first_ele(UI::Inventory.static_text).name.must_equal 'UICatalog'
+    first_ele(ui_ios.static_text).name.must_equal 'UICatalog'
   end
 
   t 'last_ele' do
     expected = 'Transitions'
 
-    el = last_ele(UI::Inventory.static_text)
+    el = last_ele(ui_ios.static_text)
     el.text.must_equal expected
     el.name.must_equal expected
   end
@@ -195,15 +195,15 @@ def uibutton_text
   end
 
   t 'tag' do
-    tag(UI::Inventory.navbar).name.must_equal 'UICatalog'
+    tag(ui_ios.navbar).name.must_equal 'UICatalog'
   end
 
   t 'tags' do
-    tags(UI::Inventory.table_cell).length.must_equal 12
+    tags(ui_ios.table_cell).length.must_equal 12
   end
 
   t 'find_eles_by_attr_include_length' do
-    find_eles_by_attr_include(UI::Inventory.static_text, 'name', 'Use').length.must_equal 7
+    find_eles_by_attr_include(ui_ios.static_text, 'name', 'Use').length.must_equal 7
   end
 
   t 'get_page_class' do

ios_tests/lib/ios/specs/device/device.rb

@@ -18,10 +18,8 @@ def go_back
   end
 
   t 'lock' do
-    raise NotImplementedError, "XCUITest(Appium1.6.2) doesn't support yet" if UI::Inventory.xcuitest?
-
     lock 5
-    tag(UI::Inventory.button).name.must_equal 'SlideToUnlock'
+    tag(ui_ios).name.must_equal 'SlideToUnlock'
 
     # It appears that lockForDuration doesn't.
     close_app
@@ -34,22 +32,18 @@ def go_back
   end
 
   t 'app_installed' do
-    raise NotImplementedError, "XCUITest(Appium1.6.2) doesn't support yet" if UI::Inventory.xcuitest?
-
     installed = app_installed? 'Derrp'
     installed.must_equal false
   end
 
   t 'shake' do
-    raise NotImplementedError, "XCUITest(Appium1.6.2) doesn't support yet" if UI::Inventory.xcuitest?
-
     shake
   end
 
   t 'close and launch' do
     close_app
     launch_app
-    tag(UI::Inventory.navbar).name.must_equal 'UICatalog'
+    tag(ui_ios.navbar).name.must_equal 'UICatalog'
   end
 
   t 'background_app homescreen' do
@@ -118,17 +112,13 @@ def go_back
   t 'pull_file' do
     # Selenium::WebDriver::Error::UnknownError: An unknown server-side error occurred while processing the command.
     # Original error: Cannot read property 'getDir' of undefined
-    raise NotImplementedError, "XCUITest(Appium1.6.2) doesn't support yet" if UI::Inventory.xcuitest?
-
     read_file = pull_file 'Library/AddressBook/AddressBook.sqlitedb'
     read_file.start_with?('SQLite format').must_equal true
   end
 
   t 'pull_folder' do
     # Selenium::WebDriver::Error::UnknownError: An unknown server-side error occurred while processing the command.
     # Original error: Cannot read property 'getDir' of undefined
-    raise NotImplementedError, "XCUITest(Appium1.6.2) doesn't support yet" if UI::Inventory.xcuitest?
-
     data = pull_folder 'Library/AddressBook'
     data.length.must_be :>, 1
   end

ios_tests/lib/ios/specs/device/touch_actions.rb

@@ -6,12 +6,12 @@ def after_last
 
   t 'swipe_default_duration' do
     wait_true do
-      wait { UI::Inventory.xcuitest? ? find_element(:name, 'Pickers').click : text('pickers').click }
+      wait { automation_name_is_xcuitest? ? find_element(:name, 'Pickers').click : text('pickers').click }
       screen == 'Pickers'
     end
 
-    ele_index(UI::Inventory.static_text, 2).text.must_equal 'John Appleseed - 0'
-    picker = ele_index(UI::Inventory.picker, 1)
+    ele_index(ui_ios.static_text, 2).text.must_equal 'John Appleseed - 0'
+    picker = ele_index(ui_ios.picker, 1)
     loc = picker.location.to_h
     size = picker.size.to_h
     start_x = loc[:x] + size[:width] / 2
@@ -45,7 +45,7 @@ def after_last
     # [HTTP] <-- POST /wd/hub/session/8b651f03-0fbc-43f0-aaf2-243d0650f6aa/touch/perform 200 1895 ms - 74
     # rubocop:enable Metrics/LineLength
     Appium::TouchAction.new.swipe(start_x: start_x, start_y: start_y, offset_x: 0, offset_y: - 50).perform
-    ele_index(UI::Inventory.static_text, 2).text.must_equal 'Chris Armstrong - 0'
+    ele_index(ui_ios.static_text, 2).text.must_equal 'Chris Armstrong - 0'
   end
 
   t 'swipe_coordinates_end_x_end_y' do

ios_tests/lib/ios/specs/driver.rb

@@ -233,7 +233,7 @@ def sauce?
     end
 
     t 'automation_name_is_xcuitest?' do
-      automation_name_is_xcuitest?.must_equal UI::Inventory.xcuitest?
+      automation_name_is_xcuitest?.must_equal automation_name_is_xcuitest?
     end
 
     #
@@ -276,23 +276,21 @@ def sauce?
 
     # simple integration sanity test to check for unexpected exceptions
     t 'set_location' do
-      raise NotImplementedError, "XCUITest(Appium1.6.2) doesn't support yet" if UI::Inventory.xcuitest?
       set_location latitude: 55, longitude: -72, altitude: 33
     end
 
     # any elements
     t 'find_elements' do
-      find_elements(:class, UI::Inventory.table_cell).length.must_equal 12
+      find_elements(:class, ui_ios.table_cell).length.must_equal 12
     end
 
     # any element
     t 'find_element' do
-      find_element(:class, UI::Inventory.static_text).class.must_equal Selenium::WebDriver::Element
+      find_element(:class, ui_ios.static_text).class.must_equal Selenium::WebDriver::Element
     end
 
     # settings
     t 'get settings' do
-      raise NotImplementedError, "XCUITest(Appium1.6.2) doesn't support yet" if UI::Inventory.xcuitest?
       get_settings.wont_be_nil
     end
 

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

@@ -3,8 +3,8 @@
   def nav_once
     screen.must_equal catalog
     wait_true do
-      UI::Inventory.xcuitest? ? find_element(:name, 'Alerts').click : text('alerts').click
-      tag(UI::Inventory.navbar).name == 'Alerts' # wait for true
+      automation_name_is_xcuitest? ? find_element(:name, 'Alerts').click : text('alerts').click
+      tag(ui_ios.navbar).name == 'Alerts' # wait for true
     end
 
     # redefine method as no-op after it's invoked once
@@ -13,7 +13,7 @@ def nav_once
 
   def after_last
     alert_accept if exists do
-      UI::Inventory.xcuitest? ? find_elements(:name, 'UIActionSheet <title>') : text('UIActionSheet <title>')
+      automation_name_is_xcuitest? ? find_elements(:name, 'UIActionSheet <title>') : text('UIActionSheet <title>')
     end
     back_click
     screen.must_equal catalog
@@ -27,7 +27,7 @@ def after_last
 
   def open_alert
     wait_true do
-      if  UI::Inventory.xcuitest?
+      if  automation_name_is_xcuitest?
         find_element(:name, 'Show OK-Cancel').click
         find_element(:name, 'UIActionSheet <title>').displayed?
       else

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

@@ -3,7 +3,7 @@
   def before_first
     screen.must_equal catalog
     # nav to buttons activity
-    wait { UI::Inventory.xcuitest? ? find_element(:name, 'Buttons').click : text('buttons').click }
+    wait { automation_name_is_xcuitest? ? find_element(:name, 'Buttons').click : text('buttons').click }
   end
 
   def after_last