cucumber-rails 0.3.0 → 0.3.1

data/templates/skeleton/step_definitions/web_steps_de.rb.erb

@@ -3,134 +3,134 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 
-Given /^(?:|ich )bin auf (.+)$/ do |page_name|
+Angenommen /^(?:|ich )bin auf (.+)$/ do |page_name|
   Given %{I am on #{page_name}}
 end
 
-When /^(?:|ich )auf (.+) gehe$/ do |page_name|
+Wenn /^(?:|ich )auf (.+) gehe$/ do |page_name|
   When %{I go to #{page_name}}
 end
 
-When /^(?:|ich )auf "([^\"]*)" drücke$/ do |button|
+Wenn /^(?:|ich )auf "([^\"]*)" drücke$/ do |button|
   When %{I press "#{button}"}
 end
 
-When /^(?:|ich )auf "([^\"]*)" klicke$/ do |link|
+Wenn /^(?:|ich )auf "([^\"]*)" klicke$/ do |link|
   When %{I follow "#{link}"}
 end
 
-When /^(?:|ich )auf "([^\"]*)" innerhalb "([^\"]*)" klicke$/ do |link, parent|
+Wenn /^(?:|ich )auf "([^\"]*)" innerhalb "([^\"]*)" klicke$/ do |link, parent|
   When %{I follow "#{link}" within "#{parent}"}
 end
 
-When /^(?:|ich )"([^\"]*)" mit "([^\"]*)" ausfülle$/ do |field, value|
+Wenn /^(?:|ich )"([^\"]*)" mit "([^\"]*)" ausfülle$/ do |field, value|
   When %{I fill in "#{field}" with "#{value}"}
 end
 
-When /^(?:|ich )"([^\"]*)" in "([^\"]*)" eingebe$/ do |value, field|
+Wenn /^(?:|ich )"([^\"]*)" in "([^\"]*)" eingebe$/ do |value, field|
   When %{I fill in "#{value}" for "#{field}"}
 end
 
-When /^(?:|ich )folgendes eingebe:$/ do |fields|
+Wenn /^(?:|ich )folgendes eingebe:$/ do |fields|
   When %{I fill in the following:}, fields
 end
 
-When /^(?:|ich )"([^\"]*)" in "([^\"]*)" auswähle$/ do |value, field|
+Wenn /^(?:|ich )"([^\"]*)" in "([^\"]*)" auswähle$/ do |value, field|
   When %{I select "#{value}" from "#{field}"}
 end
 
-When /^(?:|ich )"([^\"]*)" als Datum und Uhrzeit auswähle$/ do |time|
+Wenn /^(?:|ich )"([^\"]*)" als Datum und Uhrzeit auswähle$/ do |time|
   When %{I select "#{time}" as the date and time}
 end
 
-When /^(?:|ich )"([^\"]*)" als "([^\"]*)" Datum und Uhrzeit auswähle$/ do |datetime, datetime_label|
+Wenn /^(?:|ich )"([^\"]*)" als "([^\"]*)" Datum und Uhrzeit auswähle$/ do |datetime, datetime_label|
   When %{I select "#{datetime}" as the "#{datetime_label}" date and time}
 end
 
-When /^(?:|ich )"([^\"]*)" als Uhrzeit auswähle$/ do |time|
+Wenn /^(?:|ich )"([^\"]*)" als Uhrzeit auswähle$/ do |time|
   When %{I select "#{time}" as the time}
 end
 
-When /^(?:|ich )"([^\"]*)" als "([^\"]*)" Uhrzeit auswähle$/ do |time, time_label|
+Wenn /^(?:|ich )"([^\"]*)" als "([^\"]*)" Uhrzeit auswähle$/ do |time, time_label|
   When %{I select "#{time}" as the "#{time_label}" time}
 end
 
-When /^(?:|ich )"([^\"]*)" als Datum auswähle$/ do |date|
+Wenn /^(?:|ich )"([^\"]*)" als Datum auswähle$/ do |date|
   When %{I select "#{date}" as the date}
 end
 
-When /^(?:|ich )"([^\"]*)" als "([^\"]*)" Datum auswähle$/ do |date, date_label|
+Wenn /^(?:|ich )"([^\"]*)" als "([^\"]*)" Datum auswähle$/ do |date, date_label|
   When %{I select "#{date}" as the "#{date_label}" date}
 end
 
-When /^(?:|ich )"([^\"]*)" anhake$/ do |field|
+Wenn /^(?:|ich )"([^\"]*)" anhake$/ do |field|
   When %{I check "#{field}"}
 end
 
-When /^(?:|ich )"([^\"]*)" abhake$/ do |field|
+Wenn /^(?:|ich )"([^\"]*)" abhake$/ do |field|
   When %{I uncheck "#{field}"}
 end
 
-When /^(?:|ich )"([^\"]*)" auswähle$/ do |field|
+Wenn /^(?:|ich )"([^\"]*)" auswähle$/ do |field|
   When %{I choose "#{field}"}
 end
 
-When /^(?:|ich )die Datei "([^\"]*)" als "([^\"]*)" anhänge$/ do |path, field|
+Wenn /^(?:|ich )die Datei "([^\"]*)" als "([^\"]*)" anhänge$/ do |path, field|
   When %{I attach the file "#{path}" to "#{field}"}
 end
 
-Then /^(?:|ich sollte |sollte (?:|ich )?)"([^\"]*)" sehen$/ do |text|
+Dann /^(?:|ich sollte |sollte (?:|ich )?)"([^\"]*)" sehen$/ do |text|
   Then %{I should see "#{text}"}
 end
 
-Then /^(?:|ich sollte |sollte (?:|ich )?)"([^\"]*)" innerhalb "([^\"]*)" sehen$/ do |text, selector|
+Dann /^(?:|ich sollte |sollte (?:|ich )?)"([^\"]*)" innerhalb "([^\"]*)" sehen$/ do |text, selector|
   Then %{I should see "#{text}" within "#{selector}"}
 end
 
-Then /^(?:|ich sollte |sollte (?:|ich )?)\/([^\/]*)\/ sehen$/ do |regexp|
+Dann /^(?:|ich sollte |sollte (?:|ich )?)\/([^\/]*)\/ sehen$/ do |regexp|
   Then %{I should see /#{regexp}/}
 end
 
-Then /^(?:|ich sollte |sollte (?:|ich )?)\/([^\/]*)\/ innerhalb "([^\"]*)" sehen$/ do |regexp, selector|
+Dann /^(?:|ich sollte |sollte (?:|ich )?)\/([^\/]*)\/ innerhalb "([^\"]*)" sehen$/ do |regexp, selector|
   Then %{I should see /#{regexp}/ within "#{selector}"}
 end
 
-Then /^(?:|ich sollte |sollte (?:|ich )?)nicht "([^\"]*)" sehen$/ do |text|
+Dann /^(?:|ich sollte |sollte (?:|ich )?)nicht "([^\"]*)" sehen$/ do |text|
   Then %{I should not see "#{text}"}
 end
 
-Then /^(?:|ich sollte |sollte (?:|ich )?)nicht "([^\"]*)" innerhalb "([^\"]*)" sehen$/ do |text, selector|
+Dann /^(?:|ich sollte |sollte (?:|ich )?)nicht "([^\"]*)" innerhalb "([^\"]*)" sehen$/ do |text, selector|
   Then %{I should not see "#{text}" within "#{selector}"}
 end
 
-Then /^(?:|ich sollte |sollte (?:|ich )?)nicht \/([^\/]*)\/ sehen$/ do |regexp|
+Dann /^(?:|ich sollte |sollte (?:|ich )?)nicht \/([^\/]*)\/ sehen$/ do |regexp|
   Then %{I should not see /#{regexp}/}
 end
 
-Then /^(?:|ich sollte |sollte (?:|ich )?)nicht \/([^\/]*)\/ innerhalb "([^\"]*)" sehen$/ do |regexp, selector|
+Dann /^(?:|ich sollte |sollte (?:|ich )?)nicht \/([^\/]*)\/ innerhalb "([^\"]*)" sehen$/ do |regexp, selector|
   Then %{I should not see /#{regexp}/ within "#{selector}"}
 end
 
-Then /^sollte das "([^\"]*)" Feld "([^\"]*)" enthalten$/ do |field, value|
+Dann /^sollte das "([^\"]*)" Feld "([^\"]*)" enthalten$/ do |field, value|
   Then %{the "#{field}" field should contain "#{value}"}
 end
 
-Then /^sollte das "([^\"]*)" Feld nicht "([^\"]*)" enthalten$/ do |field, value|
+Dann /^sollte das "([^\"]*)" Feld nicht "([^\"]*)" enthalten$/ do |field, value|
   Then %{the "#{field}" field should not contain "#{value}"}
 end
 
-Then /^sollte die "([^\"]*)" Checkbox angehakt sein$/ do |label|
+Dann /^sollte die "([^\"]*)" Checkbox angehakt sein$/ do |label|
   Then %{the "#{label}" checkbox should be checked}
 end
 
-Then /^sollte die "([^\"]*)" Checkbox nicht angehakt sein$/ do |label|
+Dann /^sollte die "([^\"]*)" Checkbox nicht angehakt sein$/ do |label|
   Then %{the "#{label}" checkbox should not be checked}
 end
 
-Then /^(?:|ich sollte |sollte (?:|ich )?)auf (.+) sein$/ do |page_name|
+Dann /^(?:|ich sollte |sollte (?:|ich )?)auf (.+) sein$/ do |page_name|
   Then %{I should be on #{page_name}}
 end
 
-Then /^zeig mir die Seite$/ do
+Dann /^zeig mir die Seite$/ do
   Then %{show me the page}
 end

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

@@ -0,0 +1,139 @@
+# encoding: utf-8
+<%= embed_file('support/edit_warning.txt') %>
+
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+
+前提 /^"([^\"]*)"ページを表示している$/ do |page_name|
+  Given %{I am on #{page_name}}
+end
+
+もし /^"([^\"]*)"ページを表示する$/ do |page_name|
+  When %{I go to #{page_name}}
+end
+
+もし /^"([^\"]*)"ボタンをクリックする$/ do |button|
+  When %{I press "#{button}"}
+end
+
+もし /^"([^\"]*)"リンクをクリックする$/ do |link|
+  When %{I follow "#{link}"}
+end
+
+もし /^"([^\"]*)"の"([^\"]*)"リンクをクリックする$/ do |parent, link|
+  When %{I follow "#{link}" within "#{parent}"}
+end
+
+もし /^"([^\"]*)"に"([^\"]*)"と入力する$/ do |field, value|
+  When %{I fill in "#{field}" with "#{value}"}
+end
+
+# less difference to %{I fill in "#{value}" for "#{field}"} with above in Japanese.
+
+もし /^以下の項目を入力する:$/ do |fields|
+  When %{I fill in the following:}, fields
+end
+
+もし /^"([^\"]*)"から"([^\"]*)"を選択する$/ do |field, value|
+  When %{I select "#{value}" from "#{field}"}
+end
+
+もし /^日時として"([^\"]*)"を選択する$/ do |time|
+  When %{I select "#{time}" as the date and time}
+end
+
+もし /^"([^\"]*)"の日時として"([^\"]*)"を選択する$/ do |datetime_label, datetime|
+  When %{I select "#{datetime}" as the "#{datetime_label}" date and time}
+end
+
+もし /^時間として"([^\"]*)"を選択する$/ do |time|
+  When %{I select "#{time}" as the time}
+end
+
+もし /^"([^\"]*)"の時間として"([^\"]*)"を選択する$/ do |time_label, time|
+  When %{I select "#{time}" as the "#{time_label}" time}
+end
+
+もし /^日付として"([^\"]*)"を選択する$/ do |date|
+  When %{I select "#{date}" as the date}
+end
+
+もし /^"([^\"]*)"の日付として"([^\"]*)"を選択する$/ do |date_label, date|
+  When %{I select "#{date}" as the "#{date_label}" date}
+end
+
+もし /^"([^\"]*)"をチェックする$/ do |field|
+  When %{I check "#{field}"}
+end
+
+もし /^"([^\"]*)"のチェックを外す$/ do |field|
+  When %{I uncheck "#{field}"}
+end
+
+もし /^"([^\"]*)"を選択する$/ do |field|
+  When %{I choose "#{field}"}
+end
+
+もし /^"([^\"]*)"としてファイル"([^\"]*)"を選択する$/ do |field, path|
+  When %{I attach the file "#{path}" to "#{field}"}
+end
+
+ならば /^"([^\"]*)"と表示されていること$/ do |text|
+  Then %{I should see "#{text}"}
+end
+
+ならば /^"([^\"]*)"に"([^\"]*)"と表示されていること$/ do |selector, text|
+  Then %{I should see "#{text}" within "#{selector}"}
+end
+
+ならば /^\/([^\/]*)\/と表示されていること$/ do |regexp|
+  Then %{I should see /#{regexp}/}
+end
+
+ならば /^"([^\"]*)"に\/([^\/]*)\/と表示されていること$/ do |selector, regexp|
+  Then %{I should see \/#{regexp}\/ within "#{selector}"}
+end
+
+ならば /^"([^\"]*)"と表示されていないこと$/ do |text|
+  Then %{I should not see "#{text}"}
+end
+
+ならば /^"([^\"]*)"に"([^\"]*)"と表示されていないこと$/ do |selector, text|
+  Then %{I should not see "#{text}" within "#{selector}"}
+end
+
+ならば /^\/([^\/]*)\/と表示されていないこと$/ do |regexp|
+  Then %{I should not see /#{regexp}/}
+end
+
+ならば /^"([^\"]*)"に\/([^\/]*)\/と表示されていないこと$/ do |selector, regexp|
+  Then %{I should not see \/#{regexp}\/ within "#{selector}"}
+end
+
+ならば /^入力項目"([^\"]*)"に"([^\"]*)"と表示されていること$/ do |field, value|
+  Then %{the "#{field}" field should contain "#{value}"}
+end
+
+ならば /^入力項目"([^\"]*)"に"([^\"]*)"と表示されていないこと$/ do |field, value|
+  Then %{the "#{field}" field should not contain "#{value}"}
+end
+
+ならば /^"([^\"]*)"がチェックされていること$/ do |label|
+  Then %{the "#{label}" checkbox should be checked}
+end
+
+ならば /^"([^\"]*)"がチェックされていないこと$/ do |label|
+  Then %{the "#{label}" checkbox should not be checked}
+end
+
+ならば /^"([^\"]*)"ページを表示していること$/ do |page_name|
+  Then %{I should be on #{page_name}}
+end
+
+show_me_the_page = lambda { Then %{show me the page} }
+
+ならば /^ページを表示する$/, &show_me_the_page
+ならば /^画面を目視$/, &show_me_the_page
+
+# backword-compat for old japanese translation.
+ならば /^デバッグ(?:のため)?$/, &show_me_the_page
+

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

@@ -0,0 +1,141 @@
+# encoding: utf-8
+<%= embed_file('support/edit_warning.txt') %>
+
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+
+조건 /^(.+)페이지에 있습니다$/ do |page_name|
+  Given %{I am on #{page_name}}
+end
+
+만일 /^(.+)페이지로 갑니다$/ do |page_name|
+  When %{I go to #{page_name}}
+end
+
+만일 /^"([^\"]*)"버튼을 누릅니다$/ do |button|
+  When %{I press "#{button}"}
+end
+
+만일 /^"([^\"]*)"링크를 클릭합니다$/ do |link|
+  When %{I follow "#{link}"}
+end
+
+만일 /^"([^\"]*)"안에 있는 "([^\"]*)"링크를 클릭합니다$/ do |parent, link|
+  When %{I follow "#{link}" within "#{parent}"}
+end
+
+만일 /^"([^\"]*)"에 "([^\"]*)"라고 적습니다$/ do |field, value|
+  When %{I fill in "#{field}" with "#{value}"}
+end
+
+만일 /^"([^\"]*)"라고 "([^\"]*)"에 적습니다$/ do |value, field|
+  When %{I fill in "#{value}" for "#{field}"}
+end
+
+만일 /^아레의 목록을 입력합니다$/ do |fields|
+  When %{I fill in the following:}, fields
+end
+
+만일 /^"([^\"]*)"를 "([^\"]*)"으로 합니다$/ do |field, value|
+  When %{I select "#{value}" from "#{field}"}
+end
+
+만일 /^날짜와 시간를 "([^\"]*)"으로 합니다$/ do |time|
+  When %{I select "#{time}" as the date and time}
+end
+
+만일 /^"([^\"]*)"의 날짜와 시간을 "([^\"]*)"으로 합니다$/ do |datetime_label, datetime|
+  When %{I select "#{datetime}" as the "#{datetime_label}" date and time}
+end
+
+만일 /^시간을 "([^\"]*)"으로 합니다$/ do |time|
+  When %{I select "#{time}" as the time}
+end
+
+만일 /^"([^\"]*)"의 시간을 "([^\"]*)"으로 합니다$/ do |time_label, time|
+  When %{I select "#{time}" as the "#{time_label}" time}
+end
+
+만일 /^날짜를 "([^\"]*)"으로 합니다$/ do |date|
+  When %{I select "#{date}" as the date}
+end
+
+만일 /^"([^\"]*)"의 날짜를 "([^\"]*)"으로 합니다$/ do |date_label, date|
+  When %{I select "#{date}" as the "#{date_label}" date}
+end
+
+만일 /^"([^\"]*)"를 체크합니다$/ do |field|
+  When %{I check "#{field}"}
+end
+
+만일 /^"([^\"]*)"의 체크를 해제합니다$/ do |field|
+  When %{I uncheck "#{field}"}
+end
+
+만일 /^"([^\"]*)"를 고릅니다$/ do |field|
+  When %{I choose "#{field}"}
+end
+
+만일 /^"([^\"]*)"에 "([^\"]*)"파일을 첨부합니다$/ do |field, path|
+  When %{I attach the file "#{path}" to "#{field}"}
+end
+
+그러면 /^"([^\"]*)"가 보여야 합니다$/ do |text|
+  Then %{I should see "#{text}"}
+end
+
+그러면 /^"([^\"]*)"안에 "([^\"]*)"가 보여야 합니다$/ do |selector, text|
+  Then %{I should see "#{text}" within "#{selector}"}
+end
+
+그러면 /^\/([^\/]*)\/가 보여야 합니다$/ do |regexp|
+  Then %{I should see /#{regexp}/}
+end
+
+그러면 /^"([^\"]*)"안에 \/([^\/]*)\/가 보여야 합니다$/ do |selector, regexp|
+  Then %{I should see /#{regexp}/ within "#{selector}"}
+end
+
+그러면 /^"([^\"]*)"가 보이면 안됩니다$/ do |text|
+  Then %{I should not see "#{text}"}
+end
+
+그러면 /^"([^\"]*)"안에 "([^\"]*)"가 보이면 안됩니다$/ do |selector, text|
+  Then %{I should not see "#{text}" within "#{selector}"}
+end
+
+그러면 /^\/([^\/]*)\/가 보이면 안됩니다$/ do |regexp|
+  Then %{I should not see /#{regexp}/}
+end
+
+그러면 /^"([^\"]*)"안에 \/([^\/]*)\/가 보이면 안됩니다$/ do |selector, regexp|
+  Then %{I should not see /#{regexp}/ within "#{selector}"}
+end
+
+그러면 /^"([^\"]*)"는 "([^\"]*)"이어야 합니다$/ do |field, value|
+  Then %{the "#{field}" field should contain "#{value}"}
+end
+
+그러면 /^"([^\"]*)"는 "([^\"]*)"이면 안됩니다$/ do |field, value|
+  Then %{the "#{field}" field should not contain "#{value}"}
+end
+
+그러면 /^"([^\"]*)"는 체크되어 있어야 합니다$/ do |label|
+  Then %{the "#{label}" checkbox should be checked}
+end
+
+그러면 /^"([^\"]*)"는 체크되어 있으면 안됩니다$/ do |label|
+  Then %{the "#{label}" checkbox should not be checked}
+end
+
+그러면 /^(.+)에 있어야 합니다$/ do |page_name|
+  Then %{I should be on #{page_name}}
+end
+
+그러면 /^다음 쿼리들이 나와야합니다:$/ do |expected_pairs|
+  Then %{I should have the following query string:}
+end
+
+그러면 /^페이지를 엽니다$/ do
+  Then %{show me the page}
+end
+

data/templates/skeleton/step_definitions/webrat_steps.rb.erb

@@ -1,6 +1,7 @@
 <%= embed_file('support/edit_warning.txt') %>
 
 require 'uri'
+require 'cgi'
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 
 # Commonly used webrat steps
@@ -135,7 +136,7 @@ When /^(?:|I )attach the file "([^\"]*)" to "([^\"]*)"$/ do |path, field|
 end
 
 Then /^(?:|I )should see "([^\"]*)"$/ do |text|
-  if defined?(Spec::Rails::Matchers)
+  if response.respond_to? :should
     response.should contain(text)
   else
     assert_contain text
@@ -144,7 +145,7 @@ end
 
 Then /^(?:|I )should see "([^\"]*)" within "([^\"]*)"$/ do |text, selector|
   within(selector) do |content|
-    if defined?(Spec::Rails::Matchers)
+    if content.respond_to? :should
       content.should contain(text)
     else
       hc = Webrat::Matchers::HasContent.new(text)
@@ -155,7 +156,7 @@ end
 
 Then /^(?:|I )should see \/([^\/]*)\/$/ do |regexp|
   regexp = Regexp.new(regexp)
-  if defined?(Spec::Rails::Matchers)
+  if response.respond_to? :should
     response.should contain(regexp)
   else
     assert_match(regexp, response_body)
@@ -165,7 +166,7 @@ end
 Then /^(?:|I )should see \/([^\/]*)\/ within "([^\"]*)"$/ do |regexp, selector|
   within(selector) do |content|
     regexp = Regexp.new(regexp)
-    if defined?(Spec::Rails::Matchers)
+    if content.respond_to? :should
       content.should contain(regexp)
     else
       assert_match(regexp, content)
@@ -174,7 +175,7 @@ Then /^(?:|I )should see \/([^\/]*)\/ within "([^\"]*)"$/ do |regexp, selector|
 end
 
 Then /^(?:|I )should not see "([^\"]*)"$/ do |text|
-  if defined?(Spec::Rails::Matchers)
+  if response.respond_to? :should_not
     response.should_not contain(text)
   else
     assert_not_contain(text)
@@ -183,7 +184,7 @@ end
 
 Then /^(?:|I )should not see "([^\"]*)" within "([^\"]*)"$/ do |text, selector|
   within(selector) do |content|
-    if defined?(Spec::Rails::Matchers)
+    if content.respond_to? :should_not
       content.should_not contain(text)
     else
       hc = Webrat::Matchers::HasContent.new(text)
@@ -194,7 +195,7 @@ end
 
 Then /^(?:|I )should not see \/([^\/]*)\/$/ do |regexp|
   regexp = Regexp.new(regexp)
-  if defined?(Spec::Rails::Matchers)
+  if response.respond_to? :should_not
     response.should_not contain(regexp)
   else
     assert_not_contain(regexp)
@@ -204,7 +205,7 @@ end
 Then /^(?:|I )should not see \/([^\/]*)\/ within "([^\"]*)"$/ do |regexp, selector|
   within(selector) do |content|
     regexp = Regexp.new(regexp)
-    if defined?(Spec::Rails::Matchers)
+    if content.respond_to? :should_not
       content.should_not contain(regexp)
     else
       assert_no_match(regexp, content)
@@ -213,50 +214,57 @@ Then /^(?:|I )should not see \/([^\/]*)\/ within "([^\"]*)"$/ do |regexp, select
 end
 
 Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, value|
-  if defined?(Spec::Rails::Matchers)
-    field_labeled(field).value.should =~ /#{value}/
+  field_value = field_labeled(field).value
+  if field_value.respond_to? :should
+    field_value.should =~ /#{value}/
   else
-    assert_match(/#{value}/, field_labeled(field).value)
+    assert_match(/#{value}/, field_value)
   end
 end
 
 Then /^the "([^\"]*)" field should not contain "([^\"]*)"$/ do |field, value|
-  if defined?(Spec::Rails::Matchers)
-    field_labeled(field).value.should_not =~ /#{value}/
+  field_value = field_labeled(field).value
+  if field_value.respond_to? :should_not
+    field_value.should_not =~ /#{value}/
   else
-    assert_no_match(/#{value}/, field_labeled(field).value)
+    assert_no_match(/#{value}/, field_value)
   end
 end
 
 Then /^the "([^\"]*)" checkbox should be checked$/ do |label|
-  if defined?(Spec::Rails::Matchers)
-    field_labeled(label).should be_checked
+  field = field_labeled(label)
+  if field.respond_to? :should
+    field.should be_checked
   else
-    assert field_labeled(label).checked?
+    assert field.checked?
   end
 end
 
 Then /^the "([^\"]*)" checkbox should not be checked$/ do |label|
-  if defined?(Spec::Rails::Matchers)
-    field_labeled(label).should_not be_checked
+  field = field_labeled(label)
+  if field.respond_to? :should_not
+    field.should_not be_checked
   else
-    assert !field_labeled(label).checked?
+    assert !field.checked?
   end
 end
 
 Then /^(?:|I )should be on (.+)$/ do |page_name|
-  if defined?(Spec::Rails::Matchers)
-    URI.parse(current_url).path.should == path_to(page_name)
+  current_path = URI.parse(current_url).path
+  if current_path.respond_to? :should
+    current_path.should == path_to(page_name)
   else
-    assert_equal path_to(page_name), URI.parse(current_url).path
+    assert_equal path_to(page_name), current_path
   end
 end
 
 Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
-  actual_params   = CGI.parse(URI.parse(current_url).query)
-  expected_params = Hash[expected_pairs.rows_hash.map{|k,v| [k,[v]]}]
- 
-  if defined?(Spec::Rails::Matchers)
+  query = URI.parse(current_url).query
+  actual_params = query ? CGI.parse(query) : {}
+  expected_params = {}
+  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')} 
+
+  if actual_params.respond_to? :should
     actual_params.should == expected_params
   else
     assert_equal expected_params, actual_params
@@ -265,4 +273,4 @@ end
 
 Then /^show me the page$/ do
   save_and_open_page
-end
+end