spreewald 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a96ad90241f95da1aad6a504ca9a4b632b6aa140
-  data.tar.gz: 98203ad1472926314f97f49115de31f135b021d8
+  metadata.gz: 550c0ee0c29e48a7a5150fd2455ae75e567a024b
+  data.tar.gz: ca07a1d6c5b953721b885d371451d177373791f3
 SHA512:
-  metadata.gz: 622f1028d8f4077591eeccc1f4afbfe46e574022ece90da191796c6d1c6634ceec82256649922156a76574594e302aa639bfde5b5db4ccebd0892844606dfd2d
-  data.tar.gz: 5838a95f80ed9d08e09844a4e8d243d72cebd75cd358c31bc9a9406f657770edfde61dca032ac6d0e703371e3e1207f5015a1d85182adc0c621f5a85f766ba15
+  metadata.gz: fb34ba4c3ea0cf7003a371450d7288940c3daeb40b94d4d70c1424a393b385d5ec7d4a54f98c5d8d643e25459426d2a0358a8262ba01acf712767360ff295d83
+  data.tar.gz: 703bf4de4c830f759520c099b28d98a0cdd0def111139326e1ad9b231a180f14889ccb3ee5b26a5295bda09c64a40091b5207960f664bc41d7550e8bfd7bbda3

data/README.md

@@ -537,7 +537,31 @@ deprecation notice. Decide for yourself whether you want to use them:
 
 * **When I click on "..."**
 
-  Click on some text that might not be a link
+  Click on some text that might not be a link.
+  
+  Example:
+  
+      When I click on "Collapse"
+
+
+
+* **When I click on the element "(...)"**
+
+  Click on an element with the given selector.
+  
+  Example:
+  
+      When I click on the element ".sidebar"
+
+
+
+* **When I click on the element for (.+?)**
+
+  Click on the element with the given [selector alias](https://github.com/makandra/spreewald/blob/master/examples/selectors.rb).
+  
+  Example:
+  
+      When I click on the element for the sidebar
 
 
 * **Then "..." should link to "..."**
@@ -546,7 +570,7 @@ deprecation notice. Decide for yourself whether you want to use them:
   
   Example:
   
-        Then "Sponsor" should link to "http://makandra.com"
+      Then "Sponsor" should link to "http://makandra.com"
 
 
 
@@ -559,19 +583,19 @@ deprecation notice. Decide for yourself whether you want to use them:
       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 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 ...**
 
+  Check that an element with the given [selector alias](https://github.com/makandra/spreewald/blob/master/examples/selectors.rb) is present on the page.
+  
+  Example:
   
+      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 get a text response**

data/lib/spreewald/web_steps.rb

@@ -450,7 +450,12 @@ Then /^(the tag )?"([^\"]+)" should be hidden$/ do |tag, selector_or_text|
   assert_hidden(options)
 end
 
-# Click on some text that might not be a link
+# Click on some text that might not be a link.
+#
+# Example:
+#
+#     When I click on "Collapse"
+#
 When /^I click on "([^\"]+)"$/ do |text|
   patiently do
     contains_text = %{contains(., \"#{text}\")}
@@ -460,11 +465,35 @@ When /^I click on "([^\"]+)"$/ do |text|
   end
 end
 
+# Click on an element with the given selector.
+#
+# Example:
+#
+#     When I click on the element ".sidebar"
+#
+When /^I click on the element "([^"]+)"$/ do |selector|
+  patiently do
+    page.find(selector).click
+  end
+end
+
+# Click on the element with the given [selector alias](https://github.com/makandra/spreewald/blob/master/examples/selectors.rb).
+#
+# Example:
+#
+#     When I click on the element for the sidebar
+When /^I click on the element for (.+?)$/ do |locator|
+  patiently do
+    selector = _selector_for(locator)
+    page.find(selector).click
+  end
+end
+
 # Use this step to check external links.
 #
 # Example:
 #
-#       Then "Sponsor" should link to "http://makandra.com"
+#     Then "Sponsor" should link to "http://makandra.com"
 #
 Then /^"([^"]*)" should link to "([^"]*)"$/ do |link_label, target|
   patiently do
@@ -481,13 +510,6 @@ end
 #     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 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 "([^"]+)"$/ do |negate, selector|
   expectation = negate ? :should_not : :should
   patiently do
@@ -495,6 +517,14 @@ Then /^I should (not )?see an element "([^"]+)"$/ do |negate, selector|
   end
 end
 
+# Check that an element with the given [selector alias](https://github.com/makandra/spreewald/blob/master/examples/selectors.rb) is present on the page.
+#
+# Example:
+#
+#     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 (.*?)$/ do |negate, locator|
   expectation = negate ? :should_not : :should
   selector = _selector_for(locator)

data/lib/spreewald_support/version.rb

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

data/tests/rails-2.3/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    spreewald (1.2.14)
+    spreewald (1.3.3)
       capybara
       cucumber
       cucumber-rails

data/tests/rails-3.2/capybara-1/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../..
   specs:
-    spreewald (1.3.1)
+    spreewald (1.3.3)
       capybara
       cucumber
       cucumber-rails

data/tests/rails-3.2/capybara-2/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../..
   specs:
-    spreewald (1.3.2)
+    spreewald (1.3.3)
       capybara
       cucumber
       cucumber-rails

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

@@ -1,7 +1,28 @@
-.outer
-  .inner
-    Nested
+.clickables
+
+  .outer
+    .inner
+      Nested
+
+  .button
+    %span.icon +
+    Button
+
+  .panel
+    Panel
+
+  .timeline
+    Timeline
+
+#message
+
+:javascript
+  $(function() {
+    $('.clickables *').click(function(event) {
+      $('#message').text('You clicked on .' + this.className);
+      // Don't propagate since the whole point of the test
+      // is that the correct tree node is clicked
+      return false;
+    });
+  });
 
-.button
-  %span.icon +
-  Button

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

@@ -53,12 +53,32 @@ Feature: Web steps
       And the "Unchecked" checkbox should not be checked
 
 
-  # We only check for it to not die, reacting to click on arbitrary elements will not work without javascript
+  @javascript
   Scenario: /^I click on "([^\"]+)"$/
     When I go to "/static_pages/click_on"
       And I click on "Nested"
-      And I click on "Button"
+    # See that it clicks the innermost element with that text
+    Then I should see "You clicked on .inner"
+    When I click on "Button"
+    Then I should see "You clicked on .button"
+
+  @javascript
+  Scenario: /^I click on the element "([^\"]+)"$/
+    When I go to "/static_pages/click_on"
+    And I click on the element ".inner"
+    Then I should see "You clicked on .inner"
+    When I click on the element ".outer"
+    Then I should see "You clicked on .outer"
+    When I click on the element ".button"
+    Then I should see "You clicked on .button"
 
+  @javascript
+  Scenario: /^I click on the element for .*?$/
+    When I go to "/static_pages/click_on"
+    And I click on the element for a panel
+    Then I should see "You clicked on .panel"
+    When I click on the element for the timeline
+    Then I should see "You clicked on .timeline"
 
   Scenario: /^the "(.*?)" select should( not)? be sorted$/
     When I go to "/forms/select_fields"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spreewald
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Tobias Kraze