spreewald 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 415633e7a052e115f9212a4cff6afd6a6aa248d8
-  data.tar.gz: acaba4221f5ee0fc9eb876ce7f0b9fed31d93d50
+  metadata.gz: a96ad90241f95da1aad6a504ca9a4b632b6aa140
+  data.tar.gz: 98203ad1472926314f97f49115de31f135b021d8
 SHA512:
-  metadata.gz: aada1464402a29e3bfb0ad168821a48a4cfe9c65376a48ec33cadbb32237d45b28518de6ee02c888d2297c634f366fdc379a5c9bdb0464e5d5d8e005c1f25be3
-  data.tar.gz: 26bfef269fdc97e9110690bc4583baf944707d1aa6c27fd0cdbd579240f8e788636feecfdeb0834f995df72196b75026da22b26e41661a9c1105c6b77b7db5dd
+  metadata.gz: 622f1028d8f4077591eeccc1f4afbfe46e574022ece90da191796c6d1c6634ceec82256649922156a76574594e302aa639bfde5b5db4ccebd0892844606dfd2d
+  data.tar.gz: 5838a95f80ed9d08e09844a4e8d243d72cebd75cd358c31bc9a9406f657770edfde61dca032ac6d0e703371e3e1207f5015a1d85182adc0c621f5a85f766ba15

data/README.md

@@ -550,30 +550,30 @@ deprecation notice. Decide for yourself whether you want to use them:
 
 
 
-* **Then I should (not )?see an element "..."**
-
-  
-
-
-* **Then I should (not )?see ((a |an |the )?("...")|...) element**
+* **Then I should (not )?see an element "(...)"**
 
   Check that an element with the given selector is present on the page.
   
   Example:
   
-      Then I should see a ".panel" element
-      Then I should not see ".sidebar" element
-      Then I should see the ".twitter-timeline" element
+      Then I should see an element ".panel"
+      Then I should not see an element ".sidebar"
+      Then I should see the an element ".twitter-timeline"
   
   We recommend to [define a `selector_for` method](https://github.com/makandra/spreewald/blob/master/examples/selectors.rb) in `features/support/selectors.rb`
   so you can refer to the selector in plain English:
   
-      Then I should see a panel element
-      Then I should not see a sidebar element
-      Then I should see the Twitter timeline element
+      Then I should see an element for the panel
+      Then I should not an element for the sidebar
+      Then I should see an element for the Twitter timeline
 
 
 
+* **Then I should (not )?see an element for ...**
+
+  
+
+
 * **Then I should get a text response**
 
   Checks that the result has content type `text/plain`

data/lib/spreewald/web_steps.rb

@@ -39,12 +39,16 @@ require 'cgi'
 #
 #       Then I should see "some text" within ".page_body"
 When /^(.*) within (.*[^:])$/ do |nested_step, parent|
-  with_scope(parent) { step(nested_step) }
+  patiently do
+    with_scope(parent) { step(nested_step) }
+  end
 end
 
 # nodoc
 When /^(.*) within (.*[^:]):$/ do |nested_step, parent, table_or_string|
-  with_scope(parent) { step("#{nested_step}:", table_or_string) }
+  patiently do
+    with_scope(parent) { step("#{nested_step}:", table_or_string) }
+  end
 end
 
 Given /^(?:|I )am on (.+)$/ do |page_name|
@@ -469,32 +473,31 @@ Then /^"([^"]*)" should link to "([^"]*)"$/ do |link_label, target|
   end
 end
 
-Then /^I should (not )?see an element "([^"]*)"$/ do |negate, selector|
-  warn %(The step 'I should see an element "..."' is deprecated. Please use 'I should see a "..." element instead')
-  expectation = negate ? :should_not : :should
-  patiently do
-    page.send(expectation, have_css(selector))
-  end
-end
-
 # Check that an element with the given selector is present on the page.
 #
 # Example:
 #
-#     Then I should see a ".panel" element
-#     Then I should not see ".sidebar" element
-#     Then I should see the ".twitter-timeline" element
+#     Then I should see an element ".panel"
+#     Then I should not see an element ".sidebar"
+#     Then I should see the an element ".twitter-timeline"
 #
 # We recommend to [define a `selector_for` method](https://github.com/makandra/spreewald/blob/master/examples/selectors.rb) in `features/support/selectors.rb`
 # so you can refer to the selector in plain English:
 #
-#     Then I should see a panel element
-#     Then I should not see a sidebar element
-#     Then I should see the Twitter timeline element
+#     Then I should see an element for the panel
+#     Then I should not an element for the sidebar
+#     Then I should see an element for the Twitter timeline
 #
-Then /^I should (not )?see (?:(?:a |an |the )?("[^"]+")|([^"].*?)) element$/ do |negate, locator_with_quotes, locator_without_quotes|
+Then /^I should (not )?see an element "([^"]+)"$/ do |negate, selector|
+  expectation = negate ? :should_not : :should
+  patiently do
+    page.send(expectation, have_css(selector))
+  end
+end
+
+Then /^I should (not )?see an element for (.*?)$/ do |negate, locator|
   expectation = negate ? :should_not : :should
-  selector = _selector_for(locator_with_quotes || locator_without_quotes)
+  selector = _selector_for(locator)
   patiently do
     page.send(expectation, have_css(selector))
   end

data/lib/spreewald_support/version.rb

@@ -1,3 +1,3 @@
 module Spreewald
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 end

data/tests/shared/app/views/static_pages/within.html.haml

@@ -0,0 +1,4 @@
+.container1
+  .child1
+
+.container2

data/tests/shared/features/shared/web_steps.feature

@@ -86,9 +86,13 @@ Feature: Web steps
 
   Scenario: /^I should (not )?see (?:|a|an |the )(.*?) element$/
     When I go to "/static_pages/see_element"
-    Then I should see a ".panel" element
-      And I should see the ".panel" element
-      And I should see a panel element
-      But I should not see a ".timeline" element
-      And I should not see the ".timeline" element
-      And I should not see the timeline element
+    Then I should see an element ".panel"
+      And I should see an element for a panel
+      But I should not see an element ".timeline"
+      And I should not see an element for the timeline
+
+  Scenario: /^(.*) within (.*[^:])$/
+    When I go to "/static_pages/within"
+    Then I should see an element ".child1" within ".container1"
+      But I should not see an element ".child1" within ".container2"
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreewald
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Tobias Kraze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
@@ -149,6 +149,7 @@ files:
 - tests/shared/app/views/static_pages/link_to_home.html.haml
 - tests/shared/app/views/static_pages/see_element.html.haml
 - tests/shared/app/views/static_pages/visibility.html.haml
+- tests/shared/app/views/static_pages/within.html.haml
 - tests/shared/app/views/tables/table1.html.haml
 - tests/shared/config/cucumber.yml
 - tests/shared/config/database.yml
@@ -249,6 +250,7 @@ test_files:
 - tests/shared/app/views/static_pages/link_to_home.html.haml
 - tests/shared/app/views/static_pages/see_element.html.haml
 - tests/shared/app/views/static_pages/visibility.html.haml
+- tests/shared/app/views/static_pages/within.html.haml
 - tests/shared/app/views/tables/table1.html.haml
 - tests/shared/config/cucumber.yml
 - tests/shared/config/database.yml