cucumber-rails 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18eb3e7f88190966a0783c214f58d3ba992ac14d
-  data.tar.gz: 2970fe259fe7e9979730eb8d7805087d1360da89
+  metadata.gz: 058a656884c5c7b883e04e15202d7dbf2dfd27c2
+  data.tar.gz: d733e3be1786575e623813325bbf84b9c3ff2423
 SHA512:
-  metadata.gz: d347e5b53ebc60d2f93b2f52b2760a678ccc8677aae433d93c2c333fadef6da802c5df8e574830c83cb5522af2b3acdb7058efb2b9c6ca29782aa592cf772dc5
-  data.tar.gz: b9f836959a3b3d3c470da1a92625028b392d9016ed284d34e2f1b1938366b2d953867eb89d6dc67870f7c3936787bb074b6dcb720a18454624561097e8220059
+  metadata.gz: 8da363e0f01fccf58f980a5aaa1fe3763ede99f4a068b11ae29f44594c9fb6b518f37a529408ede35fca80dfc15d2961e632d09115a0429359fc83fb60c8abf5
+  data.tar.gz: 63bb9dbe928094787d5d52bd21d0853ec6941cc5a49b134ab8844cb089c445041892f307d0a888a3c45b6753ab043ffaba467d4e7110813c0ddf3dc0d89fbe80

data/.travis.yml

@@ -1,6 +1,7 @@
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.2.1
 
 # whitelist
 branches:
@@ -9,6 +10,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
@@ -24,6 +26,19 @@ matrix:
     - rvm: 2.0.0
       gemfile: gemfiles/rails_3_0.gemfile
 
+    - rvm: 2.2.1
+      gemfile: gemfiles/capybara_1_1.gemfile
+    - rvm: 2.2.1
+      gemfile: gemfiles/rails_4_0.gemfile
+    - rvm: 2.2.1
+      gemfile: gemfiles/rails_3_2.gemfile
+    - rvm: 2.2.1
+      gemfile: gemfiles/rails_3_1.gemfile
+    - rvm: 2.2.1
+      gemfile: gemfiles/rails_3_0.gemfile
+
+before_install: gem update --remote bundler
+
 # Needed for selenium browser
 before_script:
   - "export DISPLAY=:99.0"
@@ -32,5 +47,3 @@ before_script:
 notifications:
   email:
     - cukes-devs@googlegroups.com
-  irc:
-    - "irc.freenode.org#cucumber"

data/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

data/History.md

