sandwich 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/sandwich/cucumber/debug_steps.rb

@@ -18,6 +18,10 @@ Then /^show me the source for ([^\"]+)$/ do |selector|
   puts locate(selector_for(selector)).html
 end
 
+Then /^wait (\d+)$/ do |time|
+  sleep time.to_i
+end
+
 Then /^show me the page text$/ do
   IO.popen("html2text", "w+") do |io| 
     io.puts response.body

data/lib/sandwich/cucumber/model_steps.rb

@@ -16,10 +16,10 @@ Transform /(an?|\d+) (.+) #{qc}$/ do |total, what, value|
     model = class_for(what)
   end
 
-    raise \
-%q{No attribute passed and no default attribute defined. You can do that with:
+  raise \
+%Q{No attribute passed and no default attribute defined. You can do that with:
 
-  YourModel.default_attribute :your_default_attribute
+#{model}.default_attribute :your_default_attribute
 
 } if attr.nil?
 
@@ -37,12 +37,9 @@ Transform /the (.+) #{qc}$/ do |what, value|
   klass.find(:first, :conditions => {klass.default_attribute => value})
 end
 
-Given /^(.+) belonging to (.+)$/ do |child, parent|
+Given /^(.+) belong(?:ing|s) to (.+)$/ do |child, parent|
   child.send("#{parent.class.name.underscore}=", parent)
-end
-
-Given /^(a .+ with .+)$/ do |obj| 
-  # la la la la
+  child.save!
 end
 
 Given /^(.+) has (.+)$/ do |parent, child|
@@ -66,7 +63,7 @@ end
 Given /^the following (.+):$/ do |what, table|
   class_for(what.singularize).tap do |model|
     table.hashes.each do |h|
-      model.make(Hash[*h.each_pair.map { |(k, v)| [k.underscore, v] }.flatten])
+      model.make(Hash[*h.each_pair.map { |(k, v)| [k.underscore, value_for(model, k, v)] }.flatten])
     end
   end
 end

data/lib/sandwich/cucumber/table_steps.rb

@@ -1,12 +1,12 @@
 When /^I fill in the #{qc} row, #{qc} column in (.+?) with #{qc}$/ do |row, column, path, value|
   selector = xpath(selector_for(path))
-  _, column_index = page.all(:xpath, "#{selector}//th").each_with_index.find { |e, i| e.text == column }
+  _, column_index = page.find(:xpath, "#{selector}//tr", :text => /#{column}/).
+                      all(:xpath, "*").each_with_index.find { |e, i| e.text == column }
   _, row_index    = page.all(:xpath, "#{selector}//tr").each_with_index.find { |e, i| e.text.include?(row) }
+
   page.locate(:xpath, "((#{selector}//tr)[#{row_index + 1}]/td)[#{column_index + 1}]/input").set(value)
 end
 
 Then /^I should see #{qc} in the (\w+) data row of (.+)$/ do |value, ordinal, path|
-  within(selector_for(path)) do
-    page.should have_xpath("//tr[#{ordinal.to_i}]/td", :text => value)
-  end
+  page.should have_xpath("(#{xpath(selector_for(path))}//tr[td])[#{ordinal.to_i}]", :text => value)
 end

data/lib/sandwich/cucumber/web_steps.rb

@@ -1,3 +1,31 @@
-Then /^I should see "([^\"]*)" within (.+)$/ do |text, selector|
+Then /^I should see "([^\"]*)" (?:with)?in (.+)$/ do |text, selector|
   page.should have_xpath(xpath(selector_for(selector)), :text => text)
 end
+
+Then /^I should see the header "([^\"]*)"$/ do |text|
+  page.should have_xpath("//h1 | //h2 | //h3 | //h4 | //h5 | //h6")
+end
+
+Then /^I should see the (notice|error) "([^\"]*)"$/ do |type, message|
+  locate(:xpath, xpath(selector_for(type)), :text => message)
+end
+
+Then /^I should see (.+)$/ do |selector|
+  locate(:xpath, xpath(selector_for(selector)))
+end
+
+When /^I fill in (.+) with the following:$/ do |selector, table|
+  within(:xpath, xpath(selector_for(selector))) do
+    table.raw.each do |(k, v)|
+      node = find(:xpath, Capybara::XPath.field(k))
+
+      raise Capybara::ElementNotFound, "Unable to locate '#{selector_for(selector)}'" unless node
+      
+      if (node.tag_name == 'select')
+        node.select(v)
+      else
+        node.set(v)
+      end
+    end
+  end
+end

data/lib/sandwich/cucumber/world.rb

@@ -4,8 +4,23 @@ module Sandwich
       name.underscore.classify.constantize
     end
 
-    def xpath(selector)
-      if Capybara.default_selector.to_sym == :css
+    def value_for(model, attr, value)
+      if assoc = model.reflect_on_association(attr.to_sym)
+        assoc_class = assoc.class_name.constantize
+        assoc_class.make(assoc_class.default_attribute => value)
+      else
+        value
+      end
+    end
+
+    def xpath(unknown_selector)
+      kind, selector = if Array === unknown_selector
+                         [unknown_selector[0].to_sym, unknown_selector[1]]
+                       else
+                         [Capybara.default_selector.to_sym, unknown_selector]
+                       end
+
+      if kind == :css
         Capybara::XPath.from_css(selector)
       else
         selector

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - David Leal
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 +01:00
+date: 2010-04-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency