aslakhellesoy-cucumber 0.1.2 → 0.1.3

data/examples/{web → watir}/features/steps/stories_steps.rb

@@ -3,13 +3,13 @@ require 'spec'
 case PLATFORM
 when /darwin/
   require 'safariwatir'
-  Browser = Watir::Safari
+  Watir::Browser = Watir::Safari
 when /win32|mingw/
   require 'watir'
-  Browser = Watir::IE
+  Watir::Browser = Watir::IE
 when /java/
   require 'celerity'
-  Browser = Celerity::Browser
+  Watir::Browser = Celerity::Browser
 else
   raise "This platform is not supported (#{PLATFORM})"
 end
@@ -30,7 +30,7 @@ class GoogleSearch
 end
 
 Before do
-  @b = Browser.new
+  @b = Watir::Browser.new
 end
 
 After do

data/gem_tasks/gemspec.rake

@@ -0,0 +1,6 @@
+namespace :gemspec do
+  desc 'Refresh cucumber.gemspec to include ALL files'
+  task :refresh => 'manifest:refresh' do
+    File.open('cucumber.gemspec', 'w') {|io| io.write($hoe.spec.to_ruby)}
+  end
+end

data/generators/cucumber/cucumber_generator.rb

@@ -0,0 +1,20 @@
+# This generator bootstraps a Rails project for use with Cucumber
+class CucumberGenerator < Rails::Generator::Base
+  def manifest
+    record do |m|
+      m.directory 'features/steps'
+      m.file      'env.rb', 'features/steps/env.rb'
+      m.file      'common_webrat.rb', 'features/steps/common_webrat.rb'
+
+      m.directory 'lib/tasks'
+      m.file      'cucumber.rake', 'lib/tasks/cucumber.rake'
+    end
+  end
+
+protected
+
+  def banner
+    "Usage: #{$0} cucumber"
+  end
+
+end

data/generators/cucumber/templates/common_webrat.rb

@@ -0,0 +1,30 @@
+# Commonly used webrat steps
+# http://github.com/brynary/webrat
+
+When /I press "(.*)"/ do |button|
+  clicks_button(button)
+end
+
+When /I follow "(.*)"/ do |link|
+  clicks_link(link)
+end
+
+When /I fill in "(.*)" for "(.*)"/ do |value, field|
+  fills_in(field, :with => value) 
+end
+
+When /I check "(.*)"/ do |field|
+  checks(field) 
+end
+
+When /I go to "(.*)"/ do |path|
+  visits(path) 
+end
+
+Then /I should see "(.*)"/ do |text|
+  response.body.should =~ /#{text}/m
+end
+
+Then /I should not see "(.*)"/ do |text|
+  response.body.should_not =~ /#{text}/m
+end

data/generators/cucumber/templates/cucumber.rake

@@ -0,0 +1,7 @@
+$:.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib')
+require 'cucumber/rake/task'
+
+Cucumber::Rake::Task.new(:features) do |t|
+  t.cucumber_opts = "--format pretty"
+end
+task :features => 'db:test:prepare'

data/generators/cucumber/templates/env.rb

@@ -0,0 +1,6 @@
+# Sets up the Rails environment for Cucumber
+ENV["RAILS_ENV"] = "test"
+require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
+require 'cucumber/rails/world'
+# Comment out the next line if you're not using RSpec's matchers (should / should_not) in your steps.
+require 'cucumber/rails/rspec'

data/generators/feature/feature_generator.rb

@@ -0,0 +1,17 @@
+# This generator bootstraps a Rails project for use with Cucumber
+class FeatureGenerator < Rails::Generator::NamedBase
+  def manifest
+    record do |m|
+      m.directory 'features/steps'
+      m.template  'feature.erb', "features/manage_#{plural_name}.feature"
+      m.template  'steps.erb', "features/steps/#{singular_name}_steps.rb"
+    end
+  end
+
+protected
+
+  def banner
+    "Usage: #{$0} cucumber"
+  end
+
+end

data/generators/feature/templates/feature.erb

