From 10e3a1937cd7377617fb14f7c6b17a1d32a790fd Mon Sep 17 00:00:00 2001 From: Erik Eide Date: Sat, 26 Oct 2013 18:31:48 -0500 Subject: [PATCH 1/4] Amend typo in select_dates_and_times.rb comments. --- lib/cucumber/rails/capybara/select_dates_and_times.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/cucumber/rails/capybara/select_dates_and_times.rb b/lib/cucumber/rails/capybara/select_dates_and_times.rb index 1c31e4bb..3b6823dc 100644 --- a/lib/cucumber/rails/capybara/select_dates_and_times.rb +++ b/lib/cucumber/rails/capybara/select_dates_and_times.rb @@ -3,7 +3,7 @@ module Rails module Capybara # This module defines methods for selecting dates and times module SelectDatesAndTimes - # Select a Rails date. Options has must include :from => +label+ + # Select a Rails date. Options hash must include :from => +label+ def select_date(date, options) date = Date.parse(date) base_dom_id = get_base_dom_id_from_label_tag(options[:from]) @@ -13,7 +13,7 @@ def select_date(date, options) find(:xpath, ".//select[@id='#{base_dom_id}_3i']").select(date.day.to_s) end - # Select a Rails time. Options has must include :from => +label+ + # Select a Rails time. Options hash must include :from => +label+ def select_time(time, options) time = Time.zone.parse(time) base_dom_id = get_base_dom_id_from_label_tag(options[:from]) @@ -22,7 +22,7 @@ def select_time(time, options) find(:xpath, ".//select[@id='#{base_dom_id}_5i']").select(time.min.to_s.rjust(2, '0')) end - # Select a Rails datetime. Options has must include :from => +label+ + # Select a Rails datetime. Options hash must include :from => +label+ def select_datetime(datetime, options) select_date(datetime, options) select_time(datetime, options) From 5d28e1297bd3e1bd7589a082a6942a2cad672c0d Mon Sep 17 00:00:00 2001 From: Kosmas Chatzimichalis Date: Tue, 7 Jan 2014 22:11:31 +0100 Subject: [PATCH 2/4] updated with feature #276 --- History.md | 1 + 1 file changed, 1 insertion(+) diff --git a/History.md b/History.md index 81409ef8..e76c15f1 100644 --- a/History.md +++ b/History.md @@ -24,6 +24,7 @@ * New test raising_errors.feature to test raising routing errors that replaced the earlier routing.feature * Added recommendation in README.md for running install scripts after upgrading (Joost Baaij) * Describe configuration option 'autorun_database_cleaner' in README ([#255](https://github.com/cucumber/cucumber-rails/pull/255) Martin Eismann) + * Ensure dependency on DatabaseCleaner is not required ([#276] (https://github.com/cucumber/cucumber-rails/pull/276) Matthew O'Riordan) ### Changed Features From 390c8edd994ce44356d94c65784f7a0c2ab583d9 Mon Sep 17 00:00:00 2001 From: Kosmas Chatzimichalis Date: Tue, 7 Jan 2014 22:13:08 +0100 Subject: [PATCH 3/4] moved feature change #276 in correct version --- History.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/History.md b/History.md index e76c15f1..ef8b5c0d 100644 --- a/History.md +++ b/History.md @@ -3,6 +3,7 @@ ### New Features * Added MIT licence in gemspec ([#261] (https://github.com/cucumber/cucumber-rails/issues/261#issuecomment-23260956) Benjamin Fleischer) + * Ensure dependency on DatabaseCleaner is not required ([#276] (https://github.com/cucumber/cucumber-rails/pull/276) Matthew O'Riordan) ### Removed Features * Mongo step definition ([#263] (https://github.com/cucumber/cucumber-rails/issues/263) Aslak Hellesøy ) @@ -24,7 +25,7 @@ * New test raising_errors.feature to test raising routing errors that replaced the earlier routing.feature * Added recommendation in README.md for running install scripts after upgrading (Joost Baaij) * Describe configuration option 'autorun_database_cleaner' in README ([#255](https://github.com/cucumber/cucumber-rails/pull/255) Martin Eismann) - * Ensure dependency on DatabaseCleaner is not required ([#276] (https://github.com/cucumber/cucumber-rails/pull/276) Matthew O'Riordan) + ### Changed Features From b716e79ae08ce97484866536404a9e8c2fd588b2 Mon Sep 17 00:00:00 2001 From: Iain D Broadfoot Date: Tue, 4 Jun 2013 20:33:04 +0100 Subject: [PATCH 4/4] keep empty step_definitions directories --- features/install_cucumber_rails.feature | 1 + lib/generators/cucumber/install/install_generator.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/features/install_cucumber_rails.feature b/features/install_cucumber_rails.feature index 4e92f4b7..fbaed4e2 100644 --- a/features/install_cucumber_rails.feature +++ b/features/install_cucumber_rails.feature @@ -9,5 +9,6 @@ Feature: Rails | config/cucumber.yml | | script/cucumber | | features/support/env.rb | + | features/step_definitions/.gitkeep | | lib/tasks/cucumber.rake | And the file "features/support/env.rb" should contain "require 'cucumber/rails'" diff --git a/lib/generators/cucumber/install/install_generator.rb b/lib/generators/cucumber/install/install_generator.rb index ef9b8417..4d622fd4 100644 --- a/lib/generators/cucumber/install/install_generator.rb +++ b/lib/generators/cucumber/install/install_generator.rb @@ -20,6 +20,7 @@ def create_scripts def create_step_definitions empty_directory 'features/step_definitions' + create_file 'features/step_definitions/.gitkeep' end def create_feature_support