Merge pull request #293 from twalpole/cucumber2

Test fix / Cucumber 2 / Rails 4.2

.travis.yml

@@ -9,6 +9,7 @@ branches:
 
 gemfile:
   - gemfiles/capybara_1_1.gemfile
+  - gemfiles/rails_4_2.gemfile
   - gemfiles/rails_4_1.gemfile
   - gemfiles/rails_4_0.gemfile
   - gemfiles/rails_3_2.gemfile

Appraisals

@@ -76,3 +76,17 @@ appraise "rails_4_1" do
   gem "sqlite3", "~> 1.3.7"
   gem "database_cleaner", "~> 1.0.1"
 end
+
+appraise "rails_4_2" do
+  gem "rails", "~> 4.2.1"
+  gem "railties", "~> 4.2.1"
+  gem "capybara", "~> 2.4.4"
+  gem "selenium-webdriver", "~> 2.0"
+  gem "rspec-rails", "~> 3.1.0"
+  gem "sass-rails", "~> 5.0"
+  gem "coffee-rails", "~> 4.1.0"
+  gem "jquery-rails"
+  gem "uglifier", "~> 2.1.0"
+  gem "sqlite3", "~> 1.3.7"
+  gem "database_cleaner", "~> 1.0.1"
+end

cucumber-rails.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
 
   s.add_runtime_dependency('capybara', ['>= 1.1.2', '< 3'])
-  s.add_runtime_dependency('cucumber', ['>= 1.3.8', '< 2'])
+  s.add_runtime_dependency('cucumber', ['>= 1.3.8', '< 2.1'])
   s.add_runtime_dependency('nokogiri', '~> 1.5')
   s.add_runtime_dependency('rails', ['>= 3', '< 5'])
   s.add_runtime_dependency('mime-types', ['>= 1.16', '< 3'])

features/capybara_javascript_drivers.feature

@@ -27,10 +27,10 @@ Feature: Capybara Javascript Drivers
         Scenario: Constitution on May 17
           Given I am on the new appointment page
           And I fill in "Norway's constitution" for "Name"
-          And I select "2009-02-20 15:10:00 UTC" as the "When" date and time
+          And I select "2015-02-20 15:10:00 UTC" as the "When" date and time
           And I press "Create Appointment"
           Then I should see "Norway's constitution"
-          And I should see "2009-02-20 15:10:00 UTC"
+          And I should see "2015-02-20 15:10:00 UTC"
 
       """
     When I run `bundle exec rake db:migrate`

gemfiles/rails_4_2.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.1"
+gem "railties", "~> 4.2.1"
+gem "capybara", "~> 2.4.4"
+gem "selenium-webdriver", "~> 2.0"
+gem "rspec-rails", "~> 3.1.0"
+gem "sass-rails", "~> 5.0"
+gem "coffee-rails", "~> 4.1.0"
+gem "jquery-rails"
+gem "uglifier", "~> 2.1.0"
+gem "sqlite3", "~> 1.3.7"
+gem "database_cleaner", "~> 1.0.1"
+
+gemspec :path => "../"