@@ -0,0 +1,27 @@
+Feature: Manage <%= plural_name %>
+  In order to keep track of <%= plural_name %>
+  A <%= singular_name %> mechanic
+  Should be able to manage several <%= plural_name %>
+  
+  Scenario: Register new <%= singular_name %>
+    Given I am on the new <%= singular_name %> page
+<% keyword = 'When' -%>
+<% args.each do |arg| -%>
+    <%= keyword %> I fill in "My <%= singular_name %> <%= arg %>" for "<%= arg.humanize %>"
+<% keyword = 'And' -%>
+<% end -%>
+    And I press "Create"
+<% keyword = 'Then' -%>
+<% args.each do |arg| -%>
+    <%= keyword %> I should see "My <%= singular_name %> <%= arg %>"
+<% keyword = 'And' -%>
+<% end -%>
+
+  Scenario: Delete <%= singular_name %>
+    Given there are 4 <%= plural_name %>
+    When I delete the first <%= singular_name %>
+    Then there should be 3 <%= plural_name %> left
+    
+    | initial | after |
+    | 100     | 99    |
+    | 1       | 0     |

data/generators/feature/templates/steps.erb

@@ -0,0 +1,22 @@
+Given /I am on the new <%= singular_name %> page/ do
+  visits "/<%= plural_name %>/new"
+end
+
+Given /there are (\d+) <%= plural_name %>/ do |n|
+  <%= class_name %>.transaction do
+    <%= class_name %>.destroy_all
+    n.to_i.times do |n|
+      <%= class_name %>.create! :name => "<%= class_name %> #{n}"
+    end
+  end
+end
+
+When /I delete the first <%= singular_name %>/ do
+  visits <%= plural_name %>_url
+  clicks_link "Destroy"
+end
+
+Then /there should be (\d+) <%= plural_name %> left/ do |n|
+  <%= class_name %>.count.should == n.to_i
+  response.should have_tag("table tr", n.to_i + 1) # There is a header row too
+end

data/lib/cucumber.rb

@@ -17,8 +17,16 @@ module Cucumber
     attr_reader :language
     
     def load_language(lang)
+      @language = config[lang]
+    end
+    
+    def languages
+      config.keys.sort
+    end
+    
+    def config
       require 'yaml'
-      @language = YAML.load_file(File.dirname(__FILE__) + '/cucumber/languages.yml')[lang]
+      @config ||= YAML.load_file(File.dirname(__FILE__) + '/cucumber/languages.yml')
     end
   end  
 end

data/lib/cucumber/cli.rb

@@ -21,6 +21,12 @@ module Cucumber
         cli
       end
     end
+    
+    FORMATS = {
+      'progress' => Formatters::ProgressFormatter,
+      'html'     => Formatters::HtmlFormatter,
+      'pretty'   => Formatters::PrettyFormatter
+    }
 
     def initialize(args)
       @args = args.dup
@@ -37,13 +43,15 @@ module Cucumber
           @options[:require] ||= []
           @options[:require] << v
         end
-        opts.on("-l LINE", "--line LANG", "Only execute the scenario at the given line") do |v|
+        opts.on("-l LINE", "--line LINE", "Only execute the scenario at the given line") do |v|
           @options[:line] = v
         end
-        opts.on("-a LANG", "--language LANG", "Specify language for features (Default: #{@options[:lang]})") do |v|
+        opts.on("-a LANG", "--language LANG", "Specify language for features (Default: #{@options[:lang]})",
+          "Available languages: #{Cucumber.languages.join(", ")}") do |v|
           @options[:lang] = v
         end
-        opts.on("-f FORMAT", "--format FORMAT", "How to format features (Default: #{@options[:format]})") do |v|
+        opts.on("-f FORMAT", "--format FORMAT", "How to format features (Default: #{@options[:format]})",
+          "Available formats: #{FORMATS.keys.sort.join(", ")}") do |v|
           @options[:format] = v
         end
         opts.on("-d", "--dry-run", "Invokes formatters without executing the steps.") do
@@ -80,6 +88,7 @@ module Cucumber
     
     # Requires files - typically step files and ruby feature files.
     def require_files
+      ARGV.clear # Shut up RSpec
       require "cucumber/treetop_parser/feature_#{@options[:lang]}"
       require "cucumber/treetop_parser/feature_parser"
 
@@ -106,11 +115,7 @@ module Cucumber
     end
     
     def formatter
-      klass = {
-        'progress' => Formatters::ProgressFormatter,
-        'html'     => Formatters::HtmlFormatter,
-        'pretty'   => Formatters::PrettyFormatter,
-      }[@options[:format]]
+      klass = FORMATS[@options[:format]]
       klass.new(STDOUT)
     end
     

data/lib/cucumber/executor.rb

@@ -49,10 +49,6 @@ module Cucumber
       @formatter.header_executing(header) if @formatter.respond_to?(:header_executing)
     end
 
-    def visit_narrative(narrative)
-      @formatter.narrative_executing(narrative) if @formatter.respond_to?(:narrative_executing)
-    end
-
     def visit_scenario(scenario)
       if @line.nil? || scenario.at_line?(@line)
         @error = nil

data/lib/cucumber/formatters/html_formatter.rb

@@ -220,6 +220,7 @@ HTML
         @io.puts "        <dt>Feature: #{header}</dt>"
       end
 
+      # TODO: Lose me
       def visit_narrative(narrative)
         @io.puts "        <dd>"
         @io.puts "          <p>"

data/lib/cucumber/formatters/pretty_formatter.rb

@@ -103,16 +103,26 @@ module Cucumber
         @io.puts failed("#{@failed.length} steps failed") unless @failed.empty?
         @io.puts skipped("#{@skipped.length} steps skipped") unless @skipped.empty?
         @io.puts pending("#{@pending.length} steps pending") unless @pending.empty?
-
+        @io.print reset
+        print_snippets
+      end
+      
+      def print_snippets
         unless @pending.empty?
           @io.puts "\nYou can use these snippets to implement pending steps:\n\n"
           
-          @pending.each do |step|
-            @io.puts "#{step.keyword} /#{step.name}/ do\nend\n\n" unless step.row?
+          prev_keyword = nil
+          snippets = @pending.map do |step|
+            next if step.row?
+            snippet = "#{step.actual_keyword} /#{step.name}/ do\nend\n\n"
+            prev_keyword = step.keyword
+            snippet
+          end.compact.uniq
+          
+          snippets.each do |snippet|
+            @io.puts snippet
           end
         end
-
-        @io.print reset
       end
     end
   end

data/lib/cucumber/languages.yml

@@ -19,7 +19,7 @@
   scenario: Scenario
   given_scenario: SoitScenario
   given: Soit
-  when: Quand
+  when: Lorsque
   then: Alors
   and: Et
 "pt":

data/lib/cucumber/rails/rspec.rb

@@ -0,0 +1,12 @@
+require 'spec'
+require 'spec/rails'
+
+# Hack to stop RSpec from dumping the summary
+Spec::Runner::Options.class_eval do
+  def examples_should_be_run?
+    false
+  end
+end
+
+ActionController::Integration::Session.send(:include, Spec::Matchers)
+ActionController::Integration::Session.send(:include, Spec::Rails::Matchers)

data/lib/cucumber/rails/world.rb

@@ -8,8 +8,6 @@ else
   require 'action_controller/integration'
 end
 require 'test/unit/testresult'
-require 'spec'
-require 'spec/rails'
 
 # These allow exceptions to come through as opposed to being caught and hvaing non-helpful responses returned.
 ActionController::Base.class_eval do
@@ -26,18 +24,9 @@ end
 # So that Test::Unit doesn't launch at the end - makes it think it has already been run.
 Test::Unit.run = true
 
-# Hack to stop RSpec from dumping the summary
-Spec::Runner::Options.class_eval do
-  def examples_should_be_run?
-    false
-  end
-end
-
-ActionController::Integration::Session.send(:include, Spec::Matchers)
-ActionController::Integration::Session.send(:include, Spec::Rails::Matchers)
-
-module Cucumber
+module Cucumber #:nodoc:
   module Rails
