iCuke 0.4.12 → 0.5.1

data/ext/iCuke/Viewer.m

@@ -2,9 +2,6 @@
 
 #import "Viewer.h"
 
-// AX API
-extern Boolean AXAPIEnabled(void);
-
 static Viewer *sharedViewer = nil;
 
 @interface NSObject (UIAccessibilityViewer)
@@ -27,7 +24,8 @@ static Viewer *sharedViewer = nil;
 		if ([[self accessibilityLabel] length] > 0) {
 			NSString *escaped_label = [self accessibilityLabel];
 			escaped_label = [escaped_label stringByReplacingOccurrencesOfString: @"&" withString: @"&"];
-			escaped_label = [escaped_label stringByReplacingOccurrencesOfString: @"'" withString: @"""];
+			escaped_label = [escaped_label stringByReplacingOccurrencesOfString: @"\"" withString: @"""];
+			escaped_label = [escaped_label stringByReplacingOccurrencesOfString: @"'" withString: @"'"];
 			escaped_label = [escaped_label stringByReplacingOccurrencesOfString: @"\\" withString: @"'"];
 			escaped_label = [escaped_label stringByReplacingOccurrencesOfString: @">" withString: @">"];
 			escaped_label = [escaped_label stringByReplacingOccurrencesOfString: @"<" withString: @"&lt;"];
@@ -39,7 +37,8 @@ static Viewer *sharedViewer = nil;
 		if ([[self accessibilityValue] length] > 0) {
 			NSString *escaped_value = [self accessibilityValue];
 			escaped_value = [escaped_value stringByReplacingOccurrencesOfString: @"&" withString: @"&amp;"];
-			escaped_value = [escaped_value stringByReplacingOccurrencesOfString: @"'" withString: @"&quot;"];
+			escaped_value = [escaped_value stringByReplacingOccurrencesOfString: @"\"" withString: @"&quot;"];
+			escaped_value = [escaped_value stringByReplacingOccurrencesOfString: @"'" withString: @"&apos;"];
 			escaped_value = [escaped_value stringByReplacingOccurrencesOfString: @"\\" withString: @"&#39;"];
 			escaped_value = [escaped_value stringByReplacingOccurrencesOfString: @">" withString: @"&gt;"];
 			escaped_value = [escaped_value stringByReplacingOccurrencesOfString: @"<" withString: @"&lt;"];
@@ -134,7 +133,7 @@ static Viewer *sharedViewer = nil;
 	for (UIView *view in self.subviews) {
 		[view appendToXml: xml];
 	}
-	
+
 	[self appendChildrenToXml: xml];
 	[self appendCloseToXml: xml];
 }

data/ext/iCuke/iCukeHTTPServer.m

@@ -341,7 +341,7 @@ SYNTHESIZE_SINGLETON_FOR_CLASS(iCukeHTTPServer);
 		[responseHandlers addObject:handler];
 		[self stopReceivingForFileHandle:incomingFileHandle close:NO];
 
-		[handler startResponse];	
+		[handler startResponse];
 		return;
 	}
 

data/ext/iCuke/iCukeServer.m

@@ -8,22 +8,29 @@
 
 #import "iCukeServer.h"
 #include <unistd.h>
