<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>lib/generators/cucumber/templates/cucumber.yml</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -2,11 +2,26 @@ h1. merb_cucumber
 
 Merb + Cucumber integration with Webrat support.
 
+h2. Migrating to merb_cucumber 0.5.0
+
+merb_cucumber 0.5.0 now requires cucumber 0.1.13, which introduces some breaking changes. If you were already using
+merb_cucumber, you'll need to do the following:
+
+* Change the last line of bin/cucumber to be:
+
+  Cucumber::CLI.execute []
+
+* Add a cucumber.yml to your Merb.root with the following contents:
+
+  default: --format pretty features
+
+If you experience any problems, please contact me (david) on github.
+
 h2. Requirements
 
-* merb-core &gt;=  1.0
-* cucumber  &gt;= 0.1.9
-* webrat    &gt;= 0.3.1 (Optional)
+* merb-core &gt;= 1.0.6.1
+* cucumber  &gt;= 0.1.13
+* webrat    &gt;= 0.3.2 (Optional)
 
 h2. First Time
 
@@ -30,4 +45,4 @@ h2. Notes
 
 * When you are implementing the steps of an scenario, please use the new request test helper, if you try to use the
   dispatch_to method, it won't work as expected.
-* Webrat methods other than 'visits' are now singular only.
\ No newline at end of file
+* Webrat methods other than 'visits' are now singular only.</diff>
      <filename>README.textile</filename>
    </modified>
    <modified>
      <diff>@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = &quot;merb_cucumber&quot;
-GEM_VERSION = &quot;0.4.1&quot;
+GEM_VERSION = &quot;0.5.0&quot;
 AUTHOR = [&quot;Roman Gonzalez&quot;, &quot;David Leal&quot;]
 EMAIL = [&quot;romanandreg@gmail.com&quot;, &quot;dgleal@gmail.com&quot;]
 HOMEPAGE = &quot;http://github.com/david/merb_cucumber&quot;
@@ -23,8 +23,8 @@ spec = Gem::Specification.new do |s|
   s.authors = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb-core', '~&gt; 1.0')
-  s.add_dependency('cucumber', '&gt;= 0.1.9')
+  s.add_dependency('merb-core', '~&gt; 1.0.6.1')
+  s.add_dependency('cucumber', '&gt;= 0.1.13')
   s.require_path = 'lib'
   s.files = %w(LICENSE README.textile Rakefile TODO Generators) + Dir.glob(&quot;{lib,spec}/**/*&quot;)
 end</diff>
      <filename>Rakefile</filename>
    </modified>
    <modified>
      <diff>@@ -27,6 +27,7 @@ module Merb::Generators
     end
     
     template(:cucumber, :after =&gt; :chmod) { |t| t.source = t.destination = &quot;bin/cucumber&quot; }
+    template(:cucumber_yml) { |t| t.source = t.destination = &quot;cucumber.yml&quot; }
     
     def chmod(action)
       File.chmod(0755, action.destination)</diff>
      <filename>lib/generators/cucumber.rb</filename>
    </modified>
    <modified>
      <diff>@@ -12,4 +12,4 @@ if File.directory?(gems_dir = File.join(Dir.pwd, 'gems')) ||
 end
 
 require 'cucumber/cli'
-Cucumber::CLI.execute
+Cucumber::CLI.execute []</diff>
      <filename>lib/generators/cucumber/templates/bin/cucumber</filename>
    </modified>
    <modified>
      <diff>@@ -2,12 +2,18 @@ Feature: Login
   To ensure the safety of the application
   A regular user of the system
   Must authenticate before using the app
-
-  Scenario: Failed Login
+ 
+  Scenario Outline: Failed Login
     Given I am not authenticated
     When I go to /login
-    And I fill in &quot;login&quot; with &quot;i_dont_exist&quot;
-    And I fill in &quot;password&quot; with &quot;and_i_dont_have_a_password&quot;
+    And I fill in &quot;login&quot; with &quot;&lt;mail&gt;&quot;
+    And I fill in &quot;password&quot; with &quot;&lt;password&gt;&quot;
     And I press &quot;Log In&quot;
     Then the login request should fail
     Then I should see an error message
+  
+    Examples:
+      | mail           | password       |
+      | not_an_address | nil            |
+      | not@not        | 123455         |
+      | 123@abc.com    | wrong_paasword |</diff>
      <filename>lib/generators/cucumber/templates/features/authentication/login.feature</filename>
    </modified>
    <modified>
      <diff>@@ -19,5 +19,9 @@ require &quot;merb_cucumber/helpers/activerecord&quot;
 # Uncomment if you want transactional fixtures
 # Merb::Test::World::Base.use_transactional_fixtures
 
