iCuke 0.4.9 → 0.4.10

data/History.txt

@@ -1,3 +1,9 @@
+== 0.4.10 (2010-04-23)
+
+== Features
+* Add "within" support to "should see" steps
+* Print full UI hierarchy to allow for more powerful tests
+
 == 0.4.8 (2010-04-22)
 
 === Stability

data/VERSION

@@ -1 +1 @@
-0.4.9
+0.4.10

data/ext/iCuke/Viewer.m

@@ -22,27 +22,29 @@ static Viewer *sharedViewer = nil;
 
 -(void)appendOpenToXml:(NSMutableString*)xml {
 	[xml appendFormat: @"<%@", NSStringFromClass([self class])];
-	[self appendTraitsToXml: xml];
-	if ([[self accessibilityLabel] length] > 0) {
-		NSString *escaped_label = [self accessibilityLabel];
-		escaped_label = [escaped_label stringByReplacingOccurrencesOfString: @"&" withString: @"&amp;"];
-		escaped_label = [escaped_label stringByReplacingOccurrencesOfString: @"'" withString: @"&quot;"];
-		escaped_label = [escaped_label stringByReplacingOccurrencesOfString: @"\\" withString: @"&#39;"];
-		escaped_label = [escaped_label stringByReplacingOccurrencesOfString: @">" withString: @"&gt;"];
-		escaped_label = [escaped_label stringByReplacingOccurrencesOfString: @"<" withString: @"&lt;"];
-		[xml appendFormat: @"label=\"%@\" ", escaped_label];
-	}
-	if ([[self accessibilityHint] length] > 0) {
-		[xml appendFormat: @"hint=\"%@\" ", [self accessibilityHint]];
-	}
-	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: @"&#39;"];
-		escaped_value = [escaped_value stringByReplacingOccurrencesOfString: @">" withString: @"&gt;"];
-		escaped_value = [escaped_value stringByReplacingOccurrencesOfString: @"<" withString: @"&lt;"];
-		[xml appendFormat: @"value=\"%@\" ", escaped_value];
+	if ([self isAccessibilityElement]) {
+		[self appendTraitsToXml: xml];
+		if ([[self accessibilityLabel] length] > 0) {
+			NSString *escaped_label = [self accessibilityLabel];
+			escaped_label = [escaped_label stringByReplacingOccurrencesOfString: @"&" withString: @"&amp;"];
+			escaped_label = [escaped_label stringByReplacingOccurrencesOfString: @"'" withString: @"&quot;"];
+			escaped_label = [escaped_label stringByReplacingOccurrencesOfString: @"\\" withString: @"&#39;"];
+			escaped_label = [escaped_label stringByReplacingOccurrencesOfString: @">" withString: @"&gt;"];
+			escaped_label = [escaped_label stringByReplacingOccurrencesOfString: @"<" withString: @"&lt;"];
+			[xml appendFormat: @"label=\"%@\" ", escaped_label];
+		}
+		if ([[self accessibilityHint] length] > 0) {
+			[xml appendFormat: @"hint=\"%@\" ", [self accessibilityHint]];
+		}
+		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: @"&#39;"];
+			escaped_value = [escaped_value stringByReplacingOccurrencesOfString: @">" withString: @"&gt;"];
+			escaped_value = [escaped_value stringByReplacingOccurrencesOfString: @"<" withString: @"&lt;"];
+			[xml appendFormat: @"value=\"%@\" ", escaped_value];
+		}
 	}
 	[xml appendString: @">"];
 }
@@ -123,8 +125,9 @@ static Viewer *sharedViewer = nil;
 @implementation UIView (Viewer)
 
 -(void)appendToXml:(NSMutableString *)xml {
+	[self appendOpenToXml: xml];
+
 	if ([self isAccessibilityElement]) {
-		[self appendOpenToXml: xml];
 		[self appendFrameToXml: xml];
 	}
 
@@ -133,10 +136,7 @@ static Viewer *sharedViewer = nil;
 	}
 	
 	[self appendChildrenToXml: xml];
-
-	if ([self isAccessibilityElement]) {
-		[self appendCloseToXml: xml];
-	}
+	[self appendCloseToXml: xml];
 }
 
 @end

data/iCuke.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{iCuke}
-  s.version = "0.4.9"
+  s.version = "0.4.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob Holland"]
-  s.date = %q{2010-04-22}
+  s.date = %q{2010-04-23}
   s.description = %q{Cucumber support for iPhone applications}
   s.email = %q{rob@the-it-refinery.co.uk}
   s.extensions = ["ext/iCuke/Rakefile"]

data/lib/icuke/cucumber.rb

@@ -32,8 +32,8 @@ class ICukeWorld
     @simulator.record
   end
   
-  def can_see?(text)
-    page.xpath(%Q{//*[contains(., "#{text}") or contains(@label, "#{text}") or contains(@value, "#{text}")]}).any?
+  def can_see?(text, scope = '')
+    page.xpath(%Q{#{scope}//*[contains(., "#{text}") or contains(@label, "#{text}") or contains(@value, "#{text}")]}).any?
   end
   
   def onscreen?(x, y)
@@ -178,12 +178,12 @@ Given /^(?:"([^\"]*)" from )?"([^\"]*)" is loaded in the simulator(?: using sdk
          :env => { 'DYLD_INSERT_LIBRARIES' => LIBICUKE }
 end
 
-Then /^I should see "([^\"]*)"$/ do |text|
-  raise %Q{Content "#{text}" not found in: #{response}} unless can_see?(text)
+Then /^I should see "([^\"]*)"(?: within "([^\"]*)")?$/ do |text, scope|
+  raise %Q{Content "#{text}" not found in: #{response}} unless can_see?(text, scope)
 end
 
-Then /^I should not see "([^\"]*)"$/ do |text|
-  raise %Q{Content "#{text}" was found but was not expected in: #{response}} if can_see?(text)
+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)
 end
 
 When /^I tap "([^\"]*)"$/ do |label|

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 9
-  version: 0.4.9
+  - 10
+  version: 0.4.10
 platform: ruby
 authors: 
 - Rob Holland
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 +01:00
+date: 2010-04-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency