ACK
Applies cleanly, the cucumber results both on Fedora 12 and Fedora 13 are unchanged.
Thomas
----- Original Message -----
From: "Jason Guiditta" <jason.guiditta(a)gmail.com>
To: deltacloud-devel(a)lists.fedorahosted.org
Sent: Tuesday, June 29, 2010 11:18:45 PM GMT +01:00 Amsterdam / Berlin / Bern / Rome /
Stockholm / Vienna
Subject: [deltacloud-devel] [PATCH aggregator] Update cucumber to use 0.8.3
Contains somme changes to config as well,
all custom stuff is now in its own file.
---
src/config/cucumber.yml | 7 +-
src/config/environments/cucumber.rb | 6 +-
src/features/step_definitions/web_steps.rb | 116 ++++++++++++++++------------
src/features/support/custom.rb | 5 +
src/features/support/env.rb | 26 ++----
src/lib/tasks/cucumber.rake | 8 ++-
6 files changed, 94 insertions(+), 74 deletions(-)
create mode 100644 src/features/support/custom.rb
diff --git a/src/config/cucumber.yml b/src/config/cucumber.yml
index b7acd38..621a14c 100644
--- a/src/config/cucumber.yml
+++ b/src/config/cucumber.yml
@@ -1,7 +1,8 @@
<%
rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
-rerun_opts = rerun.to_s.strip.empty? ? "--format progress features" :
"--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "#{rerun_opts} --format rerun --out rerun.txt --strict --tags
~@wip"
+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"
%>
-default: <%= std_opts %>
+default: <%= std_opts %> features
wip: --tags @wip:3 --wip features
+rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip
diff --git a/src/config/environments/cucumber.rb b/src/config/environments/cucumber.rb
index efe0b40..5f0e38b 100644
--- a/src/config/environments/cucumber.rb
+++ b/src/config/environments/cucumber.rb
@@ -21,9 +21,9 @@ config.action_controller.allow_forgery_protection = false
# ActionMailer::Base.deliveries array.
config.action_mailer.delivery_method = :test
-config.gem 'cucumber-rails', :lib => false, :version =>
'>=0.2.4' unless File.directory?(File.join(Rails.root,
'vendor/plugins/cucumber-rails'))
-config.gem 'database_cleaner', :lib => false, :version =>
'>=0.4.3' unless File.directory?(File.join(Rails.root,
'vendor/plugins/database_cleaner'))
-config.gem 'webrat', :lib => false, :version =>
'>=0.6.0' unless File.directory?(File.join(Rails.root,
'vendor/plugins/webrat'))
+config.gem 'cucumber-rails', :lib => false, :version =>
'>=0.3.2' unless File.directory?(File.join(Rails.root,
'vendor/plugins/cucumber-rails'))
+config.gem 'database_cleaner', :lib => false, :version =>
'>=0.5.0' unless File.directory?(File.join(Rails.root,
'vendor/plugins/database_cleaner'))
+config.gem 'webrat', :lib => false, :version =>
'>=0.7.0' unless File.directory?(File.join(Rails.root,
'vendor/plugins/webrat'))
config.gem 'rspec', :lib => false, :version =>
'>=1.3.0' unless File.directory?(File.join(Rails.root,
'vendor/plugins/rspec'))
config.gem 'rspec-rails', :lib => false, :version =>
'>=1.3.2' unless File.directory?(File.join(Rails.root,
'vendor/plugins/rspec-rails'))
config.gem "factory_girl", :lib => "factory_girl", :version =>
">=1.2.3"
diff --git a/src/features/step_definitions/web_steps.rb
b/src/features/step_definitions/web_steps.rb
index c8bc409..f270900 100644
--- a/src/features/step_definitions/web_steps.rb
+++ b/src/features/step_definitions/web_steps.rb
@@ -6,6 +6,7 @@
require 'uri'
+require 'cgi'
require File.expand_path(File.join(File.dirname(__FILE__), "..",
"support", "paths"))
# Commonly used webrat steps
@@ -19,23 +20,23 @@ When /^(?:|I )go to (.+)$/ do |page_name|
visit path_to(page_name)
end
-When /^(?:|I )press "([^\"]*)"$/ do |button|
+When /^(?:|I )press "([^"]*)"$/ do |button|
click_button(button)
end
-When /^(?:|I )follow "([^\"]*)"$/ do |link|
+When /^(?:|I )follow "([^"]*)"$/ do |link|
click_link(link)
end
-When /^(?:|I )follow "([^\"]*)" within "([^\"]*)"$/ do
|link, parent|
+When /^(?:|I )follow "([^"]*)" within "([^"]*)"$/ do |link,
parent|
click_link_within(parent, link)
end
-When /^(?:|I )fill in "([^\"]*)" with "([^\"]*)"$/ do
|field, value|
+When /^(?:|I )fill in "([^"]*)" with "([^"]*)"$/ do |field,
value|
fill_in(field, :with => value)
end
-When /^(?:|I )fill in "([^\"]*)" for "([^\"]*)"$/ do
|value, field|
+When /^(?:|I )fill in "([^"]*)" for "([^"]*)"$/ do |value,
field|
fill_in(field, :with => value)
end
@@ -56,13 +57,13 @@ When /^(?:|I )fill in the following:$/ do |fields|
end
end
-When /^(?:|I )select "([^\"]*)" from "([^\"]*)"$/ do
|value, field|
+When /^(?:|I )select "([^"]*)" from "([^"]*)"$/ do |value,
field|
select(value, :from => field)
end
# Use this step in conjunction with Rail's datetime_select helper. For example:
# When I select "December 25, 2008 10:00" as the date and time
-When /^(?:|I )select "([^\"]*)" as the date and time$/ do |time|
+When /^(?:|I )select "([^"]*)" as the date and time$/ do |time|
select_datetime(time)
end
@@ -75,7 +76,7 @@ end
# The following steps would fill out the form:
# When I select "November 23, 2004 11:20" as the "Preferred" date and
time
# And I select "November 25, 2004 10:30" as the "Alternative" date
and time
-When /^(?:|I )select "([^\"]*)" as the "([^\"]*)" date and
time$/ do |datetime, datetime_label|
+When /^(?:|I )select "([^"]*)" as the "([^"]*)" date and
time$/ do |datetime, datetime_label|
select_datetime(datetime, :from => datetime_label)
end
@@ -83,46 +84,46 @@ end
# When I select "2:20PM" as the time
# Note: Rail's default time helper provides 24-hour time-- not 12 hour time. Webrat
# will convert the 2:20PM to 14:20 and then select it.
-When /^(?:|I )select "([^\"]*)" as the time$/ do |time|
+When /^(?:|I )select "([^"]*)" as the time$/ do |time|
select_time(time)
end
# Use this step when using multiple time_select helpers on a page or you want to
# specify the name of the time on the form. For example:
# When I select "7:30AM" as the "Gym" time
-When /^(?:|I )select "([^\"]*)" as the "([^\"]*)" time$/ do
|time, time_label|
+When /^(?:|I )select "([^"]*)" as the "([^"]*)" time$/ do
|time, time_label|
select_time(time, :from => time_label)
end
# Use this step in conjunction with Rail's date_select helper. For example:
# When I select "February 20, 1981" as the date
-When /^(?:|I )select "([^\"]*)" as the date$/ do |date|
+When /^(?:|I )select "([^"]*)" as the date$/ do |date|
select_date(date)
end
# Use this step when using multiple date_select helpers on one page or
# you want to specify the name of the date on the form. For example:
# When I select "April 26, 1982" as the "Date of Birth" date
-When /^(?:|I )select "([^\"]*)" as the "([^\"]*)" date$/ do
|date, date_label|
+When /^(?:|I )select "([^"]*)" as the "([^"]*)" date$/ do
|date, date_label|
select_date(date, :from => date_label)
end
-When /^(?:|I )check "([^\"]*)"$/ do |field|
+When /^(?:|I )check "([^"]*)"$/ do |field|
check(field)
end
-When /^(?:|I )uncheck "([^\"]*)"$/ do |field|
+When /^(?:|I )uncheck "([^"]*)"$/ do |field|
uncheck(field)
end
-When /^(?:|I )choose "([^\"]*)"$/ do |field|
+When /^(?:|I )choose "([^"]*)"$/ do |field|
choose(field)
end
# Adds support for validates_attachment_content_type. Without the mime-type getting
# passed to attach_file() you will get a "Photo file is not one of the allowed file
types."
# error message
-When /^(?:|I )attach the file "([^\"]*)" to "([^\"]*)"$/ do
|path, field|
+When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"$/ do
|path, field|
type = path.split(".")[1]
case type
@@ -139,17 +140,17 @@ When /^(?:|I )attach the file "([^\"]*)" to
"([^\"]*)"$/ do |path, field|
attach_file(field, path, type)
end
-Then /^(?:|I )should see "([^\"]*)"$/ do |text|
- if defined?(Spec::Rails::Matchers)
+Then /^(?:|I )should see "([^"]*)"$/ do |text|
+ if response.respond_to? :should
response.should contain(text)
else
assert_contain text
end
end
-Then /^(?:|I )should see "([^\"]*)" within "([^\"]*)"$/ do
|text, selector|
+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)
@@ -160,17 +161,17 @@ 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)
end
end
-Then /^(?:|I )should see \/([^\/]*)\/ within "([^\"]*)"$/ do |regexp,
selector|
+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)
@@ -178,17 +179,17 @@ Then /^(?:|I )should see \/([^\/]*)\/ within
"([^\"]*)"$/ do |regexp, selector|
end
end
-Then /^(?:|I )should not see "([^\"]*)"$/ do |text|
- if defined?(Spec::Rails::Matchers)
+Then /^(?:|I )should not see "([^"]*)"$/ do |text|
+ if response.respond_to? :should_not
response.should_not contain(text)
else
assert_not_contain(text)
end
end
-Then /^(?:|I )should not see "([^\"]*)" within "([^\"]*)"$/
do |text, selector|
+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)
@@ -199,17 +200,17 @@ 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)
end
end
-Then /^(?:|I )should not see \/([^\/]*)\/ within "([^\"]*)"$/ do |regexp,
selector|
+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)
@@ -217,47 +218,64 @@ Then /^(?:|I )should not see \/([^\/]*)\/ within
"([^\"]*)"$/ do |regexp, select
end
end
-Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do
|field, value|
- if defined?(Spec::Rails::Matchers)
- field_labeled(field).value.should =~ /#{value}/
+Then /^the "([^"]*)" field should contain "([^"]*)"$/ do
|field, 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}/
+Then /^the "([^"]*)" field should not contain "([^"]*)"$/
do |field, 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
+Then /^the "([^"]*)" checkbox should be checked$/ do |label|
+ 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
+Then /^the "([^"]*)" checkbox should not be checked$/ do |label|
+ 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|
- current_path = URI.parse(current_url).select(:path, :query).compact.join('?')
- if defined?(Spec::Rails::Matchers)
+ 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), current_path
end
end
+Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
+ 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
+ end
+end
+
Then /^show me the page$/ do
save_and_open_page
-end
\ No newline at end of file
+end
diff --git a/src/features/support/custom.rb b/src/features/support/custom.rb
new file mode 100644
index 0000000..010e81b
--- /dev/null
+++ b/src/features/support/custom.rb
@@ -0,0 +1,5 @@
+#Seed the DB with fixture data
+Fixtures.reset_cache
+fixtures_folder = File.join(Rails.root, 'spec', 'fixtures')
+fixtures = Dir[File.join(fixtures_folder, '*.yml')].map {|f| File.basename(f,
'.yml') }
+Fixtures.create_fixtures(fixtures_folder, fixtures)
diff --git a/src/features/support/env.rb b/src/features/support/env.rb
index 2d6e9a1..b921613 100644
--- a/src/features/support/env.rb
+++ b/src/features/support/env.rb
@@ -4,7 +4,7 @@
# instead of editing this one. Cucumber will automatically load all features/**/*.rb
# files.
-ENV["RAILS_ENV"] ||= "test"
+ENV["RAILS_ENV"] ||= "cucumber"
require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
require 'cucumber/formatter/unicode' # Remove this line if you don't want
Cucumber Unicode support
@@ -21,14 +21,6 @@ Webrat.configure do |config|
config.open_error_files = false # Set to true if you want error pages to pop up in the
browser
end
-Provider.class_eval do
- alias_method :original_validate, :validate
- def validate
- if !nil_or_empty(url)
- # errors.add("url", "must be a valid provider url") unless
valid_framework?
- end
- end
-end
# If you set this to false, any error raised from within your app will bubble
# up to your step definition and out to cucumber unless you catch it somewhere
@@ -54,14 +46,12 @@ ActionController::Base.allow_rescue = false
# subsequent scenarios. If you do this, we recommend you create a Before
# block that will explicitly put your database in a known state.
Cucumber::Rails::World.use_transactional_fixtures = true
-
-#Seed the DB with fixture data
-Fixtures.reset_cache
-fixtures_folder = File.join(RAILS_ROOT, 'spec', 'fixtures')
-fixtures = Dir[File.join(fixtures_folder, '*.yml')].map {|f| File.basename(f,
'.yml') }
-Fixtures.create_fixtures(fixtures_folder, fixtures)
-
# How to clean your database when transactions are turned off. See
#
http://github.com/bmabey/database_cleaner for more info.
-require 'database_cleaner'
-DatabaseCleaner.strategy = :truncation
+if defined?(ActiveRecord::Base)
+ begin
+ require 'database_cleaner'
+ DatabaseCleaner.strategy = :truncation
+ rescue LoadError => ignore_if_database_cleaner_not_present
+ end
+end
diff --git a/src/lib/tasks/cucumber.rake b/src/lib/tasks/cucumber.rake
index 887e51e..982054e 100644
--- a/src/lib/tasks/cucumber.rake
+++ b/src/lib/tasks/cucumber.rake
@@ -7,7 +7,7 @@
unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:*
tasks
-vendored_cucumber_bin =
Dir["#{RAILS_ROOT}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+vendored_cucumber_bin =
Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
$LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless
vendored_cucumber_bin.nil?
begin
@@ -26,6 +26,12 @@ begin
t.profile = 'wip'
end
+ Cucumber::Rake::Task.new({:rerun => 'db:test:prepare'}, 'Record
failing features and run only them if any exist') do |t|
+ t.binary = vendored_cucumber_bin
+ t.fork = true # You may get faster startup if you set this to false
+ t.profile = 'rerun'
+ end
+
desc 'Run all features'
task :all => [:ok, :wip]
end
--
1.7.0.1
_______________________________________________
deltacloud-devel mailing list
deltacloud-devel(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/deltacloud-devel