cucumber-rails 0.4.0.beta.1 → 0.4.0

data/templates/install/config/cucumber.yml.erb

@@ -1,7 +1,7 @@
 <%%
 rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
 rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --strict --tags ~@wip"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags ~@wip"
 %>
 default: <%= spork? ? '--drb ' : '' %><%%= std_opts %> features
 wip: <%= spork? ? '--drb ' : '' %>--tags @wip:3 --wip features

data/templates/install/step_definitions/capybara_steps.rb.erb

@@ -3,14 +3,25 @@
 require 'uri'
 require 'cgi'
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "selectors"))
 
 module WithinHelpers
   def with_scope(locator)
-    locator ? within(locator) { yield } : yield
+    locator ? within(*selector_for(locator)) { yield } : yield
   end
 end
 World(WithinHelpers)
 
+# Single-line step scoper
+When /^(.*) within ([^:]+)$/ do |step, parent|
+  with_scope(parent) { When step }
+end
+
+# Multi-line step scoper
+When /^(.*) within ([^:]+):$/ do |step, parent, table_or_string|
+  with_scope(parent) { When "#{step}:", table_or_string }
+end
+
 Given /^(?:|I )am on (.+)$/ do |page_name|
   visit path_to(page_name)
 end
@@ -19,28 +30,20 @@ When /^(?:|I )go to (.+)$/ do |page_name|
   visit path_to(page_name)
 end
 
-When /^(?:|I )press "([^"]*)"(?: within "([^"]*)")?$/ do |button, selector|
-  with_scope(selector) do
-    click_button(button)
-  end
+When /^(?:|I )press "([^"]*)"$/ do |button|
+  click_button(button)
 end
 
-When /^(?:|I )follow "([^"]*)"(?: within "([^"]*)")?$/ do |link, selector|
-  with_scope(selector) do
-    click_link(link)
-  end
+When /^(?:|I )follow "([^"]*)"$/ do |link|
+  click_link(link)
 end
 
-When /^(?:|I )fill in "([^"]*)" with "([^"]*)"(?: within "([^"]*)")?$/ do |field, value, selector|
-  with_scope(selector) do
-    fill_in(field, :with => value)
-  end
+When /^(?:|I )fill in "([^"]*)" with "([^"]*)"$/ do |field, value|
+  fill_in(field, :with => value)
 end
 
-When /^(?:|I )fill in "([^"]*)" for "([^"]*)"(?: within "([^"]*)")?$/ do |value, field, selector|
-  with_scope(selector) do
-    fill_in(field, :with => value)
-  end
+When /^(?:|I )fill in "([^"]*)" for "([^"]*)"$/ do |value, field|
+  fill_in(field, :with => value)
 end
 
 # Use this to fill in an entire form with data from a table. Example:
@@ -54,95 +57,70 @@ end
 # TODO: Add support for checkbox, select og option
 # based on naming conventions.
 #
-When /^(?:|I )fill in the following(?: within "([^"]*)")?:$/ do |selector, fields|
-  with_scope(selector) do
-    fields.rows_hash.each do |name, value|
-      When %{I fill in "#{name}" with "#{value}"}
-    end
+When /^(?:|I )fill in the following:$/ do |fields|
+  fields.rows_hash.each do |name, value|
+    When %{I fill in "#{name}" with "#{value}"}
   end
 end
 
-When /^(?:|I )select "([^"]*)" from "([^"]*)"(?: within "([^"]*)")?$/ do |value, field, selector|
-  with_scope(selector) do
-    select(value, :from => field)
-  end
+When /^(?:|I )select "([^"]*)" from "([^"]*)"$/ do |value, field|
+  select(value, :from => field)
 end
 
-When /^(?:|I )check "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector|
-  with_scope(selector) do
-    check(field)
-  end
+When /^(?:|I )check "([^"]*)"$/ do |field|
+  check(field)
 end
 
-When /^(?:|I )uncheck "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector|
-  with_scope(selector) do
-    uncheck(field)
-  end
-end
-
-When /^(?:|I )choose "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector|
-  with_scope(selector) do
-    choose(field)
-  end
+When /^(?:|I )uncheck "([^"]*)"$/ do |field|
+  uncheck(field)
 end
 
-When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"(?: within "([^"]*)")?$/ do |path, field, selector|
-  with_scope(selector) do
-    attach_file(field, File.expand_path(path))
-  end
+When /^(?:|I )choose "([^"]*)"$/ do |field|
+  choose(field)
 end
 
-Then /^(?:|I )should see JSON:$/ do |expected_json|
-  require 'json'
-  expected = JSON.pretty_generate(JSON.parse(expected_json))
-  actual   = JSON.pretty_generate(JSON.parse(response.body))
-  expected.should == actual
+When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"$/ do |path, field|
+  attach_file(field, File.expand_path(path))
 end
 
-Then /^(?:|I )should see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector|
-  with_scope(selector) do
-    if page.respond_to? :should
-      page.should have_content(text)
-    else
-      assert page.has_content?(text)
-    end
+Then /^(?:|I )should see "([^"]*)"$/ do |text|
+  if page.respond_to? :should
+    page.should have_content(text)
+  else
+    assert page.has_content?(text)
   end
 end
 
-Then /^(?:|I )should see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector|
+Then /^(?:|I )should see \/([^\/]*)\/$/ do |regexp|
   regexp = Regexp.new(regexp)
-  with_scope(selector) do
-    if page.respond_to? :should
-      page.should have_xpath('//*', :text => regexp)
-    else
-      assert page.has_xpath?('//*', :text => regexp)
-    end
+
+  if page.respond_to? :should
+    page.should have_xpath('//*', :text => regexp)
+  else
+    assert page.has_xpath?('//*', :text => regexp)
   end
 end
 
-Then /^(?:|I )should not see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector|
-  with_scope(selector) do
-    if page.respond_to? :should
-      page.should have_no_content(text)
-    else
-      assert page.has_no_content?(text)
-    end
+Then /^(?:|I )should not see "([^"]*)"$/ do |text|
+  if page.respond_to? :should
+    page.should have_no_content(text)
+  else
+    assert page.has_no_content?(text)
   end
 end
 
-Then /^(?:|I )should not see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector|
+Then /^(?:|I )should not see \/([^\/]*)\/$/ do |regexp|
   regexp = Regexp.new(regexp)
-  with_scope(selector) do
-    if page.respond_to? :should
-      page.should have_no_xpath('//*', :text => regexp)
-    else
-      assert page.has_no_xpath?('//*', :text => regexp)
-    end
+
+  if page.respond_to? :should
+    page.should have_no_xpath('//*', :text => regexp)
+  else
+    assert page.has_no_xpath?('//*', :text => regexp)
   end
 end
 
-Then /^the "([^"]*)" field(?: within "([^"]*)")? should contain "([^"]*)"$/ do |field, selector, value|
-  with_scope(selector) do
+Then /^the "([^"]*)" field(?: within (.*))? should contain "([^"]*)"$/ do |field, parent, value|
+  with_scope(parent) do
     field = find_field(field)
     field_value = (field.tag_name == 'textarea') ? field.text : field.value
     if field_value.respond_to? :should
@@ -153,8 +131,8 @@ Then /^the "([^"]*)" field(?: within "([^"]*)")? should contain "([^"]*)"$/ do |
   end
 end
 
-Then /^the "([^"]*)" field(?: within "([^"]*)")? should not contain "([^"]*)"$/ do |field, selector, value|
-  with_scope(selector) do
+Then /^the "([^"]*)" field(?: within (.*))? should not contain "([^"]*)"$/ do |field, parent, value|
+  with_scope(parent) do
     field = find_field(field)
     field_value = (field.tag_name == 'textarea') ? field.text : field.value
     if field_value.respond_to? :should_not
@@ -165,8 +143,8 @@ Then /^the "([^"]*)" field(?: within "([^"]*)")? should not contain "([^"]*)"$/
   end
 end
 
-Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should be checked$/ do |label, selector|
-  with_scope(selector) do
+Then /^the "([^"]*)" checkbox(?: within (.*))? should be checked$/ do |label, parent|
+  with_scope(parent) do
     field_checked = find_field(label)['checked']
     if field_checked.respond_to? :should
       field_checked.should be_true