@@ -1,3 +1,17 @@
+## [master](https://github.com/cucumber/cucumber-rails/compare/1.4.2...master) (Not yet released)
+
+ * Added gem version badge (Kosmas Chatzimichalis)
+ * Fix a failing test due to rails date selectors only showing 5 years into the past by default ( [#293] (https://github.com/cucumber/cucumber-rails/pull/293) Thomas Walpole )
+ * Allow cucumber 2 ( [#293] (https://github.com/cucumber/cucumber-rails/pull/293) Thomas Walpole )
+ * Add rails 4.2 to test matrix ( [#293] (https://github.com/cucumber/cucumber-rails/pull/293) Thomas Walpole )
+ * Depend on railties instead of rails ( [#294] (https://github.com/cucumber/cucumber-rails/pull/294) Alexander Lang )
+ * Fix failing Travis CI tests ( [#305] (https://github.com/cucumber/cucumber-rails/pull/305) Matijs van Zuijlen )
+ * Allow any cucumber < 3 ( [#306] (https://github.com/cucumber/cucumber-rails/pull/306) Matijs van Zuijlen )
+ * Add annotations configuration in generator ( [#292] (https://github.com/cucumber/cucumber-rails/pull/292) Bob Showalter )
+ * Expand support to include mime-types 3 ( [#304] (https://github.com/cucumber/cucumber-rails/pull/304) Austin Ziegler )
+ * Replace badges with SVG versions ( [#307] (https://github.com/cucumber/cucumber-rails/pull/307) Kevin Goslar )
+ * Add new line to end of generated database.yml ( [#302] (https://github.com/cucumber/cucumber-rails/pull/302) Kevin Carmody)
+
 ## [v1.4.2](https://github.com/cucumber/cucumber-rails/compare/1.4.1...v1.4.2) (2014-10-09)
 
  * Updated appraisal dependencies to rspec-rails 3.1.0, gemspec dependency to rspec <= 3.1, and removed turn from rails_4_1 appraisal (Kosmas Chatzimichalis)

data/README.md

@@ -1,7 +1,8 @@
 # Cucumber-Rails
 
-[![Build Status](https://secure.travis-ci.org/cucumber/cucumber-rails.png?branch=master)](http://travis-ci.org/cucumber/cucumber-rails)
-[![Code Climate](https://codeclimate.com/github/cucumber/cucumber-rails.png)](https://codeclimate.com/github/cucumber/cucumber-rails)
+[![Gem Version](https://badge.fury.io/rb/cucumber-rails.svg)](http://badge.fury.io/rb/cucumber-rails)
+[![Build Status](https://secure.travis-ci.org/cucumber/cucumber-rails.svg?branch=master)](http://travis-ci.org/cucumber/cucumber-rails)
+[![Code Climate](https://codeclimate.com/github/cucumber/cucumber-rails.svg)](https://codeclimate.com/github/cucumber/cucumber-rails)
 [![Dependency Status](https://gemnasium.com/Kosmas/cucumber-rails.svg)](https://gemnasium.com/Kosmas/cucumber-rails)
 [![PullReview stats](https://www.pullreview.com/github/cucumber/cucumber-rails/badges/master.svg?)](https://www.pullreview.com/github/cucumber/cucumber-rails/reviews/master)
 

data/cucumber-rails.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'cucumber-rails'
-  s.version     = '1.4.2'
+  s.version     = '1.4.3'
   s.authors     = ["Aslak Hellesøy", "Dennis Blöte", "Rob Holland"]
   s.description = "Cucumber Generator and Runtime for Rails"
   s.summary     = "#{s.name}-#{s.version}"
@@ -13,21 +13,23 @@ 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', '< 3'])
   s.add_runtime_dependency('nokogiri', '~> 1.5')
-  s.add_runtime_dependency('rails', ['>= 3', '< 5'])
-  s.add_runtime_dependency('mime-types', ['>= 1.16', '< 3'])
+  s.add_runtime_dependency('railties', ['>= 3', '< 5'])
+  s.add_runtime_dependency('mime-types', ['>= 1.16', '< 4'])
 
   # Main development dependencies
-  s.add_development_dependency('ammeter', ['>= 0.2.9', '< 2'])
+  s.add_development_dependency('ammeter', ['>= 0.2.9', '< 1.1.3'])
   s.add_development_dependency('appraisal', '>= 0.5.1')
-  s.add_development_dependency('aruba', '>= 0.4.11')
+  s.add_development_dependency('aruba', '~> 0.8.0')
   s.add_development_dependency('builder', ['>= 2.1.2', '< 4'])
   s.add_development_dependency('bundler', '>= 1.3.5')
+  s.add_development_dependency('selenium-webdriver', '>= 2.45.0')
   s.add_development_dependency('database_cleaner', '>= 0.7.2')
   s.add_development_dependency('factory_girl', '>= 3.2')
   s.add_development_dependency('rake', '>= 0.9.2.2')
   s.add_development_dependency('rspec', '>= 2.2', '<= 3.1')
+  s.add_development_dependency('rails')
 
   # For Documentation:
   s.add_development_dependency('bcat', '>= 0.6.2')

data/features/allow_rescue.feature

@@ -33,7 +33,7 @@ Feature: Allow Cucumber to rescue exceptions
       """
     And I run `bundle exec rake db:migrate`
     And I run `bundle exec cucumber`
-    Then it should pass with:
+    Then the feature run should pass with:
       """
       1 scenario (1 passed)
       1 step (1 passed)

data/features/annotations.feature

@@ -0,0 +1,23 @@
+@requires-rails-version-42
+Feature: Annotations
+
+  I order to track my development progress
+  As a developer
+  I should be able to list annotations in my features
+
+  Background:
+    Given I have created a new Rails app "test-app" with no database and installed cucumber-rails
+    And I write to "features/tests.feature" with:
+      """
+      Feature: Tests
+        Scenario: Tests
+          # TODO: When I go to the products page
+      """
+
+  Scenario: See annotations in .feature file
+    When I run `bundle exec rake notes`
+    Then it should pass with:
+      """
+      features/tests.feature:
+        * [ 3] [TODO] When I go to the products page
+      """

data/features/capybara_javascript_drivers.feature

@@ -27,15 +27,15 @@ 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`
     And I run `bundle exec rake cucumber`
-    Then it should pass with:
+    Then the feature run should pass with:
       """
       1 scenario (1 passed)
       6 steps (6 passed)
@@ -65,7 +65,7 @@ Feature: Capybara Javascript Drivers
 
     When I run `bundle exec rake db:migrate`
     And I run `bundle exec rake cucumber`
-    Then it should pass with:
+    Then the feature run should pass with:
       """
       1 scenario (1 passed)
       3 steps (3 passed)

data/features/choose_javascript_database_strategy.feature

@@ -69,7 +69,7 @@ Feature: Choose javascript database strategy
       end
       """
     When I run the cukes
-    Then it should pass with:
+    Then the feature run should pass with:
        """
        3 scenarios (3 passed)
        10 steps (10 passed)
@@ -105,7 +105,7 @@ Feature: Choose javascript database strategy
       end
       """
     When I run the cukes
-    Then it should pass with:
+    Then the feature run should pass with:
        """
        2 scenarios (2 passed)
        5 steps (5 passed)
@@ -137,7 +137,7 @@ Feature: Choose javascript database strategy
       end
       """
     When I run the cukes
-    Then it should pass with:
+    Then the feature run should pass with:
        """
        2 scenarios (2 passed)
        3 steps (3 passed)

data/features/database_cleaner.feature

@@ -37,7 +37,7 @@ Feature: DatabaseCleaner
       """
     And I run `bundle exec rake db:migrate`
     And I run `bundle exec rake cucumber`
-    Then it should pass with:
+    Then the feature run should pass with:
        """
        2 scenarios (2 passed)
        6 steps (6 passed)

data/features/disable_automatic_database_cleaning.feature

@@ -48,7 +48,7 @@ Feature: Disable automatic database cleaning
      """
     And I run `bundle exec rake db:migrate`
     And I run `bundle exec rake cucumber`
-    Then it should pass with:
+    Then the feature run should pass with:
        """
        2 scenarios (2 passed)
        4 steps (4 passed)

data/features/emulate_javascript.feature

@@ -28,7 +28,7 @@ Feature: Emulate Javascript
       """
     When I run `bundle exec rake db:migrate`
     And I run `bundle exec rake cucumber`
-    Then it should pass with:
+    Then the feature run should pass with:
        """
        1 scenario (1 passed)
        3 steps (3 passed)
@@ -85,7 +85,7 @@ Feature: Emulate Javascript
       """
     When I run `bundle exec rake db:migrate`
     And I run `bundle exec rake cucumber`
-    Then it should pass with:
+    Then the feature run should pass with:
        """
        1 scenario (1 passed)
        8 steps (8 passed)

data/features/rerun_profile.feature

@@ -29,7 +29,7 @@ Feature: Rerun profile
       end
       """
     When I successfully run `bundle exec cucumber -p rerun`
-    Then it should pass with:
+    Then the feature run should pass with:
       """
       1 scenario (1 passed)
       1 step (1 passed)

data/features/rest_api.feature

@@ -40,7 +40,7 @@ Feature: REST API
       """
     And I run `bundle exec rake db:migrate`
     And I run `bundle exec rake cucumber`
-    Then it should pass with:
+    Then the feature run should pass with:
        """
        1 scenario (1 passed)
        2 steps (2 passed)

data/features/step_definitions/cucumber_rails_steps.rb

@@ -1,9 +1,11 @@
 module CucumberRailsHelper
   def rails_new(options = {})
     options[:name] ||= 'test_app'
-    run_simple "bundle exec rails new #{options[:name]} --skip-test-unit --skip-spring #{options[:args]}"
-    assert_passing_with('README')
+    command = run "bundle exec rails new #{options[:name]} --skip-test-unit --skip-spring #{options[:args]}"
+    assert_partial_output('README', all_output)
+    assert_success(true)
     cd options[:name]
+    set_environment_variable 'BUNDLE_GEMFILE', 'Gemfile'
   end
 
   def install_cucumber_rails(*options)
@@ -81,3 +83,11 @@ end
 When /^I run the cukes$/ do
   run_simple('bundle exec cucumber')
 end
+
+# Copied from Aruba
+Then /^the feature run should pass with:$/ do |string|
+  step 'the output should not contain " failed)"'
+  step 'the output should not contain " undefined)"'
+  step 'the exit status should be 0'
+  step 'the output should contain:', string
+end

data/features/support/aruba.rb

@@ -0,0 +1,3 @@
+Aruba.configure do |config|
+  config.exit_timeout = 120
+end

data/features/support/env.rb

@@ -4,11 +4,6 @@ require 'bundler/setup'
 require 'rspec/expectations'
 require 'aruba/cucumber'
 
-Before do
-  @aruba_timeout_seconds = 120 # A long time needed some times
-  unset_bundler_env_vars
-end
-
 if(ENV['ARUBA_REPORT_DIR'])
   # Override reporting behaviour so we don't document all files, only the ones
   # that have been created after @aruba_report_start (a Time object). This is

data/features/support/version_hooks.rb

@@ -0,0 +1,12 @@
+module VersionHooksHelper
+  def rails_version
+    @rails_version ||= `bundle exec rails --version`.match(/[\d.]+$/).to_s
+  end
+end
+
+Before '@requires-rails-version-42' do
+  extend VersionHooksHelper
+  if Gem::Version.new(rails_version) < Gem::Version.new('4.2')
+    skip_this_scenario
+  end
+end

data/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 => "../"

data/lib/generators/cucumber/install/install_generator.rb

@@ -41,7 +41,7 @@ module Cucumber
       return unless File.exist?('config/database.yml')
       unless File.read('config/database.yml').include? 'cucumber:'
         gsub_file 'config/database.yml', /^test:.*\n/, "test: &test\n"
-        gsub_file 'config/database.yml', /\z/, "\ncucumber:\n  <<: *test"
+        gsub_file 'config/database.yml', /\z/, "\ncucumber:\n  <<: *test\n"
 
         # Since gsub_file doesn't ask the user, just inform user that the file was overwritten.
         puts '       force  config/database.yml'

data/lib/generators/cucumber/install/templates/tasks/cucumber.rake.erb

@@ -35,6 +35,15 @@ begin
       ::STATS_DIRECTORIES << %w(Cucumber\ features features) if File.exist?('features')
       ::CodeStatistics::TEST_TYPES << "Cucumber features" if File.exist?('features')
     end
+
+    task :annotations_setup do
+      Rails.application.configure do
+        if config.respond_to?(:annotations)
+          config.annotations.directories << 'features'
+          config.annotations.register_extensions('feature') { |tag| /#\s*(#{tag}):?\s*(.*)$/ }
+        end
+      end
+    end
   end
   desc 'Alias for cucumber:ok'
   task :cucumber => 'cucumber:ok'
@@ -50,6 +59,8 @@ begin
   end
 
   task :stats => 'cucumber:statsetup'
+
+  task :notes => 'cucumber:annotations_setup'
 rescue LoadError
   desc 'cucumber rake task not available (cucumber not installed)'
   task :cucumber do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-rails
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Aslak Hellesøy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -41,7 +41,7 @@ dependencies:
         version: 1.3.8
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
         version: 1.3.8
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
         version: '1.16'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -105,7 +105,7 @@ dependencies:
         version: '1.16'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +115,7 @@ dependencies:
         version: 0.2.9
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 1.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -125,7 +125,7 @@ dependencies:
         version: 0.2.9
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -144,16 +144,16 @@ dependencies:
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.11
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.11
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +188,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.5
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.45.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.45.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -250,6 +264,20 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bcat
   requirement: !ruby/object:Gem::Requirement
@@ -336,6 +364,7 @@ files:
 - dev_tasks/yard/default/layout/html/logo.erb
 - dev_tasks/yard/default/layout/html/setup.rb
 - features/allow_rescue.feature
+- features/annotations.feature
 - features/capybara_javascript_drivers.feature
 - features/choose_javascript_database_strategy.feature
 - features/database_cleaner.feature
@@ -347,17 +376,20 @@ files:
 - features/rerun_profile.feature
 - features/rest_api.feature
 - features/step_definitions/cucumber_rails_steps.rb
+- features/support/aruba.rb
 - features/support/bundler_pre_support.rb
 - features/support/env.rb
 - features/support/fixtures/bundler-1.0.21.gem
 - features/support/fixtures/bundler-1.1.rc.gem
 - features/support/legacy_web_steps_support.rb
+- features/support/version_hooks.rb
 - gemfiles/capybara_1_1.gemfile
 - gemfiles/rails_3_0.gemfile
 - gemfiles/rails_3_1.gemfile
 - gemfiles/rails_3_2.gemfile
 - gemfiles/rails_4_0.gemfile
 - gemfiles/rails_4_1.gemfile
+- gemfiles/rails_4_2.gemfile
 - lib/cucumber/rails.rb
 - lib/cucumber/rails/action_controller.rb
 - lib/cucumber/rails/application.rb
@@ -406,9 +438,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: cucumber-rails-1.4.2
+summary: cucumber-rails-1.4.3
 test_files: []
 has_rdoc: