kelp 0.1.6 → 0.1.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kelp (0.1.6)
+    kelp (0.1.7)
       capybara (>= 0.4.0)
 
 GEM

data/History.md

@@ -1,6 +1,13 @@
 Kelp History
 ============
 
+0.1.7
+-----
+
+- Fixed bug with dropdown_should_include, caused by Rails string monkeypatching
+- Allow should_see and should_not_see to check all strings before failing
+
+
 0.1.6
 -----
 

data/README.md

@@ -147,15 +147,16 @@ file used by the Rails generator. Run via:
 
     $ rake cucumber
 
-This self-test is a single scenario that exercises scenarios in
-`examples/sinatra_app/features`, and ensures that they perform as expected.
+This self-test includes high-level scenarios that exercise more detailed
+scenarios in `examples/sinatra_app/features`, ensuring that the generated step
+definitions perform as expected.
 
 
 Future plans
 ------------
 
 * Generator for Rails 3
-* Support other stuff besides Capybara
+* Support Webrat
 
 
 Copyright

data/examples/sinatra_app/features/visibility.feature

@@ -5,9 +5,18 @@ Feature: Visibility
 
   Scenario: Should or shouldn't see
     Then I should see the following:
+      | Homepage |
       | Hello world |
       | Goodbye world |
 
+    And I should see the following:
+      """
+      First
+      Second
+      Third
+      About Us
+      """
+
     And I should not see the following:
       | Goodbye cruel world |
 

data/examples/sinatra_app/features/visibility_fail.feature

@@ -0,0 +1,27 @@
+Feature: Visibility failures
+
+  Background:
+    Given I visit "/home"
+
+  Scenario: Should see - failure
+    Then I should see the following:
+      """
+      First
+      Missing
+      Second
+      Uh-oh
+      Third
+      Not there
+      """
+
+  Scenario: Should not see - failure
+    Then I should not see the following:
+      """
+      First
+      Missing
+      Second
+      Uh-oh
+      Third
+      Not there
+      """
+

data/examples/sinatra_app/views/form.erb

@@ -20,17 +20,17 @@
       <p>
         <label for="height">Height</label>
         <select id="height">
-          <option value="1">Short</option>
-          <option value="2" selected="selected">Average</option>
-          <option value="3" >Tall</option>
+          <option value="short">Short</option>
+          <option value="average" selected="selected">Average</option>
+          <option value="tall" >Tall</option>
         </select>
       </p>
       <p>
         <label for="weight">Weight</label>
         <select id="weight">
-          <option value="1">Light</option>
-          <option value="2">Medium</option>
-          <option value="3">Heavy</option>
+          <option value="light">Light</option>
+          <option value="medium">Medium</option>
+          <option value="heavy">Heavy</option>
         </select>
       </p>
       <p>

data/features/kelp_step_definitions.feature

@@ -8,7 +8,7 @@ Feature: Kelp Step Definitions
 
   Scenario: Checkbox test
     When I run cucumber on "checkbox.feature"
-    Then the results should be:
+    Then the results should include:
       """
       2 scenarios (2 passed)
       6 steps (6 passed)
@@ -16,7 +16,7 @@ Feature: Kelp Step Definitions
 
   Scenario: Dropdown test
     When I run cucumber on "dropdown.feature"
-    Then the results should be:
+    Then the results should include:
       """
       3 scenarios (3 passed)
       11 steps (11 passed)
@@ -24,7 +24,7 @@ Feature: Kelp Step Definitions
 
   Scenario: Field test
     When I run cucumber on "field.feature"
-    Then the results should be:
+    Then the results should include:
       """
       2 scenarios (2 passed)
       7 steps (7 passed)
@@ -32,9 +32,24 @@ Feature: Kelp Step Definitions
 
   Scenario: Visibility test
     When I run cucumber on "visibility.feature"
-    Then the results should be:
+    Then the results should include:
       """
       3 scenarios (3 passed)
