wda_lib 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4297f9169a3990320cd044cf27ebcc55647fcec9
-  data.tar.gz: d1a4b4c8972b8c00e547a1d5d63df1e0700402aa
+  metadata.gz: 95ca5c7a24cbfa4cacb1195868207f2d02f78b14
+  data.tar.gz: e9ba4b825df9031188b80141d8c17cb9df597886
 SHA512:
-  metadata.gz: c3c826a5c1fc911c4d0674faf1d3a4eab0740876d44beb9f0a34f8ccb41833045985edd61f0887f7138e2ddf6d46d14ede102aa22ab73bb516834793afe6c394
-  data.tar.gz: 73954363c11f6f82640939a2348816f0eff7be234d558b095fd722d5779a4209d17d4b389bf02ddd450e76bf273305056db432e6377f55877ceae2cb4745d4cd
+  metadata.gz: 9f3d79ba4de77d34bf9b2ece6ae678652bf8c29805266e4a508f09c25305da2770dfd61314f372817b509d8a50337def5c3f94bafa293f0d5238252d3655e2a6
+  data.tar.gz: 8316d75df26d475f5952d1c7a3f4b120bf48829fe801a80a6e37ddbea11d3329f3575acfb226332f64ba4721fe707c1a220937d3d16b8a3f631b9f0ea656346d

data/lib/wda_lib/find_element.rb

@@ -135,7 +135,7 @@ class WDA
     # xpath('Button', 'name', 'Share') for "//XCUIElementTypeButton[@name='Share']"
     # @return [Array] contains all elements which match given variables
     def xpath_search(type, attribute, value)
-      finds :xpath, "//#{match(type)}[@#{attribute}='#{value}']"
+      finds :xpath, "//#{match(type)}[@#{attribute}=\"#{value}\"]"
     end
 
     # Search predicate string, return first found element
@@ -168,20 +168,20 @@ class WDA
       if value.is_a? Numeric
         finds(:xpath, "//XCUIElementTypeButton")[value]
       else
-        find(:xpath, "//XCUIElementTypeButton[@name='#{value}']")
+        find(:xpath, "//XCUIElementTypeButton[@name=\"#{value}\"]")
       end
     end
 
     # Find buttons by given index or value
     # @param value [String, Integer] 
-    # If value is integer then return the button at that index
-    # If value is string then return the all button which contains given value
+    # If value is integer then return the all buttons
+    # If value is string then return the all buttons which contain given value
     # @return [Array] All found buttons
     def buttons(value = nil)
       if value.nil?
         finds(:xpath, "//XCUIElementTypeButton")
       else
-        finds(:xpath, "//XCUIElementTypeButton[@name='#{value}']")
+        finds(:xpath, "//XCUIElementTypeButton[@name=\"#{value}\"]")
       end
     end
 
@@ -206,14 +206,21 @@ class WDA
       if value.is_a? Numeric
         finds(:xpath, "//XCUIElementTypeTextField")[value]
       else
-        find :xpath,  "//XCUIElementTypeTextField[@value='#{value}']"
+        find(:xpath, "//XCUIElementTypeTextField[@value=\"#{value}\"]")
       end
     end
 
     # Find the all TextField.
+    # @param value [String]
+    # If value is integer then return all textFields
+    # If value is string then return all textFields which contain given value
     # @return [Array]
-    def textfields
-      finds(:xpath, "//XCUIElementTypeTextField")
+    def textfields(value = nil)
+      if value.nil?
+        finds(:xpath, "//XCUIElementTypeTextField")
+      else
+        finds(:xpath, "//XCUIElementTypeTextField[@value=\"#{value}\"]")
+      end
     end
 
     # Find the first TextField.
@@ -224,7 +231,7 @@ class WDA
 
     # Find the last TextField.
     # @return [TextField]
-    def first_textfield
+    def last_textfield
       finds(:xpath, "//XCUIElementTypeTextField").last
     end
 
@@ -237,13 +244,13 @@ class WDA
       if value.is_a? Numeric
         finds(:xpath, "//XCUIElementTypeSecureTextField")[value]
       else
-        find :xpath,  "//XCUIElementTypeSecureTextField[@value='#{value}']"
+        find(:xpath, "//XCUIElementTypeSecureTextField[@value=\"#{value}\"]")
       end
     end
 
     # Find the all SecureTextField.
     # @return [Array]
-    def secure_textfields
+    def secure_textfields 
       finds(:xpath, "//XCUIElementTypeSecureTextField")
     end
 
@@ -256,14 +263,21 @@ class WDA
       if value.is_a? Numeric
         finds(:xpath, "//XCUIElementTypeStaticText")[value]
       else
-        find :xpath,  "//XCUIElementTypeStaticText[@value='#{value}']"
+        find(:xpath, "//XCUIElementTypeStaticText[@value=\"#{value}\"]")
       end
     end
 
     # Find the all StaticText.
+    # @param value [String]
+    # If value is integer then return all StaticTexts
+    # If value is string then return the all StaticTexts which contain given value
     # @return [Array]
-    def statictexts
-      finds(:xpath, "//XCUIElementTypeStaticText")
+    def statictexts(value = nil)
+      if value.nil?
+        finds(:xpath, "//XCUIElementTypeStaticText")
+      else
+        finds(:xpath, "//XCUIElementTypeStaticText[@value=\"#{value}\"]")
+      end
     end
 
     # Find icon by given index or value
@@ -275,20 +289,20 @@ class WDA
       if value.is_a? Numeric
         finds(:xpath, "//XCUIElementTypeIcon")[value]
       else
-        find :xpath,  "//XCUIElementTypeIcon[@name='#{value}']"
+        find(:xpath, "//XCUIElementTypeIcon[@name=\"#{value}\"]")
       end
     end
 
     # Find icons by given index or value
-    # @param value [String, Integer] 
-    # If value is integer then return the icon at that index
-    # If value is string then return the all icons which contains given value
+    # @param value [String] 
+    # If value is integer then return all icons
+    # If value is string then return the all icons which contain given value
     # @return [Array] All found icons
     def icons(value = nil)
       if value.nil?
         finds(:xpath, "//XCUIElementTypeIcon")
       else
-        finds :xpath,  "//XCUIElementTypeIcon[@name='#{value}']"
+        finds(:xpath, "//XCUIElementTypeIcon[@name=\"#{value}\"]")
       end
     end
 
@@ -301,20 +315,20 @@ class WDA
       if value.is_a? Numeric
         finds(:xpath, "//XCUIElementTypeSearchField")[value]
       else
-        find :xpath,  "//XCUIElementTypeSearchField[@name='#{value}']"
+        find(:xpath, "//XCUIElementTypeSearchField[@name=\"#{value}\"]")
       end
     end
 
     # Find icons by given index or value
-    # @param value [String, Integer] 
-    # If value is integer then return the SearchField at that index
+    # @param value [String] 
+    # If value is integer then return all SearchFields
     # If value is string then return the all SearchFields which have given value as name
     # @return [Array] All found SearchFields
     def searchfields(value = nil)
       if value.nil?
         finds(:xpath, "//XCUIElementTypeSearchField")
       else
-        finds :xpath,  "//XCUIElementTypeSearchField[@name='#{value}']"
+        finds(:xpath, "//XCUIElementTypeSearchField[@name=\"#{value}\"]")
       end
     end
 

data/lib/wda_lib/version.rb

@@ -1,3 +1,3 @@
 class WDA
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wda_lib
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - MIN Yi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2016-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake