cucumber-rails 0.3.2 → 0.4.0.beta.1

data/.gitignore

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

data/.rspec

@@ -0,0 +1 @@
+--format progress --colour

data/.rvmrc

@@ -0,0 +1 @@
+rvm @cucumber

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/History.txt

@@ -1,3 +1,10 @@
+== In Git
+
+No more Cucumber::Rails::World.use_transactional_fixtures = false. Use DatabaseCleaner.strategy = :none instead
+
+=== Bugfixes
+* Gem dependency on Nokogiri (for #tableish). (#53 Aslak Hellesøy)
+
 == 0.3.2 2010-06-06
 
 == Changed features

data/README.rdoc

@@ -15,8 +15,8 @@ Before you can use the generator, add the necessary gems to your project's Gemfi
   gem 'capybara'
   gem 'database_cleaner'
   gem 'cucumber-rails'
-  gem 'cucumber', '0.7.2'
-  gem 'rspec-rails', '2.0.0.beta.8'
+  gem 'cucumber'
+  gem 'rspec-rails'
   gem 'spork'
   gem 'launchy'    # So you can do Then show me the page
 

data/Rakefile

@@ -1,23 +1,7 @@
 # encoding: utf-8
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "cucumber-rails"
-    gemspec.summary = "Cucumber Generators and Runtime for Rails"
-    gemspec.description = "Cucumber Generators and Runtime for Rails"
-    gemspec.email = "cukes@googlegroups.com"
-    gemspec.homepage = "http://cukes.info"
-    gemspec.authors = ["Dennis Blöte", "Aslak Hellesøy", "Rob Holland"]
-    gemspec.homepage = "http://github.com/aslakhellesoy/cucumber-rails"
-
-    gemspec.add_dependency 'cucumber', '>= 0.8.0'
-    gemspec.add_development_dependency 'aruba', '>= 0.1.9'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler"
-end
+require 'rubygems'
+require 'bundler/setup'
+Bundler::GemHelper.install_tasks
 
 $:.unshift(File.dirname(__FILE__) + '/lib')
 Dir["#{File.dirname(__FILE__)}/dev_tasks/*.rake"].sort.each { |ext| load ext }

data/cucumber-rails.gemspec

@@ -1,111 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require 'cucumber/rails/version'
 
 Gem::Specification.new do |s|
-  s.name = %q{cucumber-rails}
-  s.version = "0.3.2"
+  s.name        = 'cucumber-rails'
+  s.version     = Cucumber::Rails::VERSION
+  s.authors     = ["Aslak Hellesøy", "Dennis Blöte", "Rob Holland"]
+  s.description = "Cucumber Generators and Runtime for Rails"
+  s.summary     = "cucumber-rails-#{s.version}"
+  s.email       = 'cukes@googlegroups.com'
+  s.homepage    = "http://cukes.info"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Dennis Bl\303\266te", "Aslak Helles\303\270y", "Rob Holland"]
-  s.date = %q{2010-06-06}
-  s.description = %q{Cucumber Generators and Runtime for Rails}
-  s.email = %q{cukes@googlegroups.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "HACKING.rdoc",
-     "History.txt",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "config/.gitignore",
-     "cucumber-rails.gemspec",
-     "dev_tasks/cucumber.rake",
-     "dev_tasks/rspec.rake",
-     "features/rails2.feature",
-     "features/rails3.feature",
-     "features/rerun_profile.feature",
-     "features/step_definitions/cucumber_rails_steps.rb",
-     "features/support/env.rb",
-     "features/support/matchers/files.rb",
-     "generators/cucumber/USAGE",
-     "generators/cucumber/cucumber_generator.rb",
-     "generators/feature/USAGE",
-     "generators/feature/feature_generator.rb",
-     "lib/cucumber/rails/action_controller.rb",
-     "lib/cucumber/rails/active_record.rb",
-     "lib/cucumber/rails/capybara_javascript_emulation.rb",
-     "lib/cucumber/rails/rspec.rb",
-     "lib/cucumber/rails/test_unit.rb",
-     "lib/cucumber/rails/world.rb",
-     "lib/cucumber/web/tableish.rb",
-     "lib/generators/cucumber/feature/USAGE",
-     "lib/generators/cucumber/feature/feature_base.rb",
-     "lib/generators/cucumber/feature/feature_generator.rb",
-     "lib/generators/cucumber/feature/named_arg.rb",
-     "lib/generators/cucumber/install/USAGE",
-     "lib/generators/cucumber/install/install_base.rb",
-     "lib/generators/cucumber/install/install_generator.rb",
-     "spec/cucumber/web/tableish_spec.rb",
-     "spec/generators/cucumber/install/install_base_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "templates/feature/feature.erb",
-     "templates/feature/steps.erb",
-     "templates/install/config/cucumber.yml.erb",
-     "templates/install/environments/cucumber.rb.erb",
-     "templates/install/script/cucumber",
-     "templates/install/step_definitions/capybara_steps.rb.erb",
-     "templates/install/step_definitions/web_steps_cs.rb.erb",
-     "templates/install/step_definitions/web_steps_da.rb.erb",
-     "templates/install/step_definitions/web_steps_de.rb.erb",
-     "templates/install/step_definitions/web_steps_es.rb.erb",
-     "templates/install/step_definitions/web_steps_ja.rb.erb",
-     "templates/install/step_definitions/web_steps_ko.rb.erb",
-     "templates/install/step_definitions/web_steps_no.rb.erb",
-     "templates/install/step_definitions/web_steps_pt-BR.rb.erb",
-     "templates/install/step_definitions/webrat_steps.rb.erb",
-     "templates/install/support/_rails_each_run.rb.erb",
-     "templates/install/support/_rails_prefork.rb.erb",
-     "templates/install/support/capybara.rb",
-     "templates/install/support/edit_warning.txt",
-     "templates/install/support/paths.rb",
-     "templates/install/support/rails.rb.erb",
-     "templates/install/support/rails_spork.rb.erb",
-     "templates/install/support/webrat.rb",
-     "templates/install/tasks/cucumber.rake.erb"
-  ]
-  s.homepage = %q{http://github.com/aslakhellesoy/cucumber-rails}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Cucumber Generators and Runtime for Rails}
-  s.test_files = [
-    "spec/cucumber/web/tableish_spec.rb",
-     "spec/generators/cucumber/install/install_base_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<cucumber>, [">= 0.8.0"])
-      s.add_development_dependency(%q<aruba>, [">= 0.1.9"])
-    else
-      s.add_dependency(%q<cucumber>, [">= 0.8.0"])
-      s.add_dependency(%q<aruba>, [">= 0.1.9"])
-    end
-  else
-    s.add_dependency(%q<cucumber>, [">= 0.8.0"])
-    s.add_dependency(%q<aruba>, [">= 0.1.9"])
-  end
+  s.add_dependency('cucumber', '~> 0.10.0')
+  s.add_development_dependency('aruba', '~> 0.2.7')
+  s.add_development_dependency('rails', '~> 3.0.3')
+  s.add_development_dependency('sqlite3-ruby', '~> 1.3.2')
+  s.add_development_dependency('rspec-rails', Cucumber::Rails::DEPS['rspec-rails'])
+  s.add_development_dependency('capybara', Cucumber::Rails::DEPS['capybara'])
+  s.add_development_dependency('webrat', Cucumber::Rails::DEPS['webrat'])
+  s.add_development_dependency('database_cleaner', Cucumber::Rails::DEPS['database_cleaner'])
+  
+  s.rubygems_version   = "1.3.7"
+  s.files            = `git ls-files`.split("\n")
+  s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
+  s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.extra_rdoc_files = ["LICENSE", "README.rdoc", "History.txt"]
+  s.rdoc_options     = ["--charset=UTF-8"]
+  s.require_path     = "lib"
 end
-

data/dev_tasks/rspec.rake

@@ -1,13 +1,8 @@
-begin
-  require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
-  desc "Run RSpec"
-  Spec::Rake::SpecTask.new do |t|
-    t.spec_opts = %w{--color --diff --format profile}
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.rcov = ENV['RCOV']
-    t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
-  end
-rescue LoadError
-  task :spec
+desc "Run RSpec"
+RSpec::Core::RakeTask.new do |t|
+  t.rcov = ENV['RCOV']
+  t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
+  t.verbose = true
 end

data/features/rails2.feature

@@ -1,27 +1,13 @@
+@announce
 Feature: Rails 2
   In order to take over the world
   Cucumber-Rails should work on major versions
   of Rails2 and Ruby, with Capybara, Webrat, Spork and DatabaseCleaner
 
-  @announce @puts
-  Scenario Outline: Run Cucumber
-    Given I am using rvm "<ruby_version>"
-    And I am using rvm gemset "cucumber-rails-<rails_version>" with Gemfile:
-      """
-      source :gemcutter
-      gem 'rails', '<rails_version>'
-      gem 'sqlite3-ruby', '1.2.5'
-      gem 'capybara', '0.3.8'
-      gem 'webrat', '0.7.1'
-      gem 'rspec-rails', '1.3.2'
-      #gem 'cucumber', '0.8.0'
-      gem 'cucumber', :path => '../../../cucumber'
-      gem 'database_cleaner', '0.5.2'
-      gem 'culerity', '0.2.10'
-      gem 'celerity', '0.7.9'
-      """
-    And I successfully run "rails rails-2-app"
-    And I cd to "rails-2-app"
+  Scenario: Run Cucumber
+    Given a Rails "2.3.5" project named "rails-2-app" with Cucumber-Rails generated with "--capybara --rspec"
+
+    Given break
     And I symlink "../../../../cucumber" to "vendor/plugins/cucumber"
     And I symlink "../../.." to "vendor/plugins/cucumber-rails"
     And I successfully run "ruby script/generate cucumber --capybara"
@@ -57,8 +43,3 @@ Feature: Rails 2
       3 scenarios (3 passed)
       14 steps (14 passed)
       """
-
-    Examples:
-      | generator_args      | feature_args        | ruby_version | rails_version |
-      | --webrat --testunit |                     | 1.8.6        | 2.3.5         |
-      | --capybara --rspec  | --capybara culerity | 1.8.7        | 2.3.8         |

data/features/rails3.feature

@@ -1,27 +1,11 @@
-@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:
-      """
-      source :gemcutter
-      gem 'rails', '3.0.0.beta'
-      gem 'sqlite3-ruby', '1.2.5'
-      gem 'capybara', '0.3.8'
-      """
-    When I successfully run "rails 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"
+    Given I have created a new Rails 3 app "rails-3-app" with cucumber-rails support
     Then the following files should exist:
       | config/cucumber.yml                    |
       | script/cucumber                        |
@@ -29,40 +13,18 @@ Feature: Rails 3
       | features/support/env.rb                |
       | features/support/paths.rb              |
       | lib/tasks/cucumber.rake                |
-    And the file "features/support/env.rb" should contain "require 'cucumber/rails/world'"
-    And the file "features/support/env.rb" should contain "require 'capybara/rails'"
-
-  Scenario Outline: Run Cucumber
-    Given I am using rvm "<ruby_version>"
-    And I am using rvm gemset "cucumber-rails-3.0.0.beta-gemset-<gemset>" with Gemfile:
-      """
-      source :gemcutter
-      gem 'rails', '3.0.0.beta'
-      gem 'sqlite3-ruby', '1.2.5'
-      gem 'capybara', '0.3.8'
-      gem 'gherkin', '1.0.30'
-      gem 'term-ansicolor', '1.0.4'
-      gem 'diff-lcs', '1.1.2'
-      gem 'rspec-rails', '<rspec_version>'
-      """
-    And I successfully run "rails rails-3-app"
-    And I cd to "rails-3-app"
-    And I symlink "../../.." to "vendor/plugins/cucumber-rails"
-    And I append to "Gemfile" with:
-      """
-      gem 'capybara', '0.3.8'
-      gem 'cucumber', :path => '../../../../cucumber'
+    And the file "features/support/env.rb" should contain "require 'cucumber/rails'"
 
-      """
-    And I successfully run "rails generate cucumber:install --capybara"
+  Scenario: Inspect query string
+    Given I have created a new Rails 3 app "rails-3-app" with cucumber-rails support
     And I successfully run "rails generate cucumber:feature post title:string body:text published:boolean"
     And I successfully run "rails generate scaffold post title:string body:text published:boolean"
     And I successfully run "rails generate scaffold cukes name:string"
-    And I write to "app/controllers/cukes_controller.rb" with:
+    And I overwrite "app/controllers/cukes_controller.rb" with:
       """
       class CukesController < ApplicationController
         def index
-          redirect_to cuke_path(10, :overwrite_params => {:name => 'cucumber', :what => 'vegetable'})
+          redirect_to cuke_path(10, {:name => 'cucumber', :what => 'vegetable'})
         end
         
         def show
@@ -76,13 +38,10 @@ Feature: Rails 3
         Scenario: Tests
           When I go to the cukes page
           Then I should have the following query string: 
-            |name|cucumber|
-            |what|vegetable|
-            |controller|cukes|
-            |action|index|
+            | name       | cucumber  |
+            | what       | vegetable |
           And I should see "Cuke 10"
       """
-    And I successfully run "bundle lock"
     And I successfully run "rake db:migrate"
     And I successfully run "rake cucumber"
     Then it should pass with:
@@ -90,8 +49,75 @@ Feature: Rails 3
        3 scenarios (3 passed)
        14 steps (14 passed)
        """
-    
-    Examples:
-      | ruby_version    | rspec_version | gemset |
-      | ruby-1.8.7-p249 | 1.3.2         | 1      |
-      | ruby-1.9.1-p378 | 2.0.0.beta.10 | 2      |
+
+   Scenario: Allow rescue
+     Given I have created a new Rails 3 app "rails-3-app" with cucumber-rails support
+     And I write to "app/controllers/posts_controller.rb" with:
+       """
+       class PostsController < ApplicationController
+         def index
+           raise "There is an error in index"
+         end
+       end
+       """
+     And I write to "config/routes.rb" with:
+       """
+       Rails3App::Application.routes.draw do
+         resources :posts
+       end
+       """
+     And I write to "features/posts.feature" with:
+       """
+       Feature: posts
+         @allow-rescue
+         Scenario: See them
+           When I do it
+       """
+     And I write to "features/step_definitions/posts_steps.rb" with:
+       """
+       When /^I do it$/ do
+         visit '/posts'
+         puts page.body
+       end
+       """
+     And I run "rake cucumber"
+     Then it should pass with:
+        """
+        1 scenario (1 passed)
+        1 step (1 passed)
+        """
+
+  Scenario: Don't allow rescue
+    Given I have created a new Rails 3 app "rails-3-app" with cucumber-rails support
+    And I write to "app/controllers/posts_controller.rb" with:
+      """
+      class PostsController < ApplicationController
+        def index
+          raise "There is an error in index"
+        end
+      end
+      """
+    And I write to "config/routes.rb" with:
+      """
+      Rails3App::Application.routes.draw do
+        resources :posts
+      end
+      """
+    And I write to "features/posts.feature" with:
+      """
+      Feature: posts
+        Scenario: See them
+          When I do it
+      """
+    And I write to "features/step_definitions/posts_steps.rb" with:
+      """
+      When /^I do it$/ do
+        visit '/posts'
+      end
+      """
+    And I run "rake cucumber"
+    Then it should fail with:
+       """
+       1 scenario (1 failed)
+       1 step (1 failed)
+       """

data/features/step_definitions/cucumber_rails_steps.rb

@@ -1,35 +1,13 @@
-Given /^I symlink "([^"]*)" to "([^"]*)"$/ do |source, target|
-  source = File.expand_path(source, __FILE__)
-  in_current_dir do
-    target = File.expand_path(target)
-    FileUtils.ln_s(source, target)
-  end
-end
-
 Given /^I have created a new Rails 3 app "([^"]*)" with cucumber\-rails support$/ do |app_name|
   steps %Q{
-    Given I am using rvm "ruby-1.8.7-p249"
-    And I am using rvm gemset "cucumber-rails-3.0.0.beta-gemset-1" with Gemfile:
-      """
-      gem 'rails', '3.0.0.beta'
-      gem 'sqlite3-ruby', '1.2.5'
-      gem 'capybara', '0.3.8'
-      """
-    When I successfully run "rails rails-3-app"
+    When I successfully run "rails new rails-3-app"
     Then it should pass with:
       """
       README
       """
     And I cd to "#{app_name}"
-    And I symlink "../../.." to "vendor/plugins/cucumber-rails"
-    And I append to "Gemfile" with:
-      """
-      gem 'capybara', '0.3.8'
-      gem 'cucumber', :path => '../../../../cucumber'
-
-      """
-    And I successfully run "rails generate cucumber:install --capybara"
-    And I successfully run "bundle lock"
+    And I successfully run "rails generate cucumber:install"
+    And I successfully run "bundle install"
     And I successfully run "rake db:migrate"
   }
 end