+    # All scenarios will execute in the context of a new instance of World.
     class World < ActionController::IntegrationTest
       if defined?(ActiveRecord::Base)
         self.use_transactional_fixtures = true
@@ -58,12 +47,25 @@ end
 
 if defined?(ActiveRecord::Base)
   Before do
-    ActiveRecord::Base.send :increment_open_transactions
+    if defined?(ActiveRecord::Base)
+      if ActiveRecord::Base.connection.respond_to?(:increment_open_transactions)
+        ActiveRecord::Base.connection.increment_open_transactions
+      else
+        ActiveRecord::Base.send :increment_open_transactions
+      end
+    end
     ActiveRecord::Base.connection.begin_db_transaction
+    ActionMailer::Base.deliveries = [] if defined?(ActionMailer::Base)
   end
   
   After do
-    ActiveRecord::Base.connection.rollback_db_transaction
-    ActiveRecord::Base.send :decrement_open_transactions
+    if defined?(ActiveRecord::Base)
+      ActiveRecord::Base.connection.rollback_db_transaction
+      if ActiveRecord::Base.connection.respond_to?(:decrement_open_transactions)
+        ActiveRecord::Base.connection.decrement_open_transactions
+      else
+        ActiveRecord::Base.send :decrement_open_transactions
+      end
+    end
   end
 end

data/lib/cucumber/rake/task.rb

@@ -1,7 +1,6 @@
 module Cucumber
   module Rake
     # Defines a task for running features.
-    # TODO: Base on http://github.com/dchelimsky/rspec/tree/master/lib/spec/rake/spectask.rb
     class Task
       LIB    = File.expand_path(File.dirname(__FILE__) + '/../..')
       BINARY = File.expand_path(File.dirname(__FILE__) + '/../../../bin/cucumber')
@@ -12,11 +11,14 @@ module Cucumber
       attr_accessor :feature_list
       attr_accessor :feature_pattern
       attr_accessor :cucumber_opts
+      attr_accessor :rcov
+      attr_accessor :rcov_opts
       
       # Define a task
       def initialize(task_name = "features", desc = "Run Features")
         @task_name, @desc = task_name, desc
-        @libs = [LIB]
+        @libs = []
+        @rcov_opts = %w{--rails --exclude osx\/objc,gems\/}
 
         yield self if block_given?
 
@@ -28,27 +30,28 @@ module Cucumber
       def define_tasks
         desc @desc
         task @task_name do
-          args = []
-          args << '-I'
-          args << '"%s"' % libs.join(File::PATH_SEPARATOR)
-          args << '"%s"' % BINARY
-          args << (ENV['CUCUMBER_OPTS'] || cucumber_opts)
+          lib_args     = ['"%s"' % ([LIB] + libs).join(File::PATH_SEPARATOR)]
+          cucumber_bin = ['"%s"' % BINARY]
+          cuc_opts     = [(ENV['CUCUMBER_OPTS'] || cucumber_opts)]
 
           step_files.each do |step_file|
-            args << '--require'
-            args << step_file
+            cuc_opts << '--require'
+            cuc_opts << step_file
+          end
+
+          if rcov
+            args = (['-I'] + lib_args + ['-S', 'rcov'] + rcov_opts + cucumber_bin + ['--'] + cuc_opts + feature_files).flatten
+          else
+            args = (['-I'] + lib_args + cucumber_bin + cuc_opts + feature_files).flatten
           end
-          args << feature_files
-          args.flatten!
-          args.compact!
           ruby(args.join(" ")) # ruby(*args) is broken on Windows
         end
       end
 
 
       def feature_files # :nodoc:
-        if ENV['STORY']
-          FileList[ ENV['STORY'] ]
+        if ENV['FEATURE']
+          FileList[ ENV['FEATURE'] ]
         else
           result = []
           result += feature_list.to_a if feature_list