Much improved cucumber suite - work in progress.

.gitignore

@@ -2,4 +2,5 @@ pkg
 doc
 tmp
 coverage
-.bundle
+.bundle
+Gemfile.lock

Gemfile

@@ -2,4 +2,5 @@ source "http://rubygems.org"
 gemspec
 
 gem 'cucumber', :path => '../cucumber' if File.directory?(File.dirname(__FILE__) + '/../cucumber')
-gem 'aruba', :path => '../aruba' if File.directory?(File.dirname(__FILE__) + '/../aruba')
+gem 'gherkin',  :path => '../gherkin'  if File.directory?(File.dirname(__FILE__) + '/../gherkin')
+gem 'aruba',    :path => '../aruba'    if File.directory?(File.dirname(__FILE__) + '/../aruba')

cucumber-rails.gemspec

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require "cucumber/platform"
 
 Gem::Specification.new do |s|
   s.name        = 'cucumber-rails'
@@ -13,8 +12,9 @@ Gem::Specification.new do |s|
 
   s.platform    = Gem::Platform::RUBY
 
-  s.add_dependency 'cucumber', '~> 0.9.0' unless File.directory?(File.dirname(__FILE__) + '/../cucumber')
+  s.add_dependency('cucumber', '~> 0.9.0') unless File.directory?(File.expand_path(File.dirname(__FILE__) + '/../cucumber'))
   s.add_dependency 'aruba', '~> 0.2.2' unless File.directory?(File.dirname(__FILE__) + '/../aruba')
+  s.add_development_dependency('rspec', "~> 2.0.0.beta.22")
 
   s.rubygems_version   = "1.3.7"
   s.files            = `git ls-files`.split("\n")

features/rails3.feature

@@ -1,27 +1,18 @@
-@announce-cmd
-@announce @puts
+@announce
 Feature: Rails 3
   In order to take over the world
   Cucumber-Rails should work on major versions
-  of Rails2 and Ruby, with Capybara, Spork and DatabaseCleaner
+  of Rails 3 and Ruby, with Capybara, Spork and DatabaseCleaner
 
   Scenario: Install Cucumber-Rails
-    Given I am using rvm "ruby-1.8.7-p249"
-    And I am using rvm gemset "cucumber-rails-3.0.0.beta" with Gemfile:
+    Given I have a Rails "3.0.0" project named "rails-3-app" with the following appended to Gemfile:
       """
-      source :gemcutter
-      gem 'rails', '3.0.0.rc'
-      gem 'sqlite3-ruby', '1.2.5'
       gem 'capybara', '0.3.9'
+      gem 'rspec', '2.0.0.beta.22'
+      gem 'cucumber-rails', :path => '../../..' 
       """
-    When I successfully run "rails new rails-3-app"
-    Then it should pass with:
-      """
-      README
-      """
-    And I cd to "rails-3-app"
-    And I symlink "../../.." to "vendor/plugins/cucumber-rails"
-    When I successfully run "rails generate cucumber:install --capybara"
+
+
     Then the following files should exist:
       | config/cucumber.yml                    |
       | script/cucumber                        |

features/support/env.rb

@@ -2,3 +2,4 @@
 require 'rubygems'
 require 'rspec/expectations'
 require 'aruba'
+require 'aruba/rails3'