-      11 steps (11 passed)
+      12 steps (12 passed)
+      """
+
+  @focus
+  Scenario: Visibility failure test
+    When I run cucumber on "visibility_fail.feature"
+    Then the results should include:
+      """
+      Expected to see: ["First", "Missing", "Second", "Uh-oh", "Third", "Not there"]
+      Did not see: ["Missing", "Uh-oh", "Not there"] (Kelp::Unexpected)
       """
+    And the results should include:
+      """
+      Expected not to see: ["First", "Missing", "Second", "Uh-oh", "Third", "Not there"]
+      Did see: ["First", "Second", "Third"] (Kelp::Unexpected)
+      """
+
 

data/features/step_definitions/app_steps.rb

@@ -24,8 +24,11 @@ When /^I run cucumber on "(.+)"$/ do |feature|
 end
 
 
-Then /^the results should be:$/ do |expected_results|
-  if !@output.include?(expected_results)
+Then /^the results should include:$/ do |expected_results|
+  # Remove leading whitespace before comparison
+  got = @output.gsub(/^\s*/, '')
+  want = expected_results.gsub(/^\s*/, '')
+  if !got.include?(want)
     got = @output.collect {|line| "  #{line}"}.join
     want = expected_results.collect {|line| "  #{line}"}.join
     raise("Expected:\n#{want}\nGot:\n#{got}")

data/kelp.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "kelp"
-  s.version = "0.1.6"
+  s.version = "0.1.7"
   s.summary = "Cucumber helper methods"
   s.description = <<-EOS
     Kelp is a collection of helper methods for Cucumber to ease the process of

data/lib/kelp/dropdown.rb

@@ -28,10 +28,14 @@ module Kelp
         # See if there's a 'selected' option
         begin
           selected = field.find(:xpath, ".//option[@selected='selected']")
-        # If not, find the option matching the first field value
+        # If not, find the option matching the field's 'value' attribute
         rescue Capybara::ElementNotFound
-          first_value = xpath_sanitize(field.value.first)
-          selected = field.find(:xpath, ".//option[@value=#{first_value}]")
+          # FIXME: Find a way to support multiple-selection dropdowns
+          if field.value.class == Array
+            raise Exception, "Multiple-selection dropdowns are not supported"
+          end
+          field_value = xpath_sanitize(field.value)
+          selected = field.find(:xpath, ".//option[@value=#{field_value}]")
         end
         selected.text.should =~ /#{value}/
       end

data/lib/kelp/exceptions.rb

@@ -0,0 +1,5 @@
+module Kelp
+  class Unexpected < RuntimeError
+  end
+end
+

data/lib/kelp/visibility.rb

@@ -1,5 +1,6 @@
 require 'kelp/scoping'
 require 'kelp/xpath'
+require 'kelp/exceptions'
 
 module Kelp
   # This module defines methods for verifying the visibility (or invisibility)
@@ -25,11 +26,20 @@ module Kelp
     #
     def should_see(texts, scope={})
       texts = [texts] if (texts.class == String || texts.class == Regexp)
+      unexpected = []
       in_scope(scope) do
         texts.each do |text|
-          page_should_contain text
+          begin
+            page_should_contain text
+          rescue RSpec::Expectations::ExpectationNotMetError
+            unexpected << text
+          end
         end
       end
+      if !unexpected.empty?
+        raise Kelp::Unexpected,
+          "Expected to see: #{texts.inspect}\nDid not see: #{unexpected.inspect}"
+      end
     end
 
 
@@ -43,11 +53,20 @@ module Kelp
     #
     def should_not_see(texts, scope={})
       texts = [texts] if (texts.class == String || texts.class == Regexp)
+      unexpected = []
       in_scope(scope) do
         texts.each do |text|
-          page_should_not_contain text
+          begin
+            page_should_not_contain text
+          rescue RSpec::Expectations::ExpectationNotMetError
+            unexpected << text
+          end
         end
       end
+      if !unexpected.empty?
+        raise Kelp::Unexpected,
+          "Expected not to see: #{texts.inspect}\nDid see: #{unexpected.inspect}"
+      end
     end
 
 

data/spec/dropdown_spec.rb

@@ -144,16 +144,16 @@ describe Kelp::Dropdown, "dropdown_value_should_equal" do
 
   context "passes when" do
     it "the option with the 'selected' attribute has the given value" do
-      dropdown_value_should_equal "Height", "2"
+      dropdown_value_should_equal "Height", "average"
     end
 
     it "the first option selected by default has the given value" do
-      dropdown_value_should_equal "Weight", "1"
+      dropdown_value_should_equal "Weight", "light"
     end
 
     it "the programmatically chosen option has the given value" do
       select "Tall", :from => "Height"
-      dropdown_value_should_equal "Height", "3"
+      dropdown_value_should_equal "Height", "tall"
     end
   end
 

data/spec/visibility_spec.rb

@@ -50,7 +50,7 @@ describe Kelp::Visibility, "should_see" do
       it "does not exist" do
         lambda do
           should_see "Goodbye cruel world"
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(Kelp::Unexpected)
       end
 
       it "any of several do not exist" do
@@ -60,19 +60,19 @@ describe Kelp::Visibility, "should_see" do
             "Goodbye world",
             "Hello, nurse!"
           ]
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(Kelp::Unexpected)
       end
 
       it "is not within a given CSS scope" do
         lambda do
           should_see "Goodbye world", :within => "#greeting"
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(Kelp::Unexpected)
       end
 
       it "is not within a given XPath scope" do
         lambda do
           should_see "Goodbye world", :within => "//div[@id='greeting']"
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(Kelp::Unexpected)
       end
 
       it "is given a nonexistent XPath scope" do
@@ -86,13 +86,13 @@ describe Kelp::Visibility, "should_see" do
       it "does not match" do
         lambda do
           should_see /(Yo|Wazzup) world/
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(Kelp::Unexpected)
       end
 
       it "matches but is not within the scope" do
         lambda do
           should_see /Goodbye world/, :within => "#greeting"
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(Kelp::Unexpected)
       end
     end
   end
@@ -151,7 +151,7 @@ describe Kelp::Visibility, "should_not_see" do
       it "exists" do
         lambda do
           should_not_see "Hello world"
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(Kelp::Unexpected)
       end
 
       it "any of several exist" do
@@ -161,19 +161,19 @@ describe Kelp::Visibility, "should_not_see" do
             "Goodbye cruel world",
             "Goodbye world"
           ]
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(Kelp::Unexpected)
       end
 
       it "exists within the given CSS scope" do
         lambda do
           should_not_see "Hello world", :within => "#greeting"
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(Kelp::Unexpected)
       end
 
       it "exists within the given XPath scope" do
         lambda do
           should_not_see "Hello world", :within => "//div[@id='greeting']"
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(Kelp::Unexpected)
       end
     end
 
@@ -181,7 +181,7 @@ describe Kelp::Visibility, "should_not_see" do
       it "matches" do
         lambda do
           should_not_see /(Hello|Goodbye) world/
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(Kelp::Unexpected)
       end
 
       it "any of several regexps match" do
@@ -191,13 +191,13 @@ describe Kelp::Visibility, "should_not_see" do
             /(Ciao|Later) world/,
             /(Hello|Goodbye) world/
           ]
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(Kelp::Unexpected)
       end
 
       it "matches within the scope" do
         lambda do
           should_not_see /(Hello|Goodbye) world/, :within => "#greeting"
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(Kelp::Unexpected)
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kelp
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Eric Pierce
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 -06:00
+date: 2011-04-25 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -144,6 +144,7 @@ files:
 - examples/sinatra_app/features/field.feature
 - examples/sinatra_app/features/support/env.rb
 - examples/sinatra_app/features/visibility.feature
+- examples/sinatra_app/features/visibility_fail.feature
 - examples/sinatra_app/features/web_steps.rb
 - examples/sinatra_app/views/about.erb
 - examples/sinatra_app/views/edit1.erb
@@ -160,6 +161,7 @@ files:
 - lib/kelp/attribute.rb
 - lib/kelp/checkbox.rb
 - lib/kelp/dropdown.rb
+- lib/kelp/exceptions.rb
 - lib/kelp/field.rb
 - lib/kelp/helper.rb
 - lib/kelp/navigation.rb