Improve and test "blabla should contain" steps. Rename features.

README.md

@@ -128,7 +128,7 @@ Marks scenario as pending
   Print all sent emails to STDOUT.
 
 
-* **Then that e?mail should have the following lines in the body:**
+* **Then that e?mail should( not)? have the following lines in the body:**
 
   Only works after you've retrieved the email using "Then an email should have been sent with:"
 
@@ -302,14 +302,21 @@ deprecation notice. Decide for yourself whether you want to use them:
 
 
 
-* **Then the "..." field( within ...)? should contain "..."**
+* **Then the "..." field should (not )?contain "..."**
 
   Checks that an input field contains some value (allowing * as wildcard character)
 
 
-* **Then the "..." field( within ...)? should not contain "..."**
+* **Then I should see a form with the following values:**
 
+  Checks that a list of label/value pairs are visible as control inputs.
 
+  Example:
+
+        Then I should see a form with the following values:
+          | E-mail | foo@bar.com   |
+          | Role   | Administrator |
+
 
 
 * **Then the "..." field should have the error "..."**
@@ -431,7 +438,7 @@ deprecation notice. Decide for yourself whether you want to use them:
   Click on some text that might not be a link
 
 
-* **Then "..." should link to "..."/**
+* **Then "..." should link to "..."**
 
   Use this step to check external links.
 
@@ -490,6 +497,11 @@ deprecation notice. Decide for yourself whether you want to use them:
 
 
 
+* **When I switch to the new tab**
+
+
+
+
 * **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

examples/paths.rb

@@ -5,7 +5,7 @@ module NavigationHelpers
   #
   #   When /^I go to (.+)$/ do |page_name|
   #
-  # step definition in web_steps.rb
+  # step definition in web_steps.feature
   #
   def path_to(page_name)
     case page_name

examples/selectors.rb

@@ -4,7 +4,7 @@ module HtmlSelectorsHelpers
   #
   #   When /^(.+) within (.+)$/ do |step, scope|
   #
-  # step definitions in web_steps.rb
+  # step definitions in web_steps.feature
   #
   def selector_for(locator)
     case locator

lib/spreewald/web_steps.rb

@@ -149,13 +149,43 @@
 Then /^the "([^"]*)" field should (not )?contain "([^"]*)"$/ do |label, negate, expected_string|
   patiently do
     field = find_field(label)
-    field_value = ((field.tag_name == 'textarea') && field.text.present?) ? field.text.strip : field.value
-
+    field_value = case field.tag_name
+    when 'textarea'
+      field.text.present? ? field.text.strip : ''
+    when 'select'
+      options = field.all('option')
+      selected_option = options.detect(&:selected?) || options.first
+      if selected_option && selected_option.text.present?
+        selected_option.text.strip
+      else
+        ''
+      end
+    else
+      field.value
+    end
     field_value.send(negate ? :should_not : :should, contain_with_wildcards(expected_string))
   end
 end
 
 
+# Checks that a list of label/value pairs are visible as control inputs.
+#
+# Example:
+#
+#       Then I should see a form with the following values:
+#         | E-mail | foo@bar.com   |
+#         | Role   | Administrator |
+#
+Then /^I should see a form with the following values:$/ do |table|
+  expectations = table.raw
+  expectations.each do |label, expected_value|
+    step %(the "#{label}" field should contain "#{expected_value}")
+  end
+end
+
+
+
+
 # checks that an input field was wrapped with a validation error
 Then /^the "([^"]*)" field should have the error "([^"]*)"$/ do |field, error_message|
   patiently do

lib/spreewald_support/version.rb

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

tests/rails-2.3/Gemfile.lock

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

tests/rails-3.2/Gemfile.lock

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

tests/shared/app/controllers/forms_controller.rb

@@ -0,0 +1,3 @@
+class FormsController < ApplicationController
+
+end

tests/shared/app/views/forms/form1.html.haml

@@ -0,0 +1,15 @@
+= form_tag do
+
+  = label_tag 'text_control', 'Text control'
+  = text_field_tag 'text_control', 'Text control value'
+
+  = label_tag 'select_control', 'Select control'
+  = select_tag 'select_control', options_for_select([['Label 1', 'value1'], ['Label 2', 'value2'], ['Label 3', 'value3']], 'value2')
+
+  = label_tag 'select_control_without_selection', 'Select control without selection'
+  = select_tag 'select_control_without_selection', options_for_select([['Label 1', 'value1'], ['Label 2', 'value2'], ['Label 3', 'value3']])
+
+  = label_tag 'textarea_control', 'Textarea control'
+  = text_area_tag 'textarea_control', 'Textarea control value'
+
+

tests/shared/features/shared/web_steps.feature

@@ -0,0 +1,17 @@
+Feature: Web steps
+
+  Background:
+    When I go to "/forms/form1"
+
+  Scenario: /^the "([^"]*)" field should (not )?contain "([^"]*)"$/
+    Then the "Text control" field should contain "Text control value"
+    Then the "Select control" field should contain "Label 2"
+    Then the "Select control without selection" field should contain "Label 1"
+    Then the "Textarea control" field should contain "Textarea control value"
+
+  Scenario: /^I should see a form with the following values:$/
+    Then I should see a form with the following values:
+      | Text control                     | Text control value     |
+      | Select control                   | Label 2                |
+      | Select control without selection | Label 1                 |
+      | Textarea control                 | Textarea control value |