From 77e8e03df5c6f600af658be201c6019b77655e37 Mon Sep 17 00:00:00 2001 From: Jay Moore Date: Thu, 12 Jun 2014 14:05:31 -0400 Subject: [PATCH 1/5] loosen xcodeproj dependency --- gem/frank-cucumber.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gem/frank-cucumber.gemspec b/gem/frank-cucumber.gemspec index ec0214d..1a073e9 100644 --- a/gem/frank-cucumber.gemspec +++ b/gem/frank-cucumber.gemspec @@ -28,7 +28,7 @@ Gem::Specification.new do |s| s.add_dependency( "json", ["1.8.1"] ) # TODO: figure out how to be more permissive as to which JSON gems we allow s.add_dependency( "dnssd", ["~>2.0"] ) s.add_dependency( "thor", ["~>0.18.1"] ) - s.add_dependency( "xcodeproj", ["~>0.14.1"] ) + s.add_dependency( "xcodeproj", ["~>0.14"] ) s.add_development_dependency( "rr" ) s.add_development_dependency( "yard" ) From 274980b2f6c9f977bc917c0772199e22f55cf72c Mon Sep 17 00:00:00 2001 From: Jay Moore Date: Thu, 12 Jun 2014 14:33:33 -0400 Subject: [PATCH 2/5] replace deprecated should with expect --- gem/lib/frank-cucumber/frank_helper.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gem/lib/frank-cucumber/frank_helper.rb b/gem/lib/frank-cucumber/frank_helper.rb index 2c91374..feb0a94 100644 --- a/gem/lib/frank-cucumber/frank_helper.rb +++ b/gem/lib/frank-cucumber/frank_helper.rb @@ -127,11 +127,15 @@ def element_exists( selector ) # @raise an rspec exception if the assertion fails # @see #element_exists, #check_element_does_not_exist def check_element_exists( selector ) - element_exists( selector ).should be_true, "Could not find element matching selector (#{selector})" + if (!expect(element_exists(selector))) + raise "Could not find element matching selector (#{selector})" + end end def check_element_exists_and_is_visible( selector ) - element_is_not_hidden( selector ).should be_true, "Could not find visible element matching selector (#{selector})" + if (!expect(element_is_not_hidden(selector)) + raise "Could not find visible element matching selector (#{selector})" + end end # Assert whether there are no views in the current view heirarchy which match the specified selector. @@ -139,7 +143,9 @@ def check_element_exists_and_is_visible( selector ) # @raise an rspec exception if the assertion fails # @see #element_exists, #check_element_exists def check_element_does_not_exist( selector ) - element_exists( selector ).should be_false, "Found element matching selector when it should not exist (#{selector})" + if (!expect(element_exists(selector))) + raise "Found element matching selector when it should not exist (#{selector})" + end end def check_element_does_not_exist_or_is_not_visible( selector ) From c4172126bb7ddb43c4f14ac6b0453779bf120683 Mon Sep 17 00:00:00 2001 From: Jay Moore Date: Fri, 13 Jun 2014 09:26:42 -0400 Subject: [PATCH 3/5] add missing bracket --- gem/lib/frank-cucumber/frank_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gem/lib/frank-cucumber/frank_helper.rb b/gem/lib/frank-cucumber/frank_helper.rb index feb0a94..aaf6a41 100644 --- a/gem/lib/frank-cucumber/frank_helper.rb +++ b/gem/lib/frank-cucumber/frank_helper.rb @@ -133,7 +133,7 @@ def check_element_exists( selector ) end def check_element_exists_and_is_visible( selector ) - if (!expect(element_is_not_hidden(selector)) + if (!expect(element_is_not_hidden(selector))) raise "Could not find visible element matching selector (#{selector})" end end From e7443b80ec354a2ba6b349d6616f2d3b8f174d16 Mon Sep 17 00:00:00 2001 From: Nathaniel Hamming Date: Mon, 7 Jul 2014 13:01:13 -0300 Subject: [PATCH 4/5] Fix for I should see step definition --- gem/lib/frank-cucumber/frank_helper.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gem/lib/frank-cucumber/frank_helper.rb b/gem/lib/frank-cucumber/frank_helper.rb index aaf6a41..e37b604 100644 --- a/gem/lib/frank-cucumber/frank_helper.rb +++ b/gem/lib/frank-cucumber/frank_helper.rb @@ -127,9 +127,7 @@ def element_exists( selector ) # @raise an rspec exception if the assertion fails # @see #element_exists, #check_element_does_not_exist def check_element_exists( selector ) - if (!expect(element_exists(selector))) - raise "Could not find element matching selector (#{selector})" - end + expect(element_exists(selector)).to be_true, "Could not find element matching selector (#{selector})" end def check_element_exists_and_is_visible( selector ) From da1aa4382222894223a51c1fd35774401c69b391 Mon Sep 17 00:00:00 2001 From: Nathaniel Hamming Date: Mon, 7 Jul 2014 13:06:34 -0300 Subject: [PATCH 5/5] updated other expect() --- gem/lib/frank-cucumber/frank_helper.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gem/lib/frank-cucumber/frank_helper.rb b/gem/lib/frank-cucumber/frank_helper.rb index e37b604..e88ec47 100644 --- a/gem/lib/frank-cucumber/frank_helper.rb +++ b/gem/lib/frank-cucumber/frank_helper.rb @@ -131,9 +131,7 @@ def check_element_exists( selector ) end def check_element_exists_and_is_visible( selector ) - if (!expect(element_is_not_hidden(selector))) - raise "Could not find visible element matching selector (#{selector})" - end + expect(element_is_not_hidden(selector)).to be_true, "Could not find visible element matching selector (#{selector})" end # Assert whether there are no views in the current view heirarchy which match the specified selector. @@ -141,9 +139,7 @@ def check_element_exists_and_is_visible( selector ) # @raise an rspec exception if the assertion fails # @see #element_exists, #check_element_exists def check_element_does_not_exist( selector ) - if (!expect(element_exists(selector))) - raise "Found element matching selector when it should not exist (#{selector})" - end + expect(element_exists(selector)).to be_true, "Found element matching selector when it should not exist (#{selector})" end def check_element_does_not_exist_or_is_not_visible( selector )