+#include <stdlib.h>
+
+static NSAutoreleasePool *pool;
 
 @implementation iCukeServer
 
 + (void)start {
+	pool = [[NSAutoreleasePool alloc] init];
+    
 	[[iCukeHTTPServer sharediCukeHTTPServer] start];
 
 	NSFileManager *fileManager= [[NSFileManager alloc] init];
 	NSArray *paths;
 
-	NSString *preferences = [NSHomeDirectory() stringByAppendingPathComponent: @"Library/Preferences"];
+	if (!getenv("ICUKE_KEEP_PREFERENCES")) {
+		NSString *preferences = [NSHomeDirectory() stringByAppendingPathComponent: @"Library/Preferences"];
 
-	paths = [fileManager contentsOfDirectoryAtPath: preferences error: NULL];
-	for (NSString *path in paths) {
-		if (![path hasPrefix: @"."]) {
-			NSLog(@"Removing: %@", path);
-			unlink([[preferences stringByAppendingPathComponent: path] cStringUsingEncoding: [NSString defaultCStringEncoding]]);
+		paths = [fileManager contentsOfDirectoryAtPath: preferences error: NULL];
+		for (NSString *path in paths) {
+			if (![path hasPrefix: @"."]) {
+				NSLog(@"Removing: %@", path);
+				unlink([[preferences stringByAppendingPathComponent: path] cStringUsingEncoding: [NSString defaultCStringEncoding]]);
+			}
 		}
 	}
 
@@ -37,10 +44,20 @@
 	}
 }
 
++ (void)stop {
+	[pool release];
+}
+
 @end
 
 void start_server(void) __attribute__((constructor));
 void start_server(void)
 {
-  [iCukeServer start];
+	[iCukeServer start];
+}
+
+void stop_server(void) __attribute__((destructor));
+void stop_server(void)
+{
+	[iCukeServer stop];
 }

data/features/uicatalog.feature

@@ -0,0 +1,20 @@
+Feature: iPhone integration tests
+  In order to test my iphone application
+  As a developer
+  I want cucumber to be able to drive the simulator
+
+  Background:
+    Given "app/UICatalog.xcodeproj" is loaded in the simulator
+
+  Scenario: Pressing buttons
+    When I tap "Buttons"
+    And I tap "Gray"
+
+  Scenario: Switches and sliders
+    When I tap "Controls"
+    And I tap "Standard switch"
+
+  Scenario: Entering text
+    When I tap "TextFields"
+    And I type "A string with symb0ls $!@ and spaces in it" in "Normal"
+    Then I should see "A string with symb0ls $!@ and spaces in it"

data/iCuke.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{iCuke}
-  s.version = "0.4.12"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob Holland"]
-  s.date = %q{2010-04-23}
+  s.date = %q{2010-05-11}
   s.description = %q{Cucumber support for iPhone applications}
   s.email = %q{rob@the-it-refinery.co.uk}
   s.extensions = ["ext/iCuke/Rakefile"]
@@ -24,26 +24,79 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
-     "app/iCuke/.gitignore",
-     "app/iCuke/Classes/FlipsideView.h",
-     "app/iCuke/Classes/FlipsideView.m",
-     "app/iCuke/Classes/FlipsideViewController.h",
-     "app/iCuke/Classes/FlipsideViewController.m",
-     "app/iCuke/Classes/MainView.h",
-     "app/iCuke/Classes/MainView.m",
-     "app/iCuke/Classes/MainViewController.h",
-     "app/iCuke/Classes/MainViewController.m",
-     "app/iCuke/Classes/iCukeAppDelegate.h",
-     "app/iCuke/Classes/iCukeAppDelegate.m",
-     "app/iCuke/FlipsideView.xib",
-     "app/iCuke/MainView.xib",
-     "app/iCuke/MainWindow.xib",
-     "app/iCuke/SniffingView.h",
-     "app/iCuke/SniffingView.m",
-     "app/iCuke/iCuke-Info.plist",
-     "app/iCuke/iCuke.xcodeproj/project.pbxproj",
-     "app/iCuke/iCuke_Prefix.pch",
-     "app/iCuke/main.m",
+     "app/.gitignore",
+     "app/AlertsViewController.h",
+     "app/AlertsViewController.m",
+     "app/AppDelegate.h",
+     "app/AppDelegate.m",
+     "app/ButtonsViewController.h",
+     "app/ButtonsViewController.m",
+     "app/Constants.h",
+     "app/ControlsViewController.h",
+     "app/ControlsViewController.m",
+     "app/ImagesViewController.h",
+     "app/ImagesViewController.m",
+     "app/Info.plist",
+     "app/MainViewController.h",
+     "app/MainViewController.m",
+     "app/Picker/CustomPickerDataSource.h",
+     "app/Picker/CustomPickerDataSource.m",
+     "app/Picker/CustomView.h",
+     "app/Picker/CustomView.m",
+     "app/PickerViewController.h",
+     "app/PickerViewController.m",
+     "app/Prefix.pch",
+     "app/ReadMe.txt",
+     "app/SearchBarController.h",
+     "app/SearchBarController.m",
+     "app/SegmentViewController.h",
+     "app/SegmentViewController.m",
+     "app/TextFieldController.h",
+     "app/TextFieldController.m",
+     "app/TextViewController.h",
+     "app/TextViewController.m",
+     "app/ToolbarViewController.h",
+     "app/ToolbarViewController.m",
+     "app/TransitionViewController.h",
+     "app/TransitionViewController.m",
+     "app/UICatalog.xcodeproj/project.pbxproj",
+     "app/WebViewController.h",
+     "app/WebViewController.m",
+     "app/en.lproj/AlertsViewController.xib",
+     "app/en.lproj/ButtonsViewController.xib",
+     "app/en.lproj/ControlsViewController.xib",
+     "app/en.lproj/ImagesViewController.xib",
+     "app/en.lproj/Localizable.strings",
+     "app/en.lproj/MainWindow.xib",
+     "app/en.lproj/PickerViewController.xib",
+     "app/en.lproj/SearchBarController.xib",
+     "app/en.lproj/SegmentViewController.xib",
+     "app/en.lproj/TextFieldController.xib",
+     "app/en.lproj/TextViewController.xib",
+     "app/en.lproj/ToolbarViewController.xib",
+     "app/en.lproj/TransitionViewController.xib",
+     "app/en.lproj/WebViewController.xib",
+     "app/images/12-6AM.png",
+     "app/images/12-6PM.png",
+     "app/images/6-12AM.png",
+     "app/images/6-12PM.png",
+     "app/images/Default.png",
+     "app/images/Icon.png",
+     "app/images/UIButton_custom.png",
+     "app/images/blueButton.png",
+     "app/images/orangeslide.png",
+     "app/images/scene1.jpg",
+     "app/images/scene2.jpg",
+     "app/images/scene3.jpg",
+     "app/images/scene4.jpg",
+     "app/images/scene5.jpg",
+     "app/images/segment_check.png",
+     "app/images/segment_search.png",
+     "app/images/segment_tools.png",
+     "app/images/slider_ball.png",
+     "app/images/whiteButton.png",
+     "app/images/yellowslide.png",
+     "app/main.m",
      "ext/iCuke/.gitignore",
      "ext/iCuke/DefaultsResponse.h",
      "ext/iCuke/DefaultsResponse.m",
@@ -79,13 +132,17 @@ Gem::Specification.new do |s|
      "ext/iCuke/json/SBJsonWriter.h",
      "ext/iCuke/json/SBJsonWriter.m",
      "ext/iCuke/libicuke.dylib",
-     "features/icuke.feature",
      "features/support/env.rb",
+     "features/uicatalog.feature",
      "iCuke.gemspec",
      "lib/icuke.rb",
+     "lib/icuke/com.apple.Accessibility.plist",
+     "lib/icuke/core_ext.rb",
      "lib/icuke/cucumber.rb",
+     "lib/icuke/headless.rb",
      "lib/icuke/simulate.rb",
-     "lib/icuke/simulator.rb"
+     "lib/icuke/simulator.rb",
+     "lib/icuke/xcode.rb"
   ]
   s.homepage = %q{http://github.com/unboxed/iCuke}
   s.rdoc_options = ["--charset=UTF-8"]

data/lib/icuke/core_ext.rb

@@ -0,0 +1,26 @@
+require 'net/http'
+
+module RequestWithSocketCheck
+  def self.included(base)
+    base.instance_eval do
+      alias_method :request_without_socket_check, :request
+      alias_method :request, :request_with_socket_check
+    end
+  end
+  
+  def request_with_socket_check(*args)
+    begin
+      request_without_socket_check(*args)
+    rescue NoMethodError => e
+      if e.message =~ /undefined method `closed\?' for nil/
+        raise Errno::ECONNREFUSED
+      else
+        raise e
+      end
+    end
+  end
+end
+
+if Net::HTTP::Revision.to_i == 25851
+  Net::HTTP.send :include, RequestWithSocketCheck
+end

data/lib/icuke/cucumber.rb

@@ -48,19 +48,23 @@ class ICukeWorld
     element =
       page.xpath(
         %Q{//*[#{trait(:button, :updates_frequently, :keyboard_key)} and @label="#{label}" and frame]},
-        %Q{//*[#{trait(:link)} and @value="#{label}" and frame]}
+        %Q{//*[#{trait(:link)} and @value="#{label}" and frame]},
+        %Q{//*[@label="#{label}" and frame]}
       ).first
     
-    raise %Q{No element labelled "#{label}" found in: #{response}} unless element
+    raise %Q{No element labelled "#{label}" found in: #{page}} unless element
     
     # This seems brittle, revist how to fetch the frame without relying on it being the only child
     frame = element.child
     
+    x = frame['x'].to_f
+    y = frame['y'].to_f
+    
     # Hit the element in the middle
-    x = frame['x'].to_f + (frame['width'].to_f / 2)
-    y = frame['y'].to_f + (frame['height'].to_f / 2)
+    x += (frame['width'].to_f / 2)
+    y += (frame['height'].to_f / 2)
     
-    raise %Q{Element "#{label}" is off screen in: #{response}} unless onscreen?(x, y)
+    raise %Q{Element "#{label}" is off screen in: #{page}} unless onscreen?(x, y)
     
     @simulator.fire_event(Tap.new(x, y, options))
     
@@ -73,7 +77,7 @@ class ICukeWorld
   
   def swipe(direction, options = {})
     modifier = [:up, :left].include?(direction) ? -1 : 1
-
+    
     # Just swipe from the middle of an iPhone-dimensioned screen for now
     x = 320 / 2
     y = 480 / 2
@@ -81,9 +85,9 @@ class ICukeWorld
     y2 = y
     
     if [:up, :down].include?(direction)
-      y2 = y + (100 * modifier)
+      y2 = y + (y * modifier)
     else
-      x2 = x + (100 * modifier)
+      x2 = x + (x * modifier)
     end
     
     @simulator.fire_event(Swipe.new(x, y, x2, y2, options))
@@ -145,7 +149,7 @@ class ICukeWorld
     previous_response = response.dup
     while page.xpath(%Q{//*[contains(., "#{text}") or contains(@label, "#{text}") or contains(@value, "#{text}")]}).empty? do
       scroll(options[:direction])
-      raise %Q{Content "#{text}" not found in: #{response}} if response == previous_response
+      raise %Q{Content "#{text}" not found in: #{page}} if response == previous_response
     end
   end
   
@@ -174,6 +178,10 @@ World do
   ICukeWorld.new
 end
 
+After do
+  quit
+end
+
 LIBICUKE = File.expand_path(File.dirname(__FILE__) + '/../../ext/iCuke/libicuke.dylib')
 
 Given /^(?:"([^\"]*)" from )?"([^\"]*)" is loaded in the simulator(?: using sdk (.*))?$/ do |target, project, sdk|
@@ -183,11 +191,11 @@ Given /^(?:"([^\"]*)" from )?"([^\"]*)" is loaded in the simulator(?: using sdk
 end
 
 Then /^I should see "([^\"]*)"(?: within "([^\"]*)")?$/ do |text, scope|
-  raise %Q{Content "#{text}" not found in: #{response}} unless can_see?(text, scope)
+  raise %Q{Content "#{text}" not found in: #{page}} unless can_see?(text, scope)
 end
 
 Then /^I should not see "([^\"]*)"(?: within "([^\"]*)")?$/ do |text, scope|
-  raise %Q{Content "#{text}" was found but was not expected in: #{response}} if can_see?(text, scope)
+  raise %Q{Content "#{text}" was found but was not expected in: #{page}} if can_see?(text, scope)
 end
 
 When /^I tap "([^\"]*)"$/ do |label|
@@ -211,5 +219,5 @@ Then /^I put the phone into recording mode$/ do
 end
 
 Then /^show me the screen$/ do
-  puts response
+  puts page.to_s
 end

data/lib/icuke/headless.rb

@@ -0,0 +1,55 @@
+require 'tmpdir'
+require 'background_process'
+
+module ICuke
+  class Simulator
+    include Timeout
+    
+    def launch(project_file, options = {})
+      options = {
+        :configuration => 'Debug',
+        :env => {}
+      }.merge(options)
+      
+      app_name = File.basename(project_file, '.xcodeproj')
+      directory = "#{File.dirname(project_file)}/build/#{options[:configuration]}-iphonesimulator"
+      
+      ENV['DYLD_ROOT_PATH'] = '/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator3.1.2.sdk'
+      ENV['DYLD_FRAMEWORK_PATH'] = directory
+      ENV['IPHONE_SIMULATOR_ROOT'] = '/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator3.1.2.sdk'
+      home = Dir.mktmpdir
+      FileUtils.mkdir_p File.join(home, 'Library', 'Preferences')
+      FileUtils.cp File.join(File.dirname(__FILE__), 'com.apple.Accessibility.plist'), File.join(home, 'Library', 'Preferences')
+      FileUtils.mkdir File.join(home, 'Documents')
+      ENV['CFFIXED_USER_HOME'] = home
+      ENV['ICUKE_KEEP_PREFERENCES'] = '1'
+      
+      options[:env].each_pair do |k, v|
+        ENV[k] = v
+      end
+      
+      command = "#{directory}/#{app_name}.app/#{app_name} -RegisterForSystemEvents"
+      @pid = fork {
+        STDIN.close
+        STDERR.close
+        STDOUT.close
+        
+        exec(command)
+      }
+      
+      timeout(30) do
+        begin
+          view
+        rescue Errno::ECONNREFUSED
+          sleep(0.5)
+          retry
+        end
+      end
+    end
+    
+    def quit
+      Process.kill('TERM', @pid)
+      Process.wait(@pid)
+    end
+  end
+end

data/lib/icuke/simulator.rb

@@ -1,84 +1,13 @@
+require 'icuke/core_ext'
+if ENV['ICUKE_HEADLESS']
+  require 'icuke/headless'
+else
+  require 'icuke/xcode'
+end
+
 require 'httparty'
-require 'appscript'
-require 'timeout'
 
 module ICuke
-  class XCode
-    def self.app
-      @app ||= Appscript.app('Xcode.app')
-    end
-
-    def self.open_project(project_file)
-      unless open_project?(project_file)
-        app.launch
-        app.open project_file
-      end
-      app.active_project_document.project
-    end
-
-    def self.open_project?(project_file)
-      running? and
-        app.active_project_document.get and
-        app.active_project_document.project.path.get == project_file
-    end
-
-    def self.interface
-      Appscript.app('System Events').application_processes['Xcode']
-    end
-
-    def self.running?
-      app.is_running?
-    end
-
-    def self.quit
-      IPhoneSimulator.quit
-      app.quit if running?
-      sleep(0.2) until !running?
-    end
-
-    def self.status
-      interface.windows[1].static_texts[0].value.get
-    end
-
-    def self.launched_app?
-      status =~ /launched$/
-    end
-
-    def self.installing_app?
-      status =~ /^Installing/
-    end
-
-    def self.with_settings(project, settings, &block)
-      initial_settings = {}
-
-      settings.each_key { |setting| initial_settings[setting] = project.send(setting).get }
-      settings.each_pair do |setting, value|
-        project.send(setting).set value
-      end
-
-      yield
-    ensure
-      initial_settings.each_pair do |setting, value|
-        project.send(setting).set value
-      end if running?
-    end
-  end
-  
-  class IPhoneSimulator
-    def self.app
-      @app ||= Appscript.app('iPhone Simulator.app')
-    end
-    
-    def self.quit
-      app.quit if running?
-      sleep(0.2) until !running?
-    end
-    
-    def self.running?
-      app.is_running?
-    end
-  end
-  
   class Simulator
     include Timeout
     include HTTParty
@@ -86,57 +15,6 @@ module ICuke
     
     class Error < StandardError; end
     
-    def launch(project_file, options = {})
-      options = {
-        :target => nil,
-        :configuration => 'Debug'
-      }.merge(options)
-      
-      # If we don't kill the simulator first the rest of this function becomes
-      # a no-op and we don't land on the applications first page
-      IPhoneSimulator.quit
-      
-      begin
-        project = XCode.open_project(project_file)
-        
-        settings = {
-          :active_build_configuration_type => project.build_configuration_types[options[:configuration]]
-        }
-        if options[:target]
-          settings[:active_target] = project.targets[options[:target]]
-        end
-        
-        XCode.with_settings(project, settings) do
-          executable = project.active_executable.get
-          options[:env].each_pair do |name, value|
-            executable.make :new => :environment_variable,
-                            :with_properties => { :name => name, :value => value, :active => true }
-          end
-          
-          project.launch_
-          
-          sleep(0.5) while XCode.installing_app?
-          
-          unless XCode.launched_app?
-            XCode.quit
-            retry
-          end
-          
-          timeout(30) do
-            begin
-              view
-            rescue Errno::ECONNREFUSED
-              sleep(0.5)
-            end
-          end
-        end
-      end
-    end
-    
-    def quit
-      IPhoneSimulator.quit
-    end
-    
     def view
       get('/view')
     end