zucchini-ios 0.5.6 → 0.5.7

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.9.2
+before_install:
+  - npm install coffee-script

data/Gemfile

@@ -1,3 +1,7 @@
 source 'http://rubygems.org'
 
+group :test do
+  gem 'rake'
+end
+
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zucchini-ios (0.5.5)
+    zucchini-ios (0.5.6)
       clamp
 
 GEM
@@ -9,6 +9,7 @@ GEM
   specs:
     clamp (0.5.0)
     diff-lcs (1.1.3)
+    rake (10.0.2)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)
@@ -23,6 +24,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  rake
   rspec
   watchr
   zucchini-ios!

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://api.travis-ci.org/zucchini-src/zucchini.png)](http://travis-ci.org/zucchini-src/zucchini)
+
 Pre-requisites
 --------------
  1. Mac OS X >= 10.6

data/Rakefile

@@ -0,0 +1,6 @@
+require 'rspec/core/rake_task'
+
+desc "Run all RSpec tests"
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/report.rb

@@ -2,29 +2,40 @@ require 'erb'
 require 'lib/report/view'
 
 class Zucchini::Report
-  
-  def self.text(features)
-    features.map do |f|
+
+  def initialize(features, ci = false, html_path = '/tmp/zucchini_report.html')
+    @features, @ci, @html_path = [features, ci, html_path]
+    generate!
+  end
+
+  def text
+    @features.map do |f|
       failed_list = f.stats[:failed].empty? ? "" : "\n\nFailed:\n" + f.stats[:failed].map { |s| "   #{s.file_name}: #{s.diff[1]}" }.join
       summary     = f.stats.map { |key, set| "#{set.length.to_s} #{key}" }.join(", ")
-      
+
       "#{f.name}:\n#{summary}#{failed_list}"
     end.join("\n\n")
   end
-  
-  def self.html(features, ci, report_html_path = "/tmp/zucchini_report.html" )
-    template_path = File.expand_path("#{File.dirname(__FILE__)}/report/template.erb")
-    
-    report = Zucchini::ReportView.new(features, ci) 
-    html   = (ERB.new(File.open(template_path).read)).result(report.get_binding)
-    
-    File.open(report_html_path, 'w+') { |f| f.write(html) }
-    report_html_path
+
+  def html
+    @html ||= begin
+      template_path = File.expand_path("#{File.dirname(__FILE__)}/report/template.erb")
+
+      view = Zucchini::ReportView.new(@features, @ci)
+      compiled = (ERB.new(File.open(template_path).read)).result(view.get_binding)
+
+      File.open(@html_path, 'w+') { |f| f.write(compiled) }
+      compiled
+    end
   end
-  
-  def self.present(features, ci)
-    puts self.text(features)
-    system "open #{self.html(features, ci)}"  
+
+  def generate!
+    log text
+    html
   end
-  
-end
+
+  def open; system "open #{@html_path}"; end
+
+  def log(buf); puts buf; end
+
+end

data/lib/runner.rb

@@ -5,6 +5,8 @@ class Zucchini::Runner < Clamp::Command
 
   option %W(-c --collect), :flag, "only collect the screenshots from the device"
   option %W(-p --compare), :flag, "perform screenshots comparison based on the last collection"
+  option %W(-s --silent),  :flag, "do not open the report"
+
   option "--ci",           :flag, "produce a CI version of the report after comparison"
 
   def execute
@@ -36,7 +38,11 @@ class Zucchini::Runner < Clamp::Command
 
     compare_threads.each { |name, t| t.abort_on_exception = true; t.join }
 
-    Zucchini::Report.present(features, ci?) unless (collect? && !compare?)
+    unless (collect? && !compare?)
+      report = Zucchini::Report.new(features, ci?)
+      report.open unless silent?
+    end
+
     features.inject(true){ |result, feature| result &= feature.succeeded }
   end
 

data/lib/uia/base.coffee

@@ -3,17 +3,23 @@ Function::bind = (context) ->
   fun = this
   ->
     fun.apply context, arguments
-    
+
 String::camelCase = ->
   @replace /([\-\ ][A-Za-z])/g, ($1) ->
     $1.toUpperCase().replace /[\-\ ]/g, ""
 
 extend = (obj, mixin) ->
-  obj[name] = method for name, method of mixin        
+  obj[name] = method for name, method of mixin
   obj
 
-puts = (text) ->
-  UIALogger.logMessage text
+puts = (text) -> UIALogger.logMessage text
+
+# Instruments 4.5 crash when a JS primitive is thrown
+# http://apple.stackexchange.com/questions/69484/unknown-xcode-instruments-crash
+raise = (message) -> throw new Error(message)
+
+# Prevent UIA from auto handling alerts
+UIATarget.onAlert = (alert) -> return true
 
 target = UIATarget.localTarget()
 app    = target.frontMostApp()
