kelp 0.1.2 → 0.1.3

data/Gemfile.lock

@@ -3,6 +3,7 @@ PATH
   specs:
     kelp (0.1.2)
       capybara (>= 0.4.0)
+      webrat
 
 GEM
   remote: http://rubygems.org/
@@ -83,6 +84,10 @@ GEM
     thor (0.14.6)
     tilt (1.1)
     tzinfo (0.3.23)
+    webrat (0.7.3)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
     xpath (0.1.2)
       nokogiri (~> 1.3)
 
@@ -97,3 +102,4 @@ DEPENDENCIES
   rspec (>= 2.2.0)
   rspec-rails
   sinatra
+  webrat

data/History.md

@@ -1,6 +1,13 @@
 Kelp History
 ============
 
+0.1.3
+-----
+
+- Fixed single-quote escaping issue in table rows and dropdowns
+- Began adding Webrat support (still untested and not fully implemented)
+
+
 0.1.2
 -----
 

data/README.md

@@ -13,6 +13,8 @@ short, easy to remember, and is in keeping with the theme of greenish plants.
 Kelp is licensed under the
 [MIT License](http://www.opensource.org/licenses/mit-license.php).
 
+Documentation is
+[available on rdoc.info](http://rdoc.info/github/wapcaplet/kelp/master/frames).
 Please use the [issue tracker](http://github.com/wapcaplet/kelp/issues)
 to report any bugs or feature requests. Visit the `#kelp` channel on
 `irc.freenode.net` to chat.
@@ -87,12 +89,17 @@ you pass to this should be in whatever format your `Capybara.default_selector`
 is set to. Other keywords like `:before` or `:after` may be supported in future
 revisions.
 
+See the
+[kelp documentation](http://rdoc.info/github/wapcaplet/kelp/master/frames).
+for more information.
+
 
 Development
 -----------
 
-If you'd like to hack on Kelp, first fork the {http://github.com/wapcaplet/kelp
-repository}, then clone your fork:
+If you'd like to hack on Kelp, first fork the
+[repository](http://github.com/wapcaplet/kelp),
+then clone your fork:
 
     $ git clone git://github.com/your_username/kelp.git
 
@@ -100,7 +107,7 @@ Install [bundler](http://gembundler.com/):
 
     $ gem install bundler
 
-Then install Kelp's dependencies (specified in `Gemfile`):
+Then install Kelp's dependencies:
 
     $ cd /path/to/kelp
     $ bundle install

data/kelp.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "kelp"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
   s.summary = "Cucumber helper methods"
   s.description = <<-EOS
     Kelp is a collection of helper methods for Cucumber to ease the process of
@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.add_dependency 'capybara', '>= 0.4.0'
+  s.add_dependency 'webrat'
 
   s.add_development_dependency 'sinatra'
   s.add_development_dependency 'rspec', '>= 2.2.0'

data/lib/kelp.rb

@@ -6,3 +6,21 @@ require 'kelp/navigation'
 require 'kelp/scoping'
 require 'kelp/visibility'
 
+module Kelp
+  class << self
+    attr_writer :driver
+
+    # @return [Symbol]
+    #   Name of the default driver used by Kelp
+    def default_driver
+      :capybara
+    end
+
+    # @return [Symbol]
+    #   Name of the current driver used by Kelp (:capybara or :webrat)
+    def driver
+      @driver || default_driver
+    end
+  end
+end
+

data/lib/kelp/dropdown.rb

@@ -27,7 +27,8 @@ module Kelp
         selected = field.find(:xpath, ".//option[@selected='selected']")
       # If not, find the option matching the first field value
       rescue Capybara::ElementNotFound
-        selected = field.find(:xpath, ".//option[@value='#{field.value.first}']")
+        first_value = xpath_sanitize(field.value.first)
+        selected = field.find(:xpath, ".//option[@value=#{first_value}]")
       end
       selected.text.should =~ /#{value}/
     end
@@ -56,7 +57,7 @@ module Kelp
         field = nice_find_field(dropdown)
         # Look for each value
         values.each do |value|
-          page.should have_xpath(".//option[text()='#{value}']")
+          page.should have_xpath(".//option[text()=#{xpath_sanitize(value)}]")
         end
       end
     end
@@ -83,7 +84,7 @@ module Kelp
         field = nice_find_field(dropdown)
         # Look for each value
         values.each do |value|
-          page.should have_no_xpath(".//option[text()='#{value}']")
+          page.should have_no_xpath(".//option[text()=#{xpath_sanitize(value)}]")
         end
       end
     end

data/lib/kelp/visibility.rb

@@ -89,10 +89,20 @@ module Kelp
     #   Content you expect to be on the page
     #
     def page_should_contain_text(text)
-      if page.respond_to? :should
-        page.should have_content(text)
+      if Kelp.driver == :capybara
+        if page.respond_to? :should
+          page.should have_content(text)
+        else
+          assert page.has_content?(text)
+        end
+      elsif Kelp.driver == :webrat
+        if defined?(Spec::Rails::Matchers)
+          response.should contain(text)
+        else
+          assert_contain text
+        end
       else
-        assert page.has_content?(text)
+        raise RuntimeError, "Unsupported driver: #{Kelp.driver}"
       end
     end
 
@@ -103,10 +113,20 @@ module Kelp
     #   Content you expect to match
     #
     def page_should_contain_regexp(regexp)
-      if page.respond_to? :should
-        page.should have_xpath('.//*', :text => regexp)
+      if Kelp.driver == :capybara
+        if page.respond_to? :should
+          page.should have_xpath('.//*', :text => regexp)
+        else
+          assert page.has_xpath?('.//*', :text => regexp)
+        end
+      elsif Kelp.driver == :webrat
+        if defined?(Spec::Rails::Matchers)
+          response.should contain(regexp)
+        else
+          assert_match(regexp, response_body)
+        end
       else
-        assert page.has_xpath?('.//*', :text => regexp)
+        raise RuntimeError, "Unsupported driver: #{Kelp.driver}"
       end
     end
 
@@ -117,10 +137,21 @@ module Kelp
     #   Content you expect to be missing from the page
     #
     def page_should_not_contain_text(text)
-      if page.respond_to? :should
-        page.should have_no_content(text)
+      if Kelp.driver == :capybara
+        if page.respond_to? :should
+          page.should have_no_content(text)
+        else
+          assert page.has_no_content?(text)
+        end
+      elsif Kelp.driver == :webrat
+        if defined?(Spec::Rails::Matchers)
+          response.should_not contain(text)
+        else
+          hc = Webrat::Matchers::HasContent.new(text)
+          assert !hc.matches?(content), hc.negative_failure_message
+        end
       else
-        assert page.has_no_content?(text)
+        raise RuntimeError, "Unsupported driver: #{Kelp.driver}"
       end
     end
 
@@ -131,10 +162,20 @@ module Kelp
     #   Content you expect to fail matching
     #
     def page_should_not_contain_regexp(regexp)
-      if page.respond_to? :should
-        page.should have_no_xpath('.//*', :text => regexp)
+      if Kelp.driver == :capybara
+        if page.respond_to? :should
+          page.should have_no_xpath('.//*', :text => regexp)
+        else
+          assert page.has_no_xpath?('.//*', :text => regexp)
+        end
+      elsif Kelp.driver == :webrat
+        if defined?(Spec::Rails::Matchers)
+          response.should_not contain(regexp)
+        else
+          assert_not_contain(regexp)
+        end
       else
-        assert page.has_no_xpath?('.//*', :text => regexp)
+        raise RuntimeError, "Unsupported driver: #{Kelp.driver}"
       end
     end
 
@@ -152,7 +193,11 @@ module Kelp
     #   Array of Strings that should appear in the same row
     #
     def should_see_in_same_row(texts)
-      page.should have_xpath(xpath_row_containing(texts))
+      if Kelp.driver == :capybara
+        page.should have_xpath(xpath_row_containing(texts))
+      elsif Kelp.driver == :webrat
+        raise RuntimeError, "Not implemented yet"
+      end
     end
 
 
@@ -168,9 +213,12 @@ module Kelp
     #   Array of Strings that should not appear in the same row
     #
     def should_not_see_in_same_row(texts)
-      page.should have_no_xpath(xpath_row_containing(texts))
+      if Kelp.driver == :capybara
+        page.should have_no_xpath(xpath_row_containing(texts))
+      elsif Kelp.driver == :webrat
+        raise RuntimeError, "Not implemented yet"
+      end
     end
 
-
   end
 end

data/lib/kelp/xpath.rb

@@ -6,9 +6,27 @@ module Kelp
     def xpath_row_containing(texts)
       texts = [texts] if texts.class == String
       conditions = texts.collect do |text|
-        "contains(., '#{text}')"
+        "contains(., #{xpath_sanitize(text)})"
       end.join(' and ')
       return "//table//tr[#{conditions}]"
     end
+
+    # Return the given text string in an XPath-safe form, with
+    # any single-quotes escaped by using the XPath `concat`
+    # function to combine them with the rest of the text.
+    #
+    # @example
+    #   xpath_sanitize("Bob's")
+    #   # => concat('Bob', "'", 's')
+    #
+    def xpath_sanitize(text)
+      # If there's nothing to escape, just wrap text in single-quotes
+      if !text.include?("'")
+        return "'#{text}'"
+      else
+        result = text.gsub(/'/, %{', "'", '})
+        return "concat('#{result}')"
+      end
+    end
   end
 end

data/spec/dropdown_spec.rb

@@ -59,6 +59,12 @@ describe Kelp::Dropdown, "dropdown_should_include" do
       dropdown_should_include "Height", "Tall"
     end
 
+    it "a single option with quotes exists in the dropdown" do
+      dropdown_should_include "Quotes", %{Single 'quotes'}
+      dropdown_should_include "Quotes", %{"Double" quotes}
+      dropdown_should_include "Quotes", %{'Single' and "Double" quotes}
+    end
+
     it "multiple options exist in the dropdown" do
       dropdown_should_include "Height", [
         "Short",

data/spec/spec_helper.rb

@@ -1,11 +1,17 @@
 require 'rspec'
+
+# Supported drivers
 require 'capybara'
 require 'capybara/dsl'
+#require 'webrat'
+
 require 'kelp'
 require File.expand_path(File.dirname(__FILE__) + '/test_app/test_app')
 
 RSpec.configure do |config|
   config.include Capybara
+  #config.include Webrat::Methods
+
   config.include Kelp::Attribute
   config.include Kelp::Checkbox
   config.include Kelp::Dropdown
@@ -13,14 +19,21 @@ RSpec.configure do |config|
   config.include Kelp::Navigation
   config.include Kelp::Scoping
   config.include Kelp::Visibility
-  config.after do
-    Capybara.reset_sessions!
-    Capybara.use_default_driver
-  end
+
   config.before do
+    #Kelp.driver = :webrat
     Capybara.default_driver = :rack_test
     Capybara.default_selector = :css
     Capybara.app = TestApp
   end
+
+  config.after do
+    Capybara.reset_sessions!
+    Capybara.use_default_driver
+  end
 end
 
+#Webrat.configure do |config|
+  #config.mode = :rack
+#end
+

data/spec/test_app/views/form.erb

@@ -29,6 +29,14 @@
           <option value="3">Heavy</option>
         </select>
       </p>
+      <p>
+        <label for="quotes">Quotes</label>
+        <select id="quotes">
+          <option value="1">Single 'quotes'</option>
+          <option value="2">"Double" quotes</option>
+          <option value="3">'Single' and "Double" quotes</option>
+        </select>
+      </p>
       <p>
         <label for="favorite_colors">Favorite Colors</label>
         <select id="favorite_colors" multiple="multiple">

data/spec/test_app/views/home.erb

@@ -33,6 +33,10 @@
         <tr> <td>Eric</td> <td>555-4444</td> <td><a href="/edit1">Edit</a></td> </tr>
         <tr> <td>John</td> <td>666-5555</td> <td><a href="/edit2">Edit</a></td> </tr>
         <tr> <td>Terry</td> <td>777-6666</td> <td><a href="/edit3">Edit</a></td> </tr>
+
+        <tr> <td>Eric "Quoted"</td> <td>555-4444</td> <td><a href="/edit1">Edit</a></td> </tr>
+        <tr> <td>"John's" quo'ta'tions</td> <td>666-5555</td> <td><a href="/edit2">Edit</a></td> </tr>
+        <tr> <td>Terry's "Big" thing</td> <td>777-6666</td> <td><a href="/edit3">Edit</a></td> </tr>
       </tbody>
     </table>
   </div>

data/spec/visibility_spec.rb

@@ -183,13 +183,17 @@ describe Kelp::Visibility, "should_see_in_same_row" do
     it "two strings are in the same row" do
       should_see_in_same_row ["Eric", "Edit"]
       should_see_in_same_row ["John", "Edit"]
-      should_see_in_same_row ["Terry", "Edit"]
+    end
+
+    it "two strings are in the same row, and one has single and/or double-quotes" do
+      should_see_in_same_row [%{Eric "Quoted"}, "Edit"]
+      should_see_in_same_row [%{"John's" quo'ta'tions}, "Edit"]
+      should_see_in_same_row [%{Terry's "Big" thing}, "Edit"]
     end
 
     it "three strings are in the same row" do
       should_see_in_same_row ["Eric", "555-4444", "Edit"]
       should_see_in_same_row ["John", "666-5555", "Edit"]
-      should_see_in_same_row ["Terry", "777-6666", "Edit"]
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kelp
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Eric Pierce
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 -07:00
+date: 2011-04-06 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: webrat
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -46,12 +46,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: sinatra
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,11 +77,11 @@ dependencies:
         - 0
         version: 2.2.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,11 +91,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,7 +105,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 description: "    Kelp is a collection of helper methods for Cucumber to ease the process of\n    writing step definitions.\n"
 email: wapcaplet88@gmail.com
 executables: []