sandwich 0.0.16 → 0.0.17

data/VERSION

@@ -1 +1 @@
-0.0.16
+0.0.17

data/lib/sandwich/cucumber/table_steps.rb

@@ -1,3 +1,9 @@
+When /^I follow "([^\"]*)" within the row with "([^\"]*)"$/ do |link, text|
+  inside("//tr[td and contains(., '#{text}')]") do
+    click_link(link)
+  end
+end
+
 When /^I fill in the "([^"]+)" row, "([^"]+)" column in (.+?) with "([^"]+)"$/ do |row, column, path, value|
   selector = xpath(selector_for(path))
   _, column_index = page.find(:xpath, "#{selector}//tr", :text => /#{column}/).
@@ -11,6 +17,14 @@ Then /^I should see "([^"]+)" in the (\w+) data row of (.+)$/ do |value, ordinal
   page.should have_xpath("(#{xpath(selector_for(path))}//tr[td])[#{ordinal.to_i}]", :text => value)
 end
 
-Then /^I should see (\d+) entr(?:y|ies) in ([^\"]+)$/ do |total, path|
-  page.should have_xpath("#{xpath(selector_for(path))}//tr[td]", :count => total.to_i)
+Then /^I should see (\d+|no) entr(?:y|ies) in ([^\"]+)$/ do |total, path|
+  if total.to_i == 0
+    page.should have_no_xpath("#{xpath(selector_for(path))}//tr[td]")
+  else
+    page.should have_xpath("#{xpath(selector_for(path))}//tr[td]", :count => total.to_i)
+  end
+end
+
+Then /^I should see "([^\"]*)" within the row with "([^\"]*)"$/ do |expected, text|
+  page.should have_xpath("//tr[contains(., '#{text}')]", :text => expected)
 end

data/lib/sandwich/cucumber/web_steps.rb

@@ -1,7 +1,7 @@
 module Sandwich
   module WithinHelper
-    def inside(locator)
-      locator ? within(:xpath, xpath(locator)) { yield } : yield    
+    def inside(locator, options = {})
+      locator ? within(:xpath, locator) { yield } : yield    
     end
   end
 end
@@ -9,7 +9,7 @@ end
 World(Sandwich::WithinHelper)
 
 When /^I follow "([^\"]*)"(?: (?:with)?in (.+))$/ do |link, container|
-  inside(selector_for(container)) { click_link(link) }
+  inside(xpath(selector_for(container))) { click_link(link) }
 end
 
 Then /^I should see "([^\"]*)" (?:with)?in (.+)$/ do |text, selector|
@@ -28,6 +28,20 @@ Then /^I should see (.+)$/ do |selector|
   locate(:xpath, xpath(selector_for(selector)))
 end
 
+When /^I fill in the following:$/ do |table|
+  table.raw.each do |(k, v)|
+    node = find(:xpath, Capybara::XPath.field(k))
+
+    raise Capybara::ElementNotFound, "Unable to locate '#{k}'" unless node
+    
+    if (node.tag_name == 'select')
+      node.select(v)
+    else
+      node.set(v)
+    end
+  end
+end
+
 When /^I fill in (.+) with the following:$/ do |selector, table|
   within(:xpath, xpath(selector_for(selector))) do
     table.raw.each do |(k, v)|

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 16
-  version: 0.0.16
+  - 17
+  version: 0.0.17
 platform: ruby
 authors: 
 - David Leal
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 +01:00
+date: 2010-05-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency