zucchini-ios 0.5.4 → 0.5.5

data/lib/config.rb

@@ -16,10 +16,6 @@ module Zucchini
       @@config['app']
     end
   
-    def self.template
-      @@config['template']
-    end
-  
     def self.resolution_name(dimension)   
       @@config['resolutions'][dimension.to_i]
     end

data/lib/feature.rb

@@ -1,6 +1,7 @@
 class Zucchini::Feature
   attr_accessor :path
   attr_accessor :device
+  attr_accessor :template
   attr_accessor :stats
   
   attr_reader :succeeded
@@ -45,9 +46,14 @@ class Zucchini::Feature
   def compile_js
     zucchini_base_path = File.expand_path("#{File.dirname(__FILE__)}/..")
   
-    feature_text = File.open("#{@path}/feature.zucchini").read.gsub(/#.+\n/,"").gsub(/\n/, "\\n")
+    feature_text = File.open("#{@path}/feature.zucchini").read.gsub(/\#.+[\z\n]?/,"").gsub(/\n/, "\\n")
     File.open("#{run_data_path}/feature.coffee", "w+") { |f| f.write("Zucchini.run('#{feature_text}')") }
-    `coffee -o #{run_data_path} -j #{run_data_path}/feature.js -c #{zucchini_base_path}/lib/uia #{@path}/../support/screens #{run_data_path}/feature.coffee`
+
+    cs_paths  = "#{zucchini_base_path}/lib/uia #{@path}/../support/screens"
+    cs_paths += " #{@path}/../support/lib" if File.exists?("#{@path}/../support/lib")
+    cs_paths += " #{run_data_path}/feature.coffee"
+    
+    `coffee -o #{run_data_path} -j #{run_data_path}/feature.js -c #{cs_paths}`
   end
 
   def collect
@@ -58,7 +64,7 @@ class Zucchini::Feature
       device_params = (@device[:name] == "iOS Simulator") ? "" : "-w #{@device[:udid]}"
       
       begin
-        out = `instruments #{device_params} -t #{Zucchini::Config.template} #{Zucchini::Config.app} -e UIASCRIPT #{run_data_path}/feature.js -e UIARESULTSPATH #{run_data_path} 2>&1`
+        out = `instruments #{device_params} -t #{@template} #{Zucchini::Config.app} -e UIASCRIPT #{run_data_path}/feature.js -e UIARESULTSPATH #{run_data_path} 2>&1`
         puts out
         # Hack. Instruments don't issue error return codes when JS exceptions occur
         raise "Instruments run error" if (out.match /JavaScript error/) || (out.match /Instruments\ .{0,5}\ Error\ :/ )

data/lib/runner.rb

@@ -16,6 +16,8 @@ class Zucchini::Runner < Clamp::Command
     raise "ZUCCHINI_DEVICE environment variable not set" unless ENV['ZUCCHINI_DEVICE']
     @device = Zucchini::Config.device(ENV['ZUCCHINI_DEVICE'])   
     
+    @template = detect_template
+    
     exit run 
   end
   
@@ -23,7 +25,8 @@ class Zucchini::Runner < Clamp::Command
     compare_threads = {}
     
     features.each do |f|
-      f.device = @device
+      f.device   = @device
+      f.template = @template
       
       if    collect? then f.collect
       elsif compare? then f.compare
@@ -64,4 +67,11 @@ class Zucchini::Runner < Clamp::Command
   def detection_error(path)
     "#{path} is not a feature directory"
   end
+  
+  def detect_template
+    path  = `xcode-select -print-path`.gsub(/\n/, '')
+    path += "/Platforms/iPhoneOS.platform/Developer/Library/Instruments/PlugIns/AutomationInstrument.bundle/Contents/Resources/Automation.tracetemplate"
+    raise "Instruments template at #{path} does not exist" unless File.exists? path
+    path
+  end
 end

data/lib/uia/base.coffee

@@ -16,7 +16,8 @@ puts = (text) ->
   UIALogger.logMessage text
 
 target = UIATarget.localTarget()
-view   = target.frontMostApp().mainWindow()
+app    = target.frontMostApp()
+view   = app.mainWindow()
 
 target.waitForElement = (element) ->
   return  unless element

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Zucchini
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/spec/lib/feature_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Zucchini::Feature do
+  let(:path)    { './spec/sample_setup/feature_one' }
+  let(:feature) { Zucchini::Feature.new(path) }
+  
+  after(:all) { FileUtils.rm_rf Dir.glob("#{path}/run_data/feature.*") }
+  
+  describe "#compile_js" do
+    before { feature.compile_js }
+    
+    it "should strip comments from the feature file" do
+      File.read("#{feature.run_data_path}/feature.coffee").index('#').should be_nil
+    end
+    
+    describe "feature.js output" do
+      subject { File.read("#{feature.run_data_path}/feature.js") }
+    
+      it "should include screen definitions" do
+        should match /SplashScreen = \(function/
+      end
+      
+      it "should include Zucchini runtime" do
+        should match /Zucchini.run = /
+      end
+      
+      it "should include custom libraries from support/lib" do
+        should match /Helpers.example = /
+      end
+    end
+  end
+end

data/spec/sample_setup/support/config.yml

@@ -1,5 +1,4 @@
 app: MyApp.app
-template: '/Developer/Platforms/iPhoneOS.platform/Developer/Library/Instruments/PlugIns/AutomationInstrument.bundle/Contents/Resources/Automation.tracetemplate'
 
 devices:
   My iDevice: 

data/spec/sample_setup/support/lib/helpers.coffee

@@ -0,0 +1,3 @@
+class Helpers
+  @example: ->
+   puts "Helpers.example method is available in your screen classes"

data/templates/project/features/support/config.yml

@@ -1,5 +1,4 @@
 app: MyApp.app
-template: '/Developer/Platforms/iPhoneOS.platform/Developer/Library/Instruments/PlugIns/AutomationInstrument.bundle/Contents/Resources/Automation.tracetemplate'
 
 devices:
   My iDevice: 

data/templates/project/features/support/lib/helpers.coffee

@@ -0,0 +1,3 @@
+class Helpers
+  @example: ->
+   puts "Helpers.example method is available in your screen classes"

metadata

@@ -2,7 +2,7 @@
 name: zucchini-ios
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors: 
 - Vasily Mikhaylichenko
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-28 00:00:00 Z
+date: 2012-04-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: clamp
@@ -76,6 +76,7 @@ files:
 - lib/uia/screen.coffee
 - lib/version.rb
 - spec/lib/config_spec.rb
+- spec/lib/feature_spec.rb
 - spec/lib/generator_spec.rb
 - spec/lib/report_spec.rb
 - spec/lib/runner_spec.rb
@@ -91,6 +92,7 @@ files:
 - spec/sample_setup/feature_two/reference/retina_ios5/06_sign up_spinner_error.png
 - spec/sample_setup/feature_two/run_data/Run 1/06_sign up_spinner.png
 - spec/sample_setup/support/config.yml
+- spec/sample_setup/support/lib/helpers.coffee
 - spec/sample_setup/support/masks/retina_ios5.png
 - spec/sample_setup/support/screens/splash.coffee
 - spec/spec_helper.rb
@@ -101,6 +103,7 @@ files:
 - templates/feature/run_data/.gitignore
 - templates/feature/setup.rb
 - templates/project/features/support/config.yml
+- templates/project/features/support/lib/helpers.coffee
 - templates/project/features/support/masks/ipad_ios5.png
 - templates/project/features/support/masks/low_ios4.png
 - templates/project/features/support/masks/retina_ios5.png
@@ -129,12 +132,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Functional testing framework for iOS-powered devices
 test_files: 
 - spec/lib/config_spec.rb
+- spec/lib/feature_spec.rb
 - spec/lib/generator_spec.rb
 - spec/lib/report_spec.rb
 - spec/lib/runner_spec.rb
@@ -150,6 +154,7 @@ test_files:
 - spec/sample_setup/feature_two/reference/retina_ios5/06_sign up_spinner_error.png
 - spec/sample_setup/feature_two/run_data/Run 1/06_sign up_spinner.png
 - spec/sample_setup/support/config.yml
+- spec/sample_setup/support/lib/helpers.coffee
 - spec/sample_setup/support/masks/retina_ios5.png
 - spec/sample_setup/support/screens/splash.coffee
 - spec/spec_helper.rb