@@ -176,8 +154,8 @@ Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should be checked$/ do |labe
   end
 end
 
-Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should not be checked$/ do |label, selector|
-  with_scope(selector) do
+Then /^the "([^"]*)" checkbox(?: within (.*))? should not be checked$/ do |label, parent|
+  with_scope(parent) do
     field_checked = find_field(label)['checked']
     if field_checked.respond_to? :should
       field_checked.should be_false

data/templates/install/step_definitions/web_steps_cs.rb.erb

@@ -2,6 +2,17 @@
 <%= embed_file('support/edit_warning.txt') %>
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "selectors"))
+
+# Single-line step scoper
+When /^(.*) uvnitř ([^:]+)$/ do |step, parent|
+  with_scope(parent) { When step }
+end
+
+# Multi-line step scoper
+When /^(.*) uvnitř ([^:]+):$/ do |step, parent, table_or_string|
+  with_scope(parent) { When "#{step}:", table_or_string }
+end
 
 Given /^jsem na (.+)$/ do |page_name|
   Given %{I am on #{page_name}}
@@ -19,10 +30,6 @@ When /^kliknu na "([^"]*)"$/ do |link|
   When %{I follow "#{link}"}
 end
 
-When /^kliknu na "([^"]*)" uvnitř "([^"]*)"$/ do |link, parent|
-  When %{I follow "#{link}" within "#{parent}"}
-end
-
 When /^vyplním pole "([^"]*)" hodnotou "([^"]*)"$/ do |field, value|
   When %{I fill in "#{field}" with "#{value}"}
 end
@@ -83,34 +90,18 @@ Then /^(?:|také )bych měl vidět "([^"]*)"$/ do |text|
   Then %{I should see "#{text}"}
 end
 
-Then /^(?:|také )bych měl vidět "([^"]*)" uvnitř "([^"]*)"$/ do |text, selector|
-  Then %{I should see "#{text}" within "#{selector}"}
-end
-
 Then /^(?:|také )bych měl vidět \/([^\/]*)\/$/ do |regexp|
   Then %{I should see /#{regexp}/}
 end
 
-Then /^(?:|také )bych měl vidět \/([^\/]*)\/ uvnitř "([^"]*)"$/ do |regexp, selector|
-  Then %{I should see /#{regexp}/ within "#{selector}"}
-end
-
 Then /^(?:|také )bych neměl vidět "([^"]*)"$/ do |text|
   Then %{I should not see "#{text}"}
 end
 
-Then /^(?:|také )bych neměl vidět "([^"]*)" uvnitř "([^"]*)"$/ do |text, selector|
-  Then %{I should not see "#{text}" within "#{selector}"}
-end
-
 Then /^(?:|také )bych neměl vidět \/([^\/]*)\/$/ do |regexp|
   Then %{I should not see /#{regexp}/}
 end
 
-Then /^(?:|také )bych neměl vidět \/([^\/]*)\/ uvnitř "([^"]*)"$/ do |regexp, selector|
-  Then %{I should not see /#{regexp}/ within "#{selector}"}
-end
-
 Then /^pole "([^"]*)" by mělo obsahovat "([^"]*)"$/ do |field, value|
   Then %{the "#{field}" field should contain "#{value}"}
 end

data/templates/install/step_definitions/web_steps_da.rb.erb

@@ -2,6 +2,17 @@
 <%= embed_file('support/edit_warning.txt') %>
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "selectors"))
+
+# Single-line step scoper
+Når /^(.*) under ([^:]+)$/ do |step, parent|
+  with_scope(parent) { Når step }
+end
+
+# Multi-line step scoper
+Når /^(.*) under ([^:]+):$/ do |step, parent, table_or_string|
+  with_scope(parent) { Når "#{step}:", table_or_string }
+end
 
 Givet /^(?:|at )jeg står på (.*)$/ do |page_name|
   Given %{I am on #{page_name}}
@@ -19,10 +30,6 @@ Når /^jeg klikker "([^"]*)"$/ do |link|
   When %{I follow "#{link}"}
 end
 