@@ -29,7 +35,7 @@ UIAElement.prototype.$ = (name) ->
   elem
 
 target.waitForElement = (element) ->
-  return  unless element
+  return unless element
   found = false
   counter = 0
   while not found and (counter < 10)
@@ -41,12 +47,14 @@ target.waitForElement = (element) ->
       @delay 0.5
       counter++
 
+isNullElement = (elem) -> elem.toString() == "[object UIAElementNil]"
+
 screensCount = 0
 target.captureScreenWithName_ = target.captureScreenWithName
 target.captureScreenWithName = (screenName) ->
   screensCountText = (if (++screensCount < 10) then "0" + screensCount else screensCount)
   @captureScreenWithName_ screensCountText + "_" + screenName
-                                                         
+
 class Zucchini
   @run: (featureText) ->
     sections = featureText.trim().split(/\n\s*\n/)
@@ -55,13 +63,13 @@ class Zucchini
       lines = section.split(/\n/)
 
       screenMatch = lines[0].match(/.+ on the "([^"]*)" screen:$/)
-      throw "Line '#{lines[0]}' doesn't define a screen context" unless screenMatch
+      raise "Line '#{lines[0]}' doesn't define a screen context" unless screenMatch
 
       screenName = screenMatch[1]
       try
         screen = eval("new #{screenName.camelCase()}Screen")
-      catch error
-        throw "Screen '#{screenName}' not defined"
+      catch e
+        raise "Screen '#{screenName}' not defined"
 
       for line in lines.slice(1)
          functionFound = false
@@ -69,5 +77,5 @@ class Zucchini
             match = line.trim().match(new RegExp(regExpText))
             if match
               functionFound = true
-              func.bind(screen)(match[1])
-         throw "Action for line '#{line}' not defined" unless functionFound
+              func.bind(screen)(match[1],match[2])
+         raise "Action for line '#{line}' not defined" unless functionFound

data/lib/uia/screen.coffee

@@ -1,8 +1,8 @@
 class Screen
   constructor: (@name) ->
     if @anchor then target.waitForElement @anchor()
-  
-  elements: {}                           
+
+  elements: {}
   actions :
     'Take a screenshot$' : ->
       target.captureScreenWithName(@name)
@@ -11,11 +11,48 @@ class Screen
       target.captureScreenWithName(name)
 
     'Tap "([^"]*)"$' : (element) ->
-      throw "Element '#{element}' not defined for the screen '#{@name}'" unless @elements[element]
+      raise "Element '#{element}' not defined for the screen '#{@name}'" unless @elements[element]
       @elements[element]().tap()
 
+    'Confirm "([^"]*)"$' : (element) ->
+      @actions['Tap "([^"]*)"$'].bind(this)(element)
+
     'Wait for "([^"]*)" second[s]*$' : (seconds) ->
       target.delay(seconds)
 
-    'Confirm "([^"]*)"$' : (element) ->
-      @actions['Tap "([^"]*)"$'].bind(this)(element)
+    'Type "([^"]*)" in the "([^"]*)" field$': (text,element) ->
+      raise "Element '#{element}' not defined for the screen '#{@name}'" unless @elements[element]
+      @elements[element]().tap()
+      app.keyboard().typeString text
+
+    'Clear the "([^"]*)" field$': (element) ->
+      raise "Element '#{element}' not defined for the screen '#{@name}'" unless @elements[element]
+      @elements[element]().setValue ""
+
+    'Cancel the alert' : ->
+      alert = app.alert()
+      raise "No alert found to dismiss on screen '#{@name}'" if isNullElement alert
+      alert.cancelButton().tap()
+
+    'Confirm the alert' : ->
+      alert = app.alert()
+      raise "No alert found to dismiss on screen '#{@name}'" if isNullElement alert
+      alert.defaultButton().tap()
+
+    'Select the date "([^"]*)"$' : (dateString) ->
+      datePicker = view.pickers()[0]
+      raise "No date picker available to enter the date #{dateString}" unless (not isNullElement datePicker) and datePicker.isVisible()
+      dateParts = dateString.match(/^(\d{2}) (\D*) (\d{4})$/)
+      raise "Date is in the wrong format. Need DD Month YYYY. Got #{dateString}" unless dateParts?
+      # Set Day
+      view.pickers()[0].wheels()[0].selectValue(dateParts[1])
+      # Set Month
+      counter = 0
+      monthWheel = view.pickers()[0].wheels()[1]
+      while monthWheel.value() != dateParts[2] and counter<12
+          counter++
+          monthWheel.tapWithOptions({tapOffset:{x:0.5, y:0.33}})
+          target.delay(0.4)
+      raise "Counldn't find the month #{dateParts[2]}" unless counter <12
+      # Set Year
+      view.pickers()[0].wheels()[2].selectValue(dateParts[3])

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Zucchini
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

