Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Upgrade Cucumber configs, fix feature steps, and add cucumber-webstep…

…s gem
  • Loading branch information...
commit 75bfa5e19795b29a4ef5287cd1782bc0ae486205 1 parent 03779e1
Gabriel Evans authored
View
3  Gemfile
@@ -45,8 +45,9 @@ gem 'will_paginate', '~> 3.0.2'
# put test-only gems in this group so their generators
# and rake tasks are available in development mode:
group :development, :test do
+ gem 'database_cleaner'
gem 'cucumber-rails'
- gem 'webrat'
+ gem 'cucumber-websteps'
gem 'factory_girl'
gem 'rspec'
gem 'rspec-rails'
View
20 Gemfile.lock
@@ -35,6 +35,7 @@ GEM
activesupport (3.2.0.rc2)
i18n (~> 0.6)
multi_json (~> 1.0)
+ addressable (2.2.6)
arel (3.0.0)
bouncy-castle-java (1.5.0146.1)
builder (3.0.0)
@@ -65,6 +66,11 @@ GEM
capybara (>= 1.1.2)
cucumber (>= 1.1.3)
nokogiri (>= 1.5.0)
+ cucumber-websteps (0.9.0)
+ capybara
+ cucumber
+ launchy
+ database_cleaner (0.7.0)
diff-lcs (1.1.3)
erubis (2.7.0)
execjs (1.3.0)
@@ -88,6 +94,12 @@ GEM
jruby-rack (1.1.3)
json (1.6.5)
json (1.6.5-java)
+ launchy (2.0.5)
+ addressable (~> 2.2.6)
+ launchy (2.0.5-java)
+ addressable (~> 2.2.6)
+ ffi (~> 1.0.9)
+ spoon (~> 0.0.1)
lesstile (1.0.1)
mail (2.3.0)
i18n (>= 0.4.0)
@@ -151,6 +163,7 @@ GEM
ffi (~> 1.0.9)
multi_json (~> 1.0.4)
rubyzip
+ spoon (0.0.1)
sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
@@ -169,10 +182,6 @@ GEM
trinidad_jars (>= 1.0.1)
trinidad_jars (1.0.2)
tzinfo (0.3.31)
- webrat (0.7.3)
- nokogiri (>= 1.2.0)
- rack (>= 1.0)
- rack-test (>= 0.5.3)
will_paginate (3.0.2)
xpath (0.1.4)
nokogiri (~> 1.3)
@@ -188,6 +197,8 @@ DEPENDENCIES
coderay
coffee-rails (~> 3.2.1)
cucumber-rails
+ cucumber-websteps
+ database_cleaner
factory_girl
formtastic
jruby-openssl
@@ -201,5 +212,4 @@ DEPENDENCIES
sass-rails (~> 3.2.3)
sqlite3-ruby
trinidad
- webrat
will_paginate (~> 3.0.2)
View
2  config/cucumber.yml
@@ -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: <%= std_opts %> features
wip: --tags @wip:3 --wip features
View
4 features/admin_health.feature
@@ -6,5 +6,5 @@ Feature: Health Monitor
Scenario: generating an exception
Given I am logged in
When I go to /admin
- And I follow "health"
- Then a RuntimeError is thrown when I press "throw exception"
+ And I follow "Health"
+ Then a RuntimeError is thrown when I press "Throw exception"
View
2  features/admin_undo.feature
@@ -12,7 +12,7 @@ Feature: Undo
And I follow "Comments"
And I press "Delete Comment"
# Not sure why this doesn't redirect automatically
- And I follow "redirected"
+ # And I follow "redirected"
And I follow "Actions"
And I press "Undo"
Then a comment exists with attributes:
View
5 features/step_definitions/admin.rb
@@ -1,5 +1,8 @@
Given /I am logged in/ do
- post '/admin/session', :bypass_login => '1'
+ # post '/admin/session', :bypass_login => '1'
+ visit '/admin/session'
+ check "Bypass credentials check"
+ click_on "Login with OpenID"
end
Then /a RuntimeError is thrown when I press "(.*)"/ do |button|
View
3  features/step_definitions/browsing.rb
@@ -1,4 +1,3 @@
Then /I should see a link to all posts tagged "([\w\s]+)"/ do |tag_name|
- # TODO: Use an xpath matcher rather than regex
- response.body.should =~ %r{<a href="/#{tag_name}">awesome</a>}
+ page.should have_xpath("//a[text()='#{tag_name}' and @href='/#{tag_name}']")
end
View
282 features/step_definitions/web_steps.rb
@@ -1,281 +1 @@
-# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a
-# newer version of cucumber-rails. Consider adding your own code to a new file
-# instead of editing this one. Cucumber will automatically load all features/**/*.rb
-# files.
-
-
-require 'uri'
-require 'cgi'
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
-
-# Commonly used webrat steps
-# http://github.com/brynary/webrat
-
-Given /^(?:|I )am on (.+)$/ do |page_name|
- visit path_to(page_name)
-end
-
-When /^(?:|I )go to (.+)$/ do |page_name|
- visit path_to(page_name)
-end
-
-When /^(?:|I )press "([^"]*)"$/ do |button|
- click_button(button)
-end
-
-When /^(?:|I )follow "([^"]*)"$/ do |link|
- click_link(link)
-end
-
-When /^(?:|I )follow "([^"]*)" within "([^"]*)"$/ do |link, parent|
- click_link_within(parent, link)
-end
-
-When /^(?:|I )fill in "([^"]*)" with "([^"]*)"$/ do |field, value|
- 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:
-#
-# When I fill in the following:
-# | Account Number | 5002 |
-# | Expiry date | 2009-11-01 |
-# | Note | Nice guy |
-# | Wants Email? | |
-#
-# TODO: Add support for checkbox, select og option
-# based on naming conventions.
-#
-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 "([^"]*)"$/ 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|
- select_datetime(time)
-end
-
-# Use this step when using multiple datetime_select helpers on a page or
-# you want to specify which datetime to select. Given the following view:
-# <%= f.label :preferred %><br />
-# <%= f.datetime_select :preferred %>
-# <%= f.label :alternative %><br />
-# <%= f.datetime_select :alternative %>
-# 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|
- select_datetime(datetime, :from => datetime_label)
-end
-
-# Use this step in conjunction with Rail's time_select helper. For example:
-# 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|
- 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|
- 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|
- 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|
- select_date(date, :from => date_label)
-end
-
-When /^(?:|I )check "([^"]*)"$/ do |field|
- check(field)
-end
-
-When /^(?:|I )uncheck "([^"]*)"$/ do |field|
- uncheck(field)
-end
-
-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|
- type = path.split(".")[1]
-
- case type
- when "jpg"
- type = "image/jpg"
- when "jpeg"
- type = "image/jpeg"
- when "png"
- type = "image/png"
- when "gif"
- type = "image/gif"
- end
-
- attach_file(field, path, type)
-end
-
-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|
- within(selector) do |content|
- if content.respond_to? :should
- content.should contain(text)
- else
- hc = Webrat::Matchers::HasContent.new(text)
- assert hc.matches?(content), hc.failure_message
- end
- end
-end
-
-Then /^(?:|I )should see \/([^\/]*)\/$/ do |regexp|
- regexp = Regexp.new(regexp)
- 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|
- within(selector) do |content|
- regexp = Regexp.new(regexp)
- if content.respond_to? :should
- content.should contain(regexp)
- else
- assert_match(regexp, content)
- end
- end
-end
-
-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|
- within(selector) do |content|
- if content.respond_to? :should_not
- content.should_not contain(text)
- else
- hc = Webrat::Matchers::HasContent.new(text)
- assert !hc.matches?(content), hc.negative_failure_message
- end
- end
-end
-
-Then /^(?:|I )should not see \/([^\/]*)\/$/ do |regexp|
- regexp = Regexp.new(regexp)
- 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|
- within(selector) do |content|
- regexp = Regexp.new(regexp)
- if content.respond_to? :should_not
- content.should_not contain(regexp)
- else
- assert_no_match(regexp, content)
- end
- end
-end
-
-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_value)
- end
-end
-
-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_value)
- end
-end
-
-Then /^the "([^"]*)" checkbox should be checked$/ do |label|
- field = field_labeled(label)
- if field.respond_to? :should
- field.should be_checked
- else
- assert field.checked?
- end
-end
-
-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.checked?
- end
-end
-
-Then /^(?:|I )should be on (.+)$/ do |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), 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
+require 'cucumber/websteps'
View
92 features/support/env.rb
@@ -1,57 +1,59 @@
# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a
-# newer version of cucumber-rails. Consider adding your own code to a new file
+# It is recommended to regenerate this file in the future when you upgrade to a
+# newer version of cucumber-rails. Consider adding your own code to a new file
# instead of editing this one. Cucumber will automatically load all features/**/*.rb
# files.
-ENV["RAILS_ENV"] ||= "test"
-require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
+ENV["RAILS_ENV"] = "test"
-require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
-require 'cucumber/rails/rspec'
-require 'cucumber/rails/world'
-require 'cucumber/rails/active_record'
-require 'cucumber/web/tableish'
+require 'cucumber/rails'
+require 'capybara/rspec'
-require 'webrat'
-require 'webrat/core/matchers'
+# Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
+# order to ease the transition to Capybara we set the default here. If you'd
+# prefer to use XPath just remove this line and adjust any selectors in your
+# steps to use the XPath syntax.
+Capybara.default_selector = :css
-Webrat.configure do |config|
- config.mode = :rack
- config.open_error_files = false # Set to true if you want error pages to pop up in the browser
-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
-# on the way. You can make Rails rescue errors and render error pages on a
-# per-scenario basis by tagging a scenario or feature with the @allow-rescue tag.
+# By default, any exception happening in your Rails application will bubble up
+# to Cucumber so that your scenario will fail. This is a different from how
+# your application behaves in the production environment, where an error page will
+# be rendered instead.
+#
+# Sometimes we want to override this default behaviour and allow Rails to rescue
+# exceptions and display an error page (just like when the app is running in production).
+# Typical scenarios where you want to do this is when you test your error pages.
+# There are two ways to allow Rails to rescue exceptions:
+#
+# 1) Tag your scenario (or feature) with @allow-rescue
+#
+# 2) Set the value below to true. Beware that doing this globally is not
+# recommended as it will mask a lot of errors for you!
#
-# If you set this to true, Rails will rescue all errors and render error
-# pages, more or less in the same way your application would behave in the
-# default production environment. It's not recommended to do this for all
-# of your scenarios, as this makes it hard to discover errors in your application.
ActionController::Base.allow_rescue = false
-# If you set this to true, each scenario will run in a database transaction.
-# You can still turn off transactions on a per-scenario basis, simply tagging
-# a feature or scenario with the @no-txn tag. If you are using Capybara,
-# tagging with @culerity or @javascript will also turn transactions off.
+# Remove/comment out the lines below if your app doesn't have a database.
+# For some databases (like MongoDB and CouchDB) you may need to use :truncation instead.
+begin
+ DatabaseCleaner.strategy = :transaction
+rescue NameError
+ raise "You need to add database_cleaner to your Gemfile (in the :test group) if you wish to use it."
+end
+
+# You may also want to configure DatabaseCleaner to use different strategies for certain features and scenarios.
+# See the DatabaseCleaner documentation for details. Example:
#
-# If you set this to false, transactions will be off for all scenarios,
-# regardless of whether you use @no-txn or not.
+# Before('@no-txn,@selenium,@culerity,@celerity,@javascript') do
+# DatabaseCleaner.strategy = :truncation, {:except => %w[widgets]}
+# end
#
-# Beware that turning transactions off will leave data in your database
-# after each scenario, which can lead to hard-to-debug failures in
-# 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
-# How to clean your database when transactions are turned off. See
-# http://github.com/bmabey/database_cleaner for more info.
-if defined?(ActiveRecord::Base)
- begin
- require 'database_cleaner'
- DatabaseCleaner.strategy = :truncation
- rescue LoadError => ignore_if_database_cleaner_not_present
- end
-end
+# Before('~@no-txn', '~@selenium', '~@culerity', '~@celerity', '~@javascript') do
+# DatabaseCleaner.strategy = :transaction
+# end
+#
+
+# Possible values are :truncation and :transaction
+# The :transaction strategy is faster, but might give you threading problems.
+# See https://github.com/cucumber/cucumber-rails/blob/master/features/choose_javascript_database_strategy.feature
+Cucumber::Rails::Database.javascript_strategy = :truncation
+
View
39 features/support/selectors.rb
@@ -0,0 +1,39 @@
+module HtmlSelectorsHelpers
+ # Maps a name to a selector. Used primarily by the
+ #
+ # When /^(.+) within (.+)$/ do |step, scope|
+ #
+ # step definitions
+ #
+ def selector_for(locator)
+ case locator
+
+ when "the page"
+ "html > body"
+
+ # Add more mappings here.
+ # Here is an example that pulls values out of the Regexp:
+ #
+ # when /^the (notice|error|info) flash$/
+ # ".flash.#{$1}"
+
+ # You can also return an array to use a different selector
+ # type, like:
+ #
+ # when /the header/
+ # [:xpath, "//header"]
+
+ # This allows you to provide a quoted selector as the scope
+ # for "within" steps as was previously the default for the
+ # web steps:
+ when /^"(.+)"$/
+ $1
+
+ else
+ raise "Can't find mapping from \"#{locator}\" to a selector.\n" +
+ "Now, go and add a mapping in #{__FILE__}"
+ end
+ end
+end
+
+World(HtmlSelectorsHelpers)
View
12 lib/tasks/cucumber.rake
@@ -34,6 +34,12 @@ begin
desc 'Run all features'
task :all => [:ok, :wip]
+
+ task :statsetup do
+ require 'rails/code_statistics'
+ ::STATS_DIRECTORIES << %w(Cucumber\ features features) if File.exist?('features')
+ ::CodeStatistics::TEST_TYPES << "Cucumber features" if File.exist?('features')
+ end
end
desc 'Alias for cucumber:ok'
task :cucumber => 'cucumber:ok'
@@ -43,6 +49,12 @@ begin
task :features => :cucumber do
STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
end
+
+ # In case we don't have ActiveRecord, append a no-op task that we can depend upon.
+ task 'db:test:prepare' do
+ end
+
+ task :stats => 'cucumber:statsetup'
rescue LoadError
desc 'cucumber rake task not available (cucumber not installed)'
task :cucumber do
Please sign in to comment.
Something went wrong with that request. Please try again.