+# Quick fix for post features running Rspec error, see 
+# http://gist.github.com/37930
+def Spec.run? ; true; end
+
 Merb.start_environment(:testing =&gt; true, :adapter =&gt; 'runner', :environment =&gt; ENV['MERB_ENV'] || 'test')
   </diff>
      <filename>lib/generators/cucumber/templates/features/support/env.rb</filename>
    </modified>
    <modified>
      <diff>@@ -2,7 +2,6 @@ require 'cucumber/rake/task'
 
 cucumber_options = proc do |t|
   t.binary        = Merb.root / 'bin' / 'cucumber'
-  t.cucumber_opts = &quot;--format pretty&quot;
 end
 
 Cucumber::Rake::Task.new(:features, &amp;cucumber_options)</diff>
      <filename>lib/generators/cucumber/templates/lib/tasks/cucumber.rake</filename>
    </modified>
    <modified>
      <diff>@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{merb_cucumber}
-  s.version = &quot;0.4.1&quot;
+  s.version = &quot;0.5.0&quot;
 
   s.required_rubygems_version = Gem::Requirement.new(&quot;&gt;= 0&quot;) if s.respond_to? :required_rubygems_version=
   s.authors = [&quot;Roman Gonzalez&quot;, &quot;David Leal&quot;]
-  s.date = %q{2008-12-17}
+  s.date = %q{2008-12-21}
   s.description = %q{Cucumber integration for Merb}
   s.email = [&quot;romanandreg@gmail.com&quot;, &quot;dgleal@gmail.com&quot;]
   s.extra_rdoc_files = [&quot;README.textile&quot;, &quot;LICENSE&quot;, &quot;TODO&quot;]
-  s.files = [&quot;LICENSE&quot;, &quot;README.textile&quot;, &quot;Rakefile&quot;, &quot;TODO&quot;, &quot;Generators&quot;, &quot;lib/merb_cucumber.rb&quot;, &quot;lib/generators&quot;, &quot;lib/generators/cucumber&quot;, &quot;lib/generators/cucumber/templates&quot;, &quot;lib/generators/cucumber/templates/features&quot;, &quot;lib/generators/cucumber/templates/features/support&quot;, &quot;lib/generators/cucumber/templates/features/support/env.rb&quot;, &quot;lib/generators/cucumber/templates/features/steps&quot;, &quot;lib/generators/cucumber/templates/features/steps/webrat_steps.rb&quot;, &quot;lib/generators/cucumber/templates/features/steps/result_steps.rb&quot;, &quot;lib/generators/cucumber/templates/features/steps/login_steps.rb&quot;, &quot;lib/generators/cucumber/templates/features/login.feature&quot;, &quot;lib/generators/cucumber/templates/autotest&quot;, &quot;lib/generators/cucumber/templates/autotest/cucumber_merb_rspec.rb&quot;, &quot;lib/generators/cucumber/templates/bin&quot;, &quot;lib/generators/cucumber/templates/bin/cucumber&quot;, &quot;lib/generators/cucumber/templates/lib&quot;, &quot;lib/generators/cucumber/templates/lib/tasks&quot;, &quot;lib/generators/cucumber/templates/lib/tasks/cucumber.rake&quot;, &quot;lib/generators/feature&quot;, &quot;lib/generators/feature/templates&quot;, &quot;lib/generators/feature/templates/feature_steps.rb&quot;, &quot;lib/generators/feature/templates/feature.rbt&quot;, &quot;lib/generators/cucumber.rb&quot;, &quot;lib/generators/feature.rb&quot;, &quot;lib/merb_cucumber&quot;, &quot;lib/merb_cucumber/world&quot;, &quot;lib/merb_cucumber/world/base.rb&quot;, &quot;lib/merb_cucumber/world/simple.rb&quot;, &quot;lib/merb_cucumber/world/webrat.rb&quot;, &quot;lib/merb_cucumber/helpers&quot;, &quot;lib/merb_cucumber/helpers/activerecord.rb&quot;, &quot;lib/merb_cucumber/helpers/datamapper.rb&quot;, &quot;spec/spec_helper.rb&quot;, &quot;spec/cucumber_setup_generator_spec.rb&quot;, &quot;spec/feature_generator_spec.rb&quot;]
+  s.files = [&quot;LICENSE&quot;, &quot;README.textile&quot;, &quot;Rakefile&quot;, &quot;TODO&quot;, &quot;Generators&quot;, &quot;lib/merb_cucumber.rb&quot;, &quot;lib/generators&quot;, &quot;lib/generators/cucumber&quot;, &quot;lib/generators/cucumber/templates&quot;, &quot;lib/generators/cucumber/templates/features&quot;, &quot;lib/generators/cucumber/templates/features/support&quot;, &quot;lib/generators/cucumber/templates/features/support/env.rb&quot;, &quot;lib/generators/cucumber/templates/features/authentication&quot;, &quot;lib/generators/cucumber/templates/features/authentication/steps&quot;, &quot;lib/generators/cucumber/templates/features/authentication/steps/login_steps.rb&quot;, &quot;lib/generators/cucumber/templates/features/authentication/login.feature&quot;, &quot;lib/generators/cucumber/templates/features/steps&quot;, &quot;lib/generators/cucumber/templates/features/steps/webrat_steps.rb&quot;, &quot;lib/generators/cucumber/templates/features/steps/result_steps.rb&quot;, &quot;lib/generators/cucumber/templates/autotest&quot;, &quot;lib/generators/cucumber/templates/autotest/cucumber_merb_rspec.rb&quot;, &quot;lib/generators/cucumber/templates/cucumber.yml&quot;, &quot;lib/generators/cucumber/templates/bin&quot;, &quot;lib/generators/cucumber/templates/bin/cucumber&quot;, &quot;lib/generators/cucumber/templates/lib&quot;, &quot;lib/generators/cucumber/templates/lib/tasks&quot;, &quot;lib/generators/cucumber/templates/lib/tasks/cucumber.rake&quot;, &quot;lib/generators/feature&quot;, &quot;lib/generators/feature/templates&quot;, &quot;lib/generators/feature/templates/feature_steps.rb&quot;, &quot;lib/generators/feature/templates/feature.rbt&quot;, &quot;lib/generators/cucumber.rb&quot;, &quot;lib/generators/feature.rb&quot;, &quot;lib/merb_cucumber&quot;, &quot;lib/merb_cucumber/world&quot;, &quot;lib/merb_cucumber/world/base.rb&quot;, &quot;lib/merb_cucumber/world/simple.rb&quot;, &quot;lib/merb_cucumber/world/webrat.rb&quot;, &quot;lib/merb_cucumber/helpers&quot;, &quot;lib/merb_cucumber/helpers/activerecord.rb&quot;, &quot;lib/merb_cucumber/helpers/datamapper.rb&quot;, &quot;spec/spec_helper.rb&quot;, &quot;spec/cucumber_setup_generator_spec.rb&quot;, &quot;spec/feature_generator_spec.rb&quot;]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/david/merb_cucumber}
   s.require_paths = [&quot;lib&quot;]
