kelp 0.1.7 → 0.1.8

data/Gemfile.lock

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

data/History.md

@@ -1,6 +1,12 @@
 Kelp History
 ============
 
+0.1.8
+-----
+
+- Fixed bug with should_see / should_not_see in RSpec 1.x
+
+
 0.1.7
 -----
 

data/README.md

@@ -1,10 +1,10 @@
 Kelp
 ====
 
-This is the documentation for [Kelp](http://github.com/wapcaplet/kelp), a
-collection of helpers that makes it easier to write step definitions for
-[Cucumber](http://cukes.info). The Kelp gem is hosted on
-[Rubygems](http://rubygems.org/gems/kelp), so you can install it with:
+[Kelp](http://github.com/wapcaplet/kelp) is a collection of helpers that makes
+it easier to write step definitions for [Cucumber](http://cukes.info). The Kelp
+gem is hosted on [Rubygems](http://rubygems.org/gems/kelp), so you can install
+it with:
 
     $ gem install kelp
 

data/Rakefile

@@ -31,8 +31,8 @@ end
 desc "Run RSpec and Cucumber tests with coverage analysis"
 task :all do |t|
   rm 'coverage.data' if File.exist?('coverage.data')
-  Rake::Task['rcov:spec'].invoke
-  Rake::Task['rcov:cucumber'].invoke
+  Rake::Task['spec'].invoke
+  Rake::Task['cucumber'].invoke
 end
 
 task :default => ['all']

data/features/kelp_step_definitions.feature

@@ -38,7 +38,6 @@ Feature: Kelp Step Definitions
       12 steps (12 passed)
       """
 
-  @focus
   Scenario: Visibility failure test
     When I run cucumber on "visibility_fail.feature"
     Then the results should include:

data/kelp.gemspec

@@ -1,12 +1,11 @@
-
-
 Gem::Specification.new do |s|
   s.name = "kelp"
-  s.version = "0.1.7"
+  s.version = "0.1.8"
   s.summary = "Cucumber helper methods"
   s.description = <<-EOS
     Kelp is a collection of helper methods for Cucumber to ease the process of
-    writing step definitions.
+    writing step definitions. It also includes a Rails generator for generic
+    step definitions building upon those helpers.
   EOS
   s.authors = ["Eric Pierce"]
   s.email = "wapcaplet88@gmail.com"

data/lib/kelp/helper.rb

@@ -10,5 +10,15 @@ module Kelp
         raise "Could not find field with locator: '#{locator}'"
       end
     end
+
+    # Return the appropriate "ExpectationNotMetError" class for the current
+    # version of RSpec
+    def rspec_unexpected
+      if defined?(RSpec)
+        RSpec::Expectations::ExpectationNotMetError
+      else
+        Spec::Expectations::ExpectationNotMetError
+      end
+    end
   end
 end

data/lib/kelp/visibility.rb

@@ -1,6 +1,7 @@
 require 'kelp/scoping'
 require 'kelp/xpath'
 require 'kelp/exceptions'
+require 'kelp/helper'
 
 module Kelp
   # This module defines methods for verifying the visibility (or invisibility)
@@ -31,7 +32,7 @@ module Kelp
         texts.each do |text|
           begin
             page_should_contain text
-          rescue RSpec::Expectations::ExpectationNotMetError
+          rescue rspec_unexpected
             unexpected << text
           end
         end
@@ -58,7 +59,7 @@ module Kelp
         texts.each do |text|
           begin
             page_should_not_contain text
-          rescue RSpec::Expectations::ExpectationNotMetError
+          rescue rspec_unexpected
             unexpected << text
           end
         end
@@ -121,7 +122,7 @@ module Kelp
           assert_contain text
         end
       else
-        raise RuntimeError, "Unsupported driver: #{Kelp.driver}"
+        raise NotImplementedError, "Unsupported driver: #{Kelp.driver}"
       end
     end
 
@@ -145,7 +146,7 @@ module Kelp
           assert_match(regexp, response_body)
         end
       else
-        raise RuntimeError, "Unsupported driver: #{Kelp.driver}"
+        raise NotImplementedError, "Unsupported driver: #{Kelp.driver}"
       end
     end
 
@@ -170,7 +171,7 @@ module Kelp
           assert !hc.matches?(content), hc.negative_failure_message
         end
       else
-        raise RuntimeError, "Unsupported driver: #{Kelp.driver}"
+        raise NotImplementedError, "Unsupported driver: #{Kelp.driver}"
       end
     end
 
@@ -194,7 +195,7 @@ module Kelp
           assert_not_contain(regexp)
         end
       else
-        raise RuntimeError, "Unsupported driver: #{Kelp.driver}"
+        raise NotImplementedError, "Unsupported driver: #{Kelp.driver}"
       end
     end
 
@@ -218,7 +219,7 @@ module Kelp
         if Kelp.driver == :capybara
           page.should have_xpath(xpath_row_containing(texts))
         elsif Kelp.driver == :webrat
-          raise RuntimeError, "Not implemented yet"
+          raise NotImplementedError, "Not implemented yet"
         end
       end
     end
@@ -242,7 +243,7 @@ module Kelp
         if Kelp.driver == :capybara
           page.should have_no_xpath(xpath_row_containing(texts))
         elsif Kelp.driver == :webrat
-          raise RuntimeError, "Not implemented yet"
+          raise NotImplementedError, "Not implemented yet"
         end
       end
     end

data/spec/attribute_spec.rb

@@ -15,13 +15,13 @@ describe Kelp::Attribute, "should_be_disabled" do
     it "element does not exist" do
       lambda do
         should_be_disabled "nonexistent"
-      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+      end.should raise_error(rspec_unexpected)
     end
 
     it "element does not have the disabled attribute" do
       lambda do
         should_be_disabled "first_name"
-      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+      end.should raise_error(rspec_unexpected)
     end
   end
 end
@@ -42,13 +42,13 @@ describe Kelp::Attribute, "should_be_enabled" do
     it "element does not exist" do
       lambda do
         should_be_enabled "nonexistent"
-      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+      end.should raise_error(rspec_unexpected)
     end
 
     it "element has the disabled attribute" do
       lambda do
         should_be_enabled "readonly"
-      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+      end.should raise_error(rspec_unexpected)
     end
   end
 end

data/spec/dropdown_spec.rb

@@ -27,20 +27,20 @@ describe Kelp::Dropdown, "dropdown_should_equal" do
     it "the option does not have the 'selected' attribute" do
       lambda do
         dropdown_should_equal "Height", "Tall"
-      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+      end.should raise_error(rspec_unexpected)
     end
 
     it "the option is not the first one selected by default" do
       lambda do
         dropdown_should_equal "Weight", "Medium"
-      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+      end.should raise_error(rspec_unexpected)
     end
 
     it "the option was not the one chosen programmatically" do
       select "Tall", :from => "Height"
       lambda do
         dropdown_should_equal "Height", "Average"
-      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+      end.should raise_error(rspec_unexpected)
     end
   end
 
@@ -78,7 +78,7 @@ describe Kelp::Dropdown, "dropdown_should_include" do
     it "a single option does not exist in the dropdown" do
       lambda do
         dropdown_should_include "Height", "Midget"
-      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+      end.should raise_error(rspec_unexpected)
     end
 
     it "any of several options do not exist in the dropdown" do
@@ -89,7 +89,7 @@ describe Kelp::Dropdown, "dropdown_should_include" do
           "Tall",
           "Giant",
         ]
-      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+      end.should raise_error(rspec_unexpected)
     end
   end
 end
@@ -120,7 +120,7 @@ describe Kelp::Dropdown, "dropdown_should_not_include" do
     it "a single option exists in the dropdown" do
       lambda do
         dropdown_should_not_include "Height", "Short"
-      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+      end.should raise_error(rspec_unexpected)
     end
 
     it "any of several options exist in the dropdown" do
@@ -131,7 +131,7 @@ describe Kelp::Dropdown, "dropdown_should_not_include" do
           "Behemoth",
           "Tall",
         ]
-      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+      end.should raise_error(rspec_unexpected)
     end
   end
 end
@@ -161,20 +161,20 @@ describe Kelp::Dropdown, "dropdown_value_should_equal" do
     it "the option with the 'selected' attribute has a different value" do
       lambda do
         dropdown_value_should_equal "Height", "99"
-      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+      end.should raise_error(rspec_unexpected)
     end
 
     it "the first option selected by default does not have given value" do
       lambda do
         dropdown_value_should_equal "Weight", "2"
-      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+      end.should raise_error(rspec_unexpected)
     end
 
     it "the programmatically chosen option has a different value" do
       select "Tall", :from => "Height"
       lambda do
         dropdown_value_should_equal "Height", "2"
-      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+      end.should raise_error(rspec_unexpected)
     end
   end
 end

data/spec/field_spec.rb

@@ -71,14 +71,14 @@ describe Kelp::Field, "field_should_contain" do
       it "is empty" do
         lambda do
           field_should_contain "first_name", "Brian"
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(rspec_unexpected)
       end
 
       it "has a different value" do
         fill_in "first_name", :with => "Judith"
         lambda do
           field_should_contain "first_name", "Brian"
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(rspec_unexpected)
       end
     end
 
@@ -86,14 +86,14 @@ describe Kelp::Field, "field_should_contain" do
       it "is empty" do
         lambda do
           field_should_contain "First name", "Brian"
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(rspec_unexpected)
       end
 
       it "has a different value" do
         fill_in "First name", :with => "Judith"
         lambda do
           field_should_contain "First name", "Brian"
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(rspec_unexpected)
       end
     end
 
@@ -154,7 +154,7 @@ describe Kelp::Field, "fields_should_contain" do
       it "are empty" do
         lambda do
           fields_should_contain "first_name" => "Terry", "last_name" => "Jones"
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(rspec_unexpected)
       end
 
       it "do not all match" do
@@ -162,7 +162,7 @@ describe Kelp::Field, "fields_should_contain" do
         fill_in "last_name", :with => "Gilliam"
         lambda do
           fields_should_contain "first_name" => "Terry", "last_name" => "Jones"
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(rspec_unexpected)
       end
     end
 
@@ -170,7 +170,7 @@ describe Kelp::Field, "fields_should_contain" do
       it "are empty" do
         lambda do
           fields_should_contain "First name" => "Terry", "Last name" => "Jones"
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(rspec_unexpected)
       end
 
       it "do not all match" do
@@ -178,7 +178,7 @@ describe Kelp::Field, "fields_should_contain" do
         fill_in "Last name", :with => "Gilliam"
         lambda do
           fields_should_contain "First name" => "Terry", "Last name" => "Jones"
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(rspec_unexpected)
       end
     end
 

data/spec/visibility_spec.rb

@@ -238,19 +238,19 @@ describe Kelp::Visibility, "should_see_in_same_row" do
     it "two strings exist, but are not in the same row" do
       lambda do
         should_see_in_same_row ["Eric", "John"]
-      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+      end.should raise_error(rspec_unexpected)
     end
 
     it "two strings are in the same row, but a third is not" do
       lambda do
         should_see_in_same_row ["Eric", "Edit", "Delete"]
-      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+      end.should raise_error(rspec_unexpected)
     end
 
     it "two strings are in the same row, but outside the given scope" do
       lambda do
         should_see_in_same_row ["Eric", "Edit"], :within => "#table_b"
-      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+      end.should raise_error(rspec_unexpected)
     end
   end
 end
@@ -282,13 +282,13 @@ describe Kelp::Visibility, "should_not_see_in_same_row" do
     it "two strings are in the same row" do
       lambda do
         should_not_see_in_same_row ["Eric", "Edit"]
-      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+      end.should raise_error(rspec_unexpected)
     end
 
     it "two strings are in the same row within a given scope" do
       lambda do
         should_not_see_in_same_row ["Eric", "Edit"], :within => "#table_a"
-      end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+      end.should raise_error(rspec_unexpected)
     end
   end
 end
@@ -319,7 +319,7 @@ describe Kelp::Visibility, "page_should_contain" do
       it "does not exist" do
         lambda do
           page_should_contain "Wazzup world"
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(rspec_unexpected)
       end
     end
 
@@ -327,7 +327,7 @@ describe Kelp::Visibility, "page_should_contain" do
       it "does not match" do
         lambda do
           page_should_contain /(Foo|Bar|Baz) world/
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(rspec_unexpected)
       end
     end
 
@@ -365,20 +365,20 @@ describe Kelp::Visibility, "page_should_not_contain" do
       it "exists" do
         lambda do
           page_should_not_contain "Hello world"
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(rspec_unexpected)
         lambda do
           page_should_not_contain "Goodbye world"
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(rspec_unexpected)
       end
     end
     context "Regexp" do
       it "matches" do
         lambda do
           page_should_not_contain /(Hello|Goodbye) world/
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(rspec_unexpected)
         lambda do
           page_should_not_contain /\d\d\d-\d\d\d\d/
-        end.should raise_error(RSpec::Expectations::ExpectationNotMetError)
+        end.should raise_error(rspec_unexpected)
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kelp
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Eric Pierce
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 -06:00
+date: 2011-04-26 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -120,7 +120,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id007
-description: "    Kelp is a collection of helper methods for Cucumber to ease the process of\n    writing step definitions.\n"
+description: "    Kelp is a collection of helper methods for Cucumber to ease the process of\n    writing step definitions. It also includes a Rails generator for generic\n    step definitions building upon those helpers.\n"
 email: wapcaplet88@gmail.com
 executables: []