spreewald 0.3.4 → 0.3.5

data/README.md

@@ -54,6 +54,7 @@ The "Steps" section is autogenerated by `rake update_readme` from comments in th
 
 ### development_steps.rb
 
+Marks scenario as pending
 
 * **Then it should work**
 
@@ -82,13 +83,13 @@ The "Steps" section is autogenerated by `rake update_readme` from comments in th
 
 * **When I clear my e?mails**
 
-
+  
 
 
 * **Then (an|no) e?mail should have been sent with:**
 
   Example:
-
+  
         Then an email should have been sent with:
           """
           From: max.mustermann@example.com
@@ -97,7 +98,7 @@ The "Steps" section is autogenerated by `rake update_readme` from comments in th
           Body: ...
           Attachments: ...
           """
-
+  
   You can skip lines, of course.
 
 
@@ -108,7 +109,7 @@ The "Steps" section is autogenerated by `rake update_readme` from comments in th
 
 * **Then no e?mail should have been sent**
 
-
+  
 
 
 * **Then I should see "..." in the e?mail**
@@ -124,9 +125,9 @@ The "Steps" section is autogenerated by `rake update_readme` from comments in th
 * **Then that e?mail should have the following lines in the body:**
 
   Only works after you've retrieved the email using "Then an email should have been sent with:"
-
+  
   Example:
-
+  
         And that mail should have the following lines in the body:
           """
           All of these lines
@@ -149,7 +150,7 @@ See [this article](https://makandracards.com/makandra/763-cucumber-step-to-match
 
 * **Then I should( not)? see a table with the following rows( in any order)?**
 
-
+  
 
 
 
@@ -162,7 +163,7 @@ See [this article](https://makandracards.com/makandra/1222-useful-cucumber-steps
 * **When the (date|time) is "(\d{4}-\d{2}-\d{2}( \d{1,2}:\d{2})?)"**
 
   Example:
-
+  
         Given the date is "2012-02-10"
         Given the time is "2012-02-10 13:40"
 
@@ -170,14 +171,14 @@ See [this article](https://makandracards.com/makandra/1222-useful-cucumber-steps
 * **When the time is "(\d{1,2}:\d{2})"**
 
   Example:
-
+  
         Given the time is "13:40"
 
 
 * **When it is (\d+|a|some|a few) (seconds?|minutes?|hours?|days?|weeks?|months?|years?) (later|earlier)**
 
   Example:
-
+  
         When it is 10 minutes later
         When it is a few hours earlier
 
@@ -185,7 +186,7 @@ See [this article](https://makandracards.com/makandra/1222-useful-cucumber-steps
 
 ### web_steps.rb
 
-Most of cucumber-rails' original web steps plus a few of our own.
+Most of cucumber-rails' original web steps plus a few of our own. 
 
 Note that cucumber-rails deprecated all its steps quite a while ago with the following
 deprecation notice. Decide for yourself whether you want to use them:
@@ -210,31 +211,30 @@ deprecation notice. Decide for yourself whether you want to use them:
 
 * **When ... within (.*[^:])**
 
-  You can append 'within [selector]' to any other web step.
-
+  You can append 'within [selector]' to any other web step
   Example:
-
+  
         Then I should see "some text" within ".page_body"
 
 
 * **Given I am on ...**
 
-
+  
 
 
 * **When I go to ...**
 
-
+  
 
 
 * **When I press "..."**
 
-
+  
 
 
 * **When I follow "..."**
 
-
+  
 
 
 * **When I fill in "..." (with|for) "..."**
@@ -269,31 +269,31 @@ deprecation notice. Decide for yourself whether you want to use them:
 
 * **When I attach the file "..." to "..."**
 
-
+  
 
 
 * **Then I should see "..."**
 
   Checks that some text appears on the page
-
+  
   Note that this does not detect if the text might be hidden via CSS
 
 
 * **Then I should see \/([^\/]*)\/**
 
   Checks that a regexp appears on the page
-
+  
   Note that this does not detect if the text might be hidden via CSS
 
 
 * **Then I should not see "..."**
 
-
+  
 
 
 * **Then I should not see \/([^\/]*)\/**
 
-
+  
 
 
 * **Then the "..." field( within ...)? should contain "..."**
@@ -303,7 +303,7 @@ deprecation notice. Decide for yourself whether you want to use them:
 
 * **Then the "..." field( within ...)? should not contain "..."**
 
-
+  
 
 
 * **Then the "..." field should have the error "..."**
@@ -313,32 +313,32 @@ deprecation notice. Decide for yourself whether you want to use them:
 
 * **Then the "..." field should( not)? have an error**
 
-
+  
 
 
 * **Then the "..." field should have no error**
 
-
+  
 
 
 * **Then the radio button "..." should( not)? be (checked|selected)**
 
-
+  
 
 
 * **Then I should be on ...**
 
-
+  
 
 
 * **Then I should have the following query string:**
 
   Example:
-
+  
         I should have the following query string:
           | locale        | de  |
           | currency_code | EUR |
-
+  
   Succeeds when the URL contains the given "locale" and "currency_code" params
 
 
@@ -355,9 +355,9 @@ deprecation notice. Decide for yourself whether you want to use them:
 * **Then I should( not)? see the (number|amount) ([\-\d,\.]+)( (.*?))?**
 
   Better way to test for a number of money amount than a `Then I should see`
-
+  
   Checks that there is unexpected minus sign, decimal places etc.
-
+  
   See [here](https://makandracards.com/makandra/1225-test-that-a-number-or-money-amount-is-shown-with-cucumber) for details
 
 
@@ -378,7 +378,7 @@ deprecation notice. Decide for yourself whether you want to use them:
 
 * **Then nothing should be selected for "..."?**
 
-
+  
 
 
 * **Then "..." should( not)? be an option for "..."**
@@ -398,7 +398,7 @@ deprecation notice. Decide for yourself whether you want to use them:
 
 * **Then I should not see "..." in the HTML**
 
-
+  
 
 
 * **Then I should see an error**
@@ -408,15 +408,15 @@ deprecation notice. Decide for yourself whether you want to use them:
 
 * **When I reload the page**
 
+  
 
 
-
-* **Then "..." should( not)? be visible**
+* **Then (the tag )?"..." should( not)? be visible**
 
   Checks that an element is actually visible, also considering styles
   Within a selenium test, the browser is asked whether the element is really visible
   In a non-selenium test, we only check for ".hidden", ".invisible" or "style: display:none"
-
+  
   More details [here](https://makandracards.com/makandra/1049-capybara-check-that-a-page-element-is-hidden-via-css)
 
 
@@ -428,7 +428,7 @@ deprecation notice. Decide for yourself whether you want to use them:
 * **Then I should (not )?see an element "..."**
 
   Example:
-
+  
         Then I should see an element ".page .container"
 
 
@@ -442,44 +442,44 @@ deprecation notice. Decide for yourself whether you want to use them:
 
   Click a link within an element matching the given selector. Will try to be clever
   and disregard elements that don't contain a matching link.
-
+  
   Example:
-
+  
         When I follow "Read more" inside any ".text_snippet"
 
 
 
 * **Then I should( not)? see "..." inside any "..."**
 
-
+  
 
 
 * **When I fill in "..." with "..." inside any "..."**
 
-
+  
 
 
 * **When I confirm the browser dialog**
 
-
+  
 
 
 * **When I cancel the browser dialog**
 
-
+  
 
 
 * **When I enter "..." into the browser dialog**
 
-
+  
 
 
 * **Then I should see in this order:?**
 
   Checks that these strings are rendered in the given order in a single line or in multiple lines
-
+  
   Example:
-
+  
         Then I should see in this order:
           | Alpha Group |
           | Augsburg    |

data/lib/spreewald/web_steps.rb

@@ -362,7 +362,12 @@ Then /^the window should be titled "([^"]*)"$/ do |title|
 end
 
 When /^I reload the page$/ do
-  visit current_path
+  case Capybara::current_driver
+    when :selenium
+      visit page.driver.browser.current_url
+    else
+      visit [ current_path, page.driver.last_request.env['QUERY_STRING'] ].reject(&:blank?).join('?')
+  end
 end
 
 # Checks that an element is actually visible, also considering styles
@@ -370,29 +375,29 @@ end
 # In a non-selenium test, we only check for ".hidden", ".invisible" or "style: display:none"
 #
 # More details [here](https://makandracards.com/makandra/1049-capybara-check-that-a-page-element-is-hidden-via-css)
-Then /^"([^\"]+)" should( not)? be visible$/ do |text, negate|
+Then /^(the tag )?"([^\"]+)" should( not)? be visible$/ do |tag, selector_or_text, negate|
   case Capybara::current_driver
   when :selenium, :webkit
     patiently do
       visibility_detecting_javascript = %[
         (function() {
 
-          var containsSelector = ':contains(#{text.to_json})';
+          var selector = #{tag ? selector_or_text.to_json : "':contains(#{selector_or_text.to_json})'"};
           var jqueryLoaded = (typeof jQuery != 'undefined');
 
           function findCandidates() {
             if (jqueryLoaded) {
-              return $(containsSelector);
+              return $(selector);
             } else {
-              return $$(containsSelector);
+              return $$(selector);
             }
           }
 
           function isExactCandidate(candidate) {
             if (jqueryLoaded) {
-              return $(candidate).find(containsSelector).length == 0;
+              return $(candidate).find(selector).length == 0;
             } else {
-              return candidate.select(containsSelector).length == 0;
+              return candidate.select(selector).length == 0;
             }
           }
 
@@ -420,7 +425,11 @@ Then /^"([^\"]+)" should( not)? be visible$/ do |text, negate|
       page.evaluate_script(visibility_detecting_javascript).should matcher
     end
   else
-    invisibility_detecting_matcher = have_css('.hidden, .invisible, [style~="display: none"]', :text => text)
+    invisibility_detecting_matcher = if tag
+      have_css(".hidden, .invisible, [style~=\"display: none\"] #{selector_or_text}")
+    else
+      have_css('.hidden, .invisible, [style~="display: none"]', :text => selector_or_text)
+    end
     expectation = negate ? :should : :should_not # sic
     page.send(expectation, invisibility_detecting_matcher)
   end

data/lib/spreewald_support/version.rb

@@ -1,5 +1,5 @@
 # coding: UTF-8
 
 module Spreewald
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spreewald
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Tobias Kraze
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-21 00:00:00 +01:00
+date: 2012-11-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.9.4
+rubygems_version: 1.3.9.5
 signing_key: 
 specification_version: 3
 summary: Collection of useful cucumber steps.