Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

keep empty step_definitions directories #249

Merged
merged 6 commits into from
Feb 6, 2014
Merged

keep empty step_definitions directories #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
10e3a19
Amend typo in select_dates_and_times.rb comments.
erkde Oct 26, 2013
89c8e6d
Merge pull request #276 from mattheworiordan/disable-automatic-databa…
Kosmas Jan 7, 2014
5d28e12
updated with feature #276
Kosmas Jan 7, 2014
390c8ed
moved feature change #276 in correct version
Kosmas Jan 7, 2014
66700f8
Merge pull request #268 from erik-eide/master
Kosmas Jan 11, 2014
b716e79
keep empty step_definitions directories
ibroadfo Jun 4, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions History.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand All @@ -25,6 +26,7 @@
* 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)


### Changed Features

* Gemspec in 1.3.1 doesn't allow usage with rails 4 ([#244](https://github.com/cucumber/cucumber-rails/issues/244) Fabian Schwahn)
Expand Down
1 change: 1 addition & 0 deletions features/install_cucumber_rails.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'"
6 changes: 3 additions & 3 deletions lib/cucumber/rails/capybara/select_dates_and_times.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand All @@ -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])
Expand All @@ -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)
Expand Down
1 change: 1 addition & 0 deletions lib/generators/cucumber/install/install_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down