calabash-cucumber 0.9.14 → 0.9.15

data/lib/calabash-cucumber/calabash_steps.rb

@@ -270,7 +270,7 @@ end
 
 ### Assertions ###
 Then /^I should see "([^\"]*)"$/ do |expected_mark|
-  res = (element_exists( "view marked:'#{expected_mark}'" ) ||
+  res = (element_exists( "view marked:'#{expected_mark}'" ) or
          element_exists( "view text:'#{expected_mark}'"))
   if not res
     screenshot_and_raise "No element found with mark or text: #{expected_mark}"
@@ -278,8 +278,11 @@ Then /^I should see "([^\"]*)"$/ do |expected_mark|
 end
 
 Then /^I should not see "([^\"]*)"$/ do |expected_mark|
-  check_element_does_not_exist("view marked:'#{expected_mark}'") &&
-      check_element_does_not_exist("view text:'#{expected_mark}'")
+  res = query("view marked:'#{expected_mark}'")
+  res.concat query("view text:'#{expected_mark}'")
+  unless res.empty?
+    screenshot_and_raise "Expected no element with text nor accessibilityLabel: #{expected_mark}, found #{res}"
+  end
 end
 
 Then /^I should see a "([^\"]*)" button$/ do |expected_mark|
@@ -333,13 +336,19 @@ Then /^I see (\d+) (?:input|text) field(?:s)?$/ do |count|
 end
 
 Then /^I should see a "([^\"]*)" (?:input|text) field$/ do |expected_mark|
-  check_element_exists("textField placeholder:'#{expected_mark}'") ||
-      check_element_exists("textField marked:'#{expected_mark}'")
+  res = element_exists("textField placeholder:'#{expected_mark}'") or
+          element_exists("textField marked:'#{expected_mark}'")
+  unless res
+    screenshot_and_raise "Expected textfield with placeholder or accessibilityLabel: #{txt}"
+  end
 end
 
 Then /^I should not see a "([^\"]*)" (?:input|text) field$/ do |expected_mark|
-  check_element_does_not_exist("textField placeholder:'#{expected_mark}'") &&
-      check_element_does_not_exist("textField marked:'#{expected_mark}'")
+  res = query("textField placeholder:'#{expected_mark}'")
+  res.concat query("textField marked:'#{expected_mark}'")
+  unless res.empty?
+    screenshot_and_raise "Expected no textfield with placeholder nor accessibilityLabel: #{txt}, found #{res}"
+  end
 end
 
 

data/lib/calabash-cucumber/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.14"
+    VERSION = "0.9.15"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.14
+  version: 0.9.15
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70280043557400 !ruby/object:Gem::Requirement
+  requirement: &70346973311600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70280043557400
+  version_requirements: *70346973311600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70280043556000 !ruby/object:Gem::Requirement
+  requirement: &70346973310380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70280043556000
+  version_requirements: *70346973310380
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70280043542440 !ruby/object:Gem::Requirement
+  requirement: &70346973309200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70280043542440
+  version_requirements: *70346973309200
 - !ruby/object:Gem::Dependency
   name: slowhandcuke
-  requirement: &70280043541860 !ruby/object:Gem::Requirement
+  requirement: &70346973308360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70280043541860
+  version_requirements: *70346973308360
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
-  requirement: &70280043541060 !ruby/object:Gem::Requirement
+  requirement: &70346973307820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70280043541060
+  version_requirements: *70346973307820
 description: calabash-cucumber drives tests for native iOS apps. You must link your
   app with calabash-ios-server framework to execute tests.
 email: