Permalink
Browse files

Merge. Add attribution.

  • Loading branch information...
2 parents 022c497 + 1aed1fb commit eee179a493356ae974195cab5af6770ccb12cbda @aslakhellesoy aslakhellesoy committed Sep 11, 2011
View
@@ -152,11 +152,9 @@ GEM
sprockets (2.0.0)
hike (~> 1.2)
rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
+ tilt (!= 1.3.0, ~> 1.1)
spruz (0.2.13)
sqlite3 (1.3.4)
- sqlite3-ruby (1.3.3)
- sqlite3 (>= 1.3.3)
term-ansicolor (1.0.6)
thor (0.14.6)
tilt (1.3.3)
@@ -193,7 +191,7 @@ DEPENDENCIES
rspec (>= 2.6.0)
rspec-rails (>= 2.6.1)
sass (>= 3.1.3)
- sqlite3-ruby (>= 1.3.3)
+ sqlite3 (>= 1.3.4)
turn (>= 0.8.2)
uglifier (>= 1.0.0)
yard (= 0.7.2)
View
@@ -2,6 +2,7 @@
### Bugfixes
* sqlite3-ruby is now sqlite3 ([#158](https://github.com/cucumber/cucumber-rails/pull/158) Trung Le)
+* Require features by default in the generated cucumber.yml ((#157)[https://github.com/cucumber/cucumber-rails/pull/157] Mario Visic)
## [v1.0.2](https://github.com/cucumber/cucumber-rails/compare/v1.0.1...v1.0.2)
View
@@ -1,6 +1,6 @@
The MIT License
-Copyright (c) 2008,2009,2010 Aslak Hellesøy and the Cucumber Team.
+Copyright (c) 2008,2009,2010,2011 Aslak Hellesøy and the Cucumber Team.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
View
@@ -1,6 +1,8 @@
# Cucumber-Rails
-Cucumber-Rails brings Cucumber to Rails3. It contains 2 generators - one
+Cucumber-Rails brings Cucumber to Rails 3.x. For Rails 2x support, see the [Cucumber Wiki](https://github.com/cucumber/cucumber/wiki/Ruby-on-Rails).
+
+Cucumber-Rails contains 2 generators - one
for bootstrapping your Rails app for Cucumber, and a second one for generating features.
Cucumber-Rails also contains Cucumber Step Definitions that wrap Capybara,
View
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
s.add_development_dependency('rake', '>= 0.9.2')
s.add_development_dependency('bundler', '>= 1.0.18')
s.add_development_dependency('aruba', '>= 0.4.6')
- s.add_development_dependency('sqlite3-ruby', '>= 1.3.3')
+ s.add_development_dependency('sqlite3', '>= 1.3.4')
s.add_development_dependency('rspec', '>= 2.6.0')
s.add_development_dependency('rspec-rails', '>= 2.6.1')
s.add_development_dependency('factory_girl', '>= 2.1.0')
@@ -54,7 +54,7 @@ end
# | Note | Nice guy |
# | Wants Email? | |
#
-# TODO: Add support for checkbox, select og option
+# TODO: Add support for checkbox, select or option
# based on naming conventions.
#
When /^(?:|I )fill in the following:$/ do |fields|

0 comments on commit eee179a

Please sign in to comment.