-Når /^jeg klikker "([^"]*)" under "([^"]*)"$/ do |link, parent|
-  When %{I follow "#{link}" within "#{parent}"}
-end
-
 Når /^jeg fylder ud "([^"]*)" med "([^"]*)"$/ do |field, value|
   When %{I fill in "#{field}" with "#{value}"}
 end
@@ -61,34 +68,18 @@ Så /^(?:skal jeg|jeg skal) se "([^"]*)"$/ do |text|
   Then %{I should see "#{text}"}
 end
 
-Så /^(?:skal jeg|jeg skal) se "([^"]*)" under "([^"]*)"$/ do |text, selector|
-  Then %{I should see "#{text}" within "#{selector}"}
-end
-
 Så /^(?:skal jeg|jeg skal) se \/([^\/]*)\/$/ do |regexp|
   Then %{I should see /#{regexp}/}
 end
 
-Så /^(?:skal jeg|jeg skal) se \/([^\/]*)\/ under "([^"]*)"$/ do |regexp, selector|
-  Then %{I should see /#{regexp}/ within "#{selector}"}
-end
-
 Så /^(?:skal jeg|jeg skal) ikke se "([^"]*)"$/ do |text|
   Then %{I should not see "#{text}"}
 end
 
-Så /^(?:skal jeg|jeg skal) ikke se "([^"]*)" under "([^"]*)"$/ do |text, selector|
-  Then %{I should not see "#{text}" within "#{selector}"}
-end
-
 Så /^(?:skal jeg|jeg skal) ikke se \/([^\/]*)\/$/ do |regexp|
   Then %{I should not see /#{regexp}/}
 end
 
-Så /^(?:skal jeg|jeg skal) ikke se \/([^\/]*)\/ under "([^"]*)"$/ do |regexp, selector|
-  Then %{I should not see /#{regexp}/ within "#{selector}"}
-end
-
 Så /^(?:skal )"([^"]*)" feltet (?:skal )indeholde "([^"]*)"$/ do |field, value|
   Then %{the "#{field}" field should contain "#{value}"}
 end

data/templates/install/step_definitions/web_steps_es.rb.erb

@@ -2,6 +2,17 @@
 <%= embed_file('support/edit_warning.txt') %>
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "selectors"))
+
+# Single-line step scoper
+Cuando /^(.*) dentro de ([^:]+)$/ do |step, parent|
+  with_scope(parent) { Cuando step }
+end
+
+# Multi-line step scoper
+Cuando /^(.*) dentro de ([^:]+):$/ do |step, parent, table_or_string|
+  with_scope(parent) { Cuando "#{step}:", table_or_string }
+end
 
 Dado /^que estoy en (.+)$/ do |page_name|
   Given %{I am on #{page_name}}
@@ -19,10 +30,6 @@ Cuando /^clickeo "([^"]*)"$/ do |link|
   When %{I follow "#{link}"}
 end
 
-Cuando /^clickeo "([^"]*)" dentro de "([^"]*)"$/ do |link, parent|
-  When %{I follow "#{link}" within "#{parent}"}
-end
-
 Cuando /^completo "([^"]*)" con "([^"]*)"$/ do |field, value|
   When %{I fill in "#{field}" with "#{value}"}
 end
@@ -83,34 +90,18 @@ Entonces /^debería ver "([^"]*)"$/ do |text|
   Then %{I should see "#{text}"}
 end
 
-Entonces /^debería ver "([^"]*)" dentro de "([^"]*)"$/ do |text, selector|
-  Then %{I should see "#{text}" within "#{selector}"}
-end
-
 Entonces /^debería ver \/([^\/]*)\/$/ do |regexp|
   Then %{I should see /#{regexp}/}
 end
 
-Entonces /^debería ver \/([^\/]*)\/ dentro de "([^"]*)"$/ do |regexp, selector|
-  Then %{I should see /#{regexp}/ within "#{selector}"}
-end
-
 Entonces /^no debería ver "([^"]*)"$/ do |text|
   Then %{I should not see "#{text}"}
 end
 
-Entonces /^no debería ver "([^"]*)" dentro de "([^"]*)"$/ do |text, selector|
-  Then %{I should not see "#{text}" within "#{selector}"}
-end
-
 Entonces /^no debería ver \/([^\/]*)\/$/ do |regexp|
   Then %{I should not see /#{regexp}/}
 end
 
-Entonces /^no debería ver \/([^\/]*)\/ dentro de "([^"]*)"$/ do |regexp, selector|
-  Then %{I should not see /#{regexp}/ within "#{selector}"}
-end
-
 Entonces /^el campo "([^"]*)" debería contener "([^"]*)"$/ do |field, value|
   Then %{the "#{field}" field should contain "#{value}"}
 end

data/templates/install/step_definitions/web_steps_ja.rb.erb

@@ -2,6 +2,7 @@
 <%= embed_file('support/edit_warning.txt') %>
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "selectors"))
 
 前提 /^"([^"]*)"ページを表示している$/ do |page_name|
   Given %{I am on #{page_name}}

data/templates/install/step_definitions/web_steps_ko.rb.erb

@@ -2,6 +2,7 @@
 <%= embed_file('support/edit_warning.txt') %>
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "selectors"))
 
 조건 /^(.+)페이지에 있습니다$/ do |page_name|
   Given %{I am on #{page_name}}

data/templates/install/step_definitions/web_steps_no.rb.erb

@@ -2,6 +2,17 @@
 <%= embed_file('support/edit_warning.txt') %>
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "selectors"))
+
+# Single-line step scoper
+Når /^(.*) under ([^:]+)$/ do |step, parent|
+  with_scope(parent) { Når step }
+end
+
+# Multi-line step scoper
+Når /^(.*) under ([^:]+):$/ do |step, parent, table_or_string|
+  with_scope(parent) { Når "#{step}:", table_or_string }
+end
 
 Gitt /^(?:|at )jeg står på (.*)$/ do |page_name|
   Given %{I am on #{page_name}}
@@ -19,10 +30,6 @@ Når /^jeg klikker "([^"]*)"$/ do |link|
   When %{I follow "#{link}"}
 end
 
-Når /^jeg klikker "([^"]*)" under "([^"]*)"$/ do |link, parent|
-  When %{I follow "#{link}" within "#{parent}"}
-end
-
 Når /^jeg fyller inn "([^"]*)" med "([^"]*)"$/ do |field, value|
   When %{I fill in "#{field}" with "#{value}"}
 end
@@ -61,34 +68,18 @@ Så /^(?:skal jeg|jeg skal) se "([^"]*)"$/ do |text|
   Then %{I should see "#{text}"}
 end
 
-Så /^(?:skal jeg|jeg skal) se "([^"]*)" under "([^"]*)"$/ do |text, selector|
-  Then %{I should see "#{text}" within "#{selector}"}
-end
-
 Så /^(?:skal jeg|jeg skal) se \/([^\/]*)\/$/ do |regexp|
   Then %{I should see /#{regexp}/}
 end
 
-Så /^(?:skal jeg|jeg skal) se \/([^\/]*)\/ under "([^"]*)"$/ do |regexp, selector|
-  Then %{I should see /#{regexp}/ within "#{selector}"}
-end
-
 Så /^(?:skal jeg|jeg skal) ikke se "([^"]*)"$/ do |text|
   Then %{I should not see "#{text}"}
 end
 
-Så /^(?:skal jeg|jeg skal) ikke se "([^"]*)" under "([^"]*)"$/ do |text, selector|
-  Then %{I should not see "#{text}" within "#{selector}"}
-end
-
 Så /^(?:skal jeg|jeg skal) ikke se \/([^\/]*)\/$/ do |regexp|
   Then %{I should not see /#{regexp}/}
 end
 
-Så /^(?:skal jeg|jeg skal) ikke se \/([^\/]*)\/ under "([^"]*)"$/ do |regexp, selector|
-  Then %{I should not see /#{regexp}/ within "#{selector}"}
-end
-
 Så /^(?:skal )"([^"]*)" feltet (?:skal )inneholde "([^"]*)"$/ do |field, value|
   Then %{the "#{field}" field should contain "#{value}"}
 end