zucchini-ios 0.7.2 → 0.7.3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.7.3 / 2013-08-20
+* Fix timing problems due to mechanic.js changing timeout to 0 - [@phatmann][]
+* Fix: When using run -p, the orientation-specific masks are not used - [@phatmann][], [#36][]
+* Fix: Tapping an element shows "(null).tap()" in the log - [@phatmann][], [#37][]
+* Ignore error-based UIAutomation screenshots - [@phatmann], [#38][]
+
 ## 0.7.2 / 2013-08-19
 * Implement orientation specific masks - [@phatmann][], [#34][]
 * Archivable HTML reports - [@vaskas][], [#33][]
@@ -72,6 +78,9 @@
 [#32]: https://github.com/zucchini-src/zucchini/issues/32
 [#33]: https://github.com/zucchini-src/zucchini/issues/33
 [#34]: https://github.com/zucchini-src/zucchini/issues/34
+[#36]: https://github.com/zucchini-src/zucchini/issues/36
+[#37]: https://github.com/zucchini-src/zucchini/issues/37
+[#38]: https://github.com/zucchini-src/zucchini/issues/38
 
 [@Jaco-Pretorius]: https://github.com/Jaco-Pretorius
 [@NathanSudell]: https://github.com/NathanSudell

data/lib/zucchini/feature.rb

@@ -36,16 +36,18 @@ class Zucchini::Feature
   end
 
   def screenshots(process = true)
-    log = Zucchini::Log.new(run_path) if process && @screenshot_log_exists
+    log = Zucchini::Log.new(run_path) if process && Zucchini::Log.exists?(run_path)
     
     @screenshots ||= Dir.glob("#{run_path}/*.png").sort.map do |file|
+      next unless Zucchini::Screenshot.valid?(file)
+
       screenshot = Zucchini::Screenshot.new(file, @device, log)
       if process
         screenshot.mask
         screenshot.compare
       end
       screenshot
-    end + unmatched_pending_screenshots
+    end.compact + unmatched_pending_screenshots
   end
 
   def stats
@@ -69,7 +71,7 @@ class Zucchini::Feature
         @js_exception = true if (out.match /JavaScript error/) || (out.match /Instruments\ .{0,5}\ Error\ :/ )
       ensure
         `rm -rf instrumentscli*.trace`
-        @screenshot_log_exists = Zucchini::Log.parse_automation_log(run_path)
+        Zucchini::Log.parse_automation_log(run_path)
       end
     end
   end

data/lib/zucchini/log.rb

@@ -6,15 +6,11 @@ class Zucchini::Log
   attr_reader :screenshot_log_path
 
   def initialize(path)
-    @screenshot_log_path = File.join(path, YAML_FILE)
+    @screenshot_log_path = Zucchini::Log.screenshot_log_path(path)
     raise "Screenshot log not found at #{@screenshot_log_path}" unless File.exists?(@screenshot_log_path)
     @screenshots = File.open(@screenshot_log_path, 'r') { |f| YAML.load(f) }
   end
 
-  def exists?
-    @screenshots != nil
-  end
-
   def screenshot_metadata(sequence_number)
     raise "Invalid screenshot sequence number #{sequence_number}" if sequence_number > @screenshots.size
     @screenshots[sequence_number - 1]
@@ -54,6 +50,14 @@ class Zucchini::Log
       false
     end
   end
+
+  def self.exists?(path)
+    File.exists?(screenshot_log_path(path))
+  end
+
+  def self.screenshot_log_path(path)
+     File.join(path, YAML_FILE)
+  end
 end
 
      

data/lib/zucchini/screenshot.rb

@@ -104,6 +104,10 @@ class Zucchini::Screenshot
     end
   end
 
+  def self.valid?(file_path)
+    FILE_NAME_PATTERN =~ File.basename(file_path)
+  end
+
   private
   def mask_path(path)
     suffix = case @orientation

data/lib/zucchini/uia/lib/mechanic.js

@@ -148,7 +148,7 @@ var mechanic = (function() {
     };
 
     UIAElement.prototype.getElementsByAttr = function(attr, value) {
-        return $.map(this.elements().toArray(), function(el) {
+        return $.map(this.elements(), function(el) {
             var matches = el.getElementsByAttr(attr, value),
                 val = el[attr]
             if (typeof val == 'function') val = val.apply(el)
@@ -158,7 +158,7 @@ var mechanic = (function() {
         })
     }
     UIAElement.prototype.getElementsByType = function(type) {
-        return $.map(this.elements().toArray(), function(el) {
+        return $.map(this.elements(), function(el) {
             var matches = el.getElementsByType(type);
             if (el.isType(type)) matches.unshift(el);
             return matches;

data/lib/zucchini/uia/lib/util.coffee

@@ -15,7 +15,7 @@ raise = (message) -> throw new Error(message)
 # Handle both cases
 _elementFrom = (finder) ->
   res = finder()
-  res = res[0] if (typeof res.length is 'number')
+  res = res[0] if res and typeof res.length is 'number'
   res
 
 # Execute a finder function until the element appears
@@ -24,14 +24,15 @@ wait = (finder) ->
   counter = 0
   element = null
 
-  while not found and (counter < 10)
+  while not found and counter < 10
     element = _elementFrom finder
 
-    if element? and element.isValid() and element.isVisible()
+    if element? and element.checkIsValid() and element.isVisible()
       found = true
     else
       target.delay 0.5
       counter++
+
   if found then element else false
 
 rotateTo = (orientation) ->

data/lib/zucchini/uia/screen.coffee

@@ -38,8 +38,7 @@ class Screen
     'Wait for "([^"]*)" second[s]*$': (seconds) -> target.delay(seconds)
 
     'Type "([^"]*)" in the "([^"]*)" field$': (text, name) ->
-      @element(name).tap()
-      app.keyboard().typeString text
+      $(@element(name)).input(text)
 
     'Clear the "([^"]*)" field$': (name) -> @element(name).setValue ''
 

data/lib/zucchini/version.rb

@@ -1,3 +1,3 @@
 module Zucchini
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zucchini-ios
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-18 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3231635061301993483
+      hash: 2982676141383125946
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23