data/spec/lib/report_spec.rb

@@ -8,27 +8,24 @@ describe Zucchini::Report do
       screenshot.diff = (num > 3) ? [:passed, nil] : [:failed, "120\n"]
       screenshot
     end
-    
+
     feature = Zucchini::Feature.new("/my/sample/feature")
     feature.device = device
     feature.stub!(:screenshots).and_return(fake_screenshots)
     feature
   end
-  
-  describe "text" do
-    it "should return the correct summary text" do
-      Zucchini::Report.text([feature]).should eq "feature:\n4 passed, 3 failed, 0 pending\n\nFailed:\n   1.screen_1.png: 120\n   2.screen_2.png: 120\n   3.screen_3.png: 120\n"
-    end
-  end
-  
-  describe "HTML" do
-    let(:report_html_path) { "/tmp/zucchini_rspec_report.html" }
-    after { FileUtils.rm(report_html_path) }
-    
-    it "should produce a a correct HTML report" do
-      report = File.open(Zucchini::Report.html([feature], false, report_html_path)).read
-      report.scan(/<dl class="passed.*screen/).length.should eq 4
-      report.scan(/<dl class="failed.*screen/).length.should eq 3
-    end
+
+  let(:html_path) { '/tmp/zucchini_rspec_report.html' }
+  after           { FileUtils.rm(html_path) }
+
+  subject { Zucchini::Report.new([feature], false, html_path) }
+  before  { Zucchini::Report.any_instance.stub(:log) }
+
+  its(:text) { should eq "feature:\n4 passed, 3 failed, 0 pending\n\nFailed:\n   1.screen_1.png: 120\n   2.screen_2.png: 120\n   3.screen_3.png: 120\n" }
+
+  it "should produce a a correct HTML report" do
+    report = subject.html
+    report.scan(/<dl class="passed.*screen/).length.should eq 4
+    report.scan(/<dl class="failed.*screen/).length.should eq 3
   end
-end
+end

data/{zucchini.gemspec → zucchini-ios.gemspec}

@@ -8,17 +8,19 @@ Gem::Specification.new do |s|
   s.date        = Date.today.to_s
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Vasily Mikhaylichenko", "Rajesh Kumar", "Kevin O'Neill"]
-  s.email       = ["vasily@playup.com"]
+  s.email       = ["vaskas@zucchiniframework.org"]
   s.homepage    = "http://www.zucchiniframework.org"
   s.summary     = %q{Functional testing framework for iOS-powered devices}
   s.description = %q{Zucchini follows simple walkthrough scenarios for your iOS app, takes screenshots and compares them to the reference ones.}
 
-  s.add_runtime_dependency "clamp"
+  s.add_runtime_dependency     "clamp"
   s.add_development_dependency "rspec"
   s.add_development_dependency "watchr"
 
-  s.files              = `git ls-files | grep -vE '(web|.watchr)'`.split("\n")
-  s.test_files         = `git ls-files -- spec/*`.split("\n")
-  s.executables        = %w(zucchini)
-  s.require_paths      = ["lib"]
+  s.files         = `git ls-files | grep -vE '(web|.watchr)'`.split("\n")
+  s.test_files    = `git ls-files -- spec/*`.split("\n")
+  s.executables   = %w(zucchini)
+  s.require_paths = ["lib"]
+
+  s.required_ruby_version = '>= 1.9.2'
 end

metadata

@@ -1,74 +1,81 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: zucchini-ios
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 6
-  version: 0.5.6
+version: !ruby/object:Gem::Version
+  version: 0.5.7
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Vasily Mikhaylichenko
 - Rajesh Kumar
 - Kevin O'Neill
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-03 00:00:00 +11:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: clamp
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: watchr
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: watchr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: Zucchini follows simple walkthrough scenarios for your iOS app, takes screenshots and compares them to the reference ones.
-email: 
-- vasily@playup.com
-executables: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Zucchini follows simple walkthrough scenarios for your iOS app, takes
+  screenshots and compares them to the reference ones.
+email:
+- vaskas@zucchiniframework.org
+executables:
 - zucchini
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.md
+- Rakefile
 - bin/zucchini
 - lib/config.rb
 - lib/feature.rb
@@ -119,38 +126,32 @@ files:
 - templates/project/features/support/masks/low_ios4.png
 - templates/project/features/support/masks/retina_ios5.png
 - templates/project/features/support/screens/welcome.coffee
-- zucchini.gemspec
-has_rdoc: true
+- zucchini-ios.gemspec
 homepage: http://www.zucchiniframework.org
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.9.2
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Functional testing framework for iOS-powered devices
-test_files: 
+test_files:
 - spec/lib/config_spec.rb
 - spec/lib/feature_spec.rb
 - spec/lib/generator_spec.rb