@@ -23,14 +23,14 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) &gt;= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q&lt;merb-core&gt;, [&quot;~&gt; 1.0&quot;])
-      s.add_runtime_dependency(%q&lt;cucumber&gt;, [&quot;&gt;= 0.1.9&quot;])
+      s.add_runtime_dependency(%q&lt;merb-core&gt;, [&quot;~&gt; 1.0.6.1&quot;])
+      s.add_runtime_dependency(%q&lt;cucumber&gt;, [&quot;&gt;= 0.1.13&quot;])
     else
-      s.add_dependency(%q&lt;merb-core&gt;, [&quot;~&gt; 1.0&quot;])
-      s.add_dependency(%q&lt;cucumber&gt;, [&quot;&gt;= 0.1.9&quot;])
+      s.add_dependency(%q&lt;merb-core&gt;, [&quot;~&gt; 1.0.6.1&quot;])
+      s.add_dependency(%q&lt;cucumber&gt;, [&quot;&gt;= 0.1.13&quot;])
     end
   else
-    s.add_dependency(%q&lt;merb-core&gt;, [&quot;~&gt; 1.0&quot;])
-    s.add_dependency(%q&lt;cucumber&gt;, [&quot;&gt;= 0.1.9&quot;])
+    s.add_dependency(%q&lt;merb-core&gt;, [&quot;~&gt; 1.0.6.1&quot;])
+    s.add_dependency(%q&lt;cucumber&gt;, [&quot;&gt;= 0.1.13&quot;])
   end
 end</diff>
      <filename>merb_cucumber.gemspec</filename>
    </modified>
    <modified>
      <diff>@@ -7,6 +7,10 @@ describe &quot;common files generator&quot;, :shared =&gt; true do
     @generator.should create('/tmp/features/support/env.rb')
   end
 
+  it &quot;should generate the cucumber.yml file&quot; do
+    @generator.should create('/tmp/cucumber.yml')
+  end
+
   it &quot;should generate the bin/cucumber file&quot; do
     @generator.should create('/tmp/bin/cucumber')
   end</diff>
      <filename>spec/cucumber_setup_generator_spec.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>7d495457ea64d041594efe8d14e63e413d88cf1c</id>
    </parent>
  </parents>
  <author>
    <name>David Leal</name>
    <email>dgleal@gmail.com</email>
  </author>
  <url>http://github.com/david/merb_cucumber/commit/c025e98b2825d3336ff506555dc11e9e722c7ac9</url>
  <id>c025e98b2825d3336ff506555dc11e9e722c7ac9</id>
  <committed-date>2008-12-21T03:27:31-08:00</committed-date>
  <authored-date>2008-12-21T03:27:31-08:00</authored-date>
  <message>Added cucumber 0.1.13 support. Thanks to Ng Tze Yang (ngty).</message>
  <tree>2df2ce7e7715e7aea26439f560e6c2a67efcec71</tree>
  <committer>
    <name>David Leal</name>
    <email>dgleal@gmail.com</email>
  </committer>
</commit>
