david-merb_cucumber 0.4.0 → 0.4.1

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb_cucumber"
-GEM_VERSION = "0.4.0"
+GEM_VERSION = "0.4.1"
 AUTHOR = ["Roman Gonzalez", "David Leal"]
 EMAIL = ["romanandreg@gmail.com", "dgleal@gmail.com"]
 HOMEPAGE = "http://github.com/david/merb_cucumber"

data/lib/generators/cucumber/templates/features/steps/{common_result_steps.rb → result_steps.rb}

@@ -1,9 +1,9 @@
 Then /^I should see "(.*)"$/ do |text|
-  response.body.should =~ /#{text}/m
+  response.body.to_s.should =~ /#{text}/m
 end
 
 Then /^I should not see "(.*)"$/ do |text|
-  response.body.should_not =~ /#{text}/m
+  response.body.to_s.should_not =~ /#{text}/m
 end
 
 Then /^I should see an? (\w+) message$/ do |message_type|

data/lib/generators/cucumber.rb

@@ -13,17 +13,17 @@ module Merb::Generators
     option :orm, :desc => 'Object-Relation Mapper to use (one of: none, activerecord, datamapper, sequel)'
     option :session_type, :default => :simple, :desc => 'Session type to use (one of: simple, webrat)'
     
-    template(:env) { |t| t.source = t.destination = "features/env.rb" }
+    template(:env) { |t| t.source = t.destination = "features/support/env.rb" }
     template(:rake) { |t| t.source = t.destination = "lib/tasks/cucumber.rake" }
     template(:autotest) { |t| t.source = t.destination = "autotest/cucumber_merb_rspec.rb" }
-    template(:common_result_steps) { |t| t.source = t.destination = "features/steps/common_result_steps.rb" }
+    template(:result_steps) { |t| t.source = t.destination = "features/steps/result_steps.rb" }
     
-    template(:example_feature, :session_type => :webrat) { |t|  t.source = t.destination = "features/login.feature" }
+    template(:example_feature, :session_type => :webrat) { |t|  t.source = t.destination = "features/authentication/login.feature" }
     template(:example_feature_steps, :session_type => :webrat) do |t| 
-      t.source = t.destination = "features/steps/login_steps.rb"
+      t.source = t.destination = "features/authentication/steps/login_steps.rb"
     end
-    template(:common_webrat, :session_type => :webrat) do |t| 
-      t.source = t.destination = "features/steps/common_webrat.rb"
+    template(:webrat_steps, :session_type => :webrat) do |t| 
+      t.source = t.destination = "features/steps/webrat_steps.rb"
     end
     
     template(:cucumber, :after => :chmod) { |t| t.source = t.destination = "bin/cucumber" }
@@ -35,5 +35,4 @@ module Merb::Generators
   end 
   
   add :cucumber, CucumberGenerator
-  
-end
+end

data/lib/merb_cucumber/helpers/activerecord.rb

@@ -8,21 +8,21 @@ module Merb
           def use_transactional_fixtures
             # Let's set a transaction on the ActiveRecord connection when starting a new scenario
             $main.Before do
-              if ActiveRecord::Base.connection.respond_to?(:increment_open_transactions)
-                ActiveRecord::Base.connection.increment_open_transactions
+              if ::ActiveRecord::Base.connection.respond_to?(:increment_open_transactions)
+                ::ActiveRecord::Base.connection.increment_open_transactions
               else
-                ActiveRecord::Base.send :increment_open_transactions
+                ::ActiveRecord::Base.send :increment_open_transactions
               end
-              ActiveRecord::Base.connection.begin_db_transaction
+              ::ActiveRecord::Base.connection.begin_db_transaction
             end
 
             # Going with a rollback after every step in the scenario is executed
             $main.After do
-              ActiveRecord::Base.connection.rollback_db_transaction
-              if ActiveRecord::Base.connection.respond_to?(:decrement_open_transactions)
-                ActiveRecord::Base.connection.decrement_open_transactions
+              ::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
+                ::ActiveRecord::Base.send :decrement_open_transactions
               end
             end
           end

data/spec/cucumber_setup_generator_spec.rb

@@ -1,9 +1,10 @@
 require File.dirname(__FILE__) + '/spec_helper'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'generators', 'cucumber')
 
 describe "common files generator", :shared => true do
 
-  it "should generate the features/env.rb file" do
-    @generator.should create('/tmp/features/env.rb')
+  it "should generate the features/support/env.rb file" do
+    @generator.should create('/tmp/features/support/env.rb')
   end
 
   it "should generate the bin/cucumber file" do
@@ -14,16 +15,16 @@ describe "common files generator", :shared => true do
     @generator.should create('/tmp/autotest/cucumber_merb_rspec.rb')
   end
 
-  it "should generate the features/steps/common_result_steps.rb file" do
-    @generator.should create('/tmp/features/steps/common_result_steps.rb')
+  it "should generate the features/steps/result_steps.rb file" do
+    @generator.should create('/tmp/features/steps/result_steps.rb')
   end
   
   it "should generate the lib/tasks/cucumber.rake" do
-    @generator.should create('/tmp/features/steps/common_result_steps.rb')
+    @generator.should create('/tmp/lib/tasks/cucumber.rake')
   end
   
   it "should render templates successfully" do
-    lambda { @generator.render! }.should_not raise_error
+    @generator.render!
   end
   
   
@@ -41,7 +42,6 @@ describe Merb::Generators::CucumberGenerator do
     
     it "should have a requirement to the datamapper helper" do
       @generator.render!
-      # IO.read(@generator.template(:env).destination).should =~ %r[merb_cucumber/helpers/datamapper]
     end
     
   end
@@ -56,7 +56,6 @@ describe Merb::Generators::CucumberGenerator do
     
     it "should have a requirement to the activerecord helper" do
       @generator.render!
-      # IO.read(@generator.template(:env).destination).should =~ %r[merb_cucumber/helpers/activerecord]
     end
     
   end
@@ -69,18 +68,19 @@ describe Merb::Generators::CucumberGenerator do
 
     it_should_behave_like "common files generator"
 
-    it "should not generate the features/login.feature file" do
-      @generator.should_not create('/tmp/features/login.feature')
+    it "should not generate the features/authentication/login.feature file" do
+      @generator.should_not create('/tmp/features/authentication/login.feature')
     end
 
-    it "should not generate the features/steps/common_webrat.rb file" do
-      @generator.should_not create('/tmp/features/steps/common_webrat.rb')
+    it "should not generate the features/authentication/steps/login_steps.rb file" do
+      @generator.should_not create('/tmp/features/authentication/steps/login_steps.rb')
     end
 
-    it "should have a requirement to the simple session type on the env.rb file" do
-      @generator.render!
-      # IO.read(@generator.template(:env).destination).should =~ %r[merb_cucumber/world/webrat]
+    it "should not generate the features/steps/webrat_steps.rb file" do
+      @generator.should_not create('/tmp/features/steps/webrat_steps.rb')
     end
+
+    it "should have a requirement to the simple session type on the env.rb file"
     
   end
 
@@ -92,19 +92,18 @@ describe Merb::Generators::CucumberGenerator do
 
     it_should_behave_like "common files generator"
 
-    it "should generate the features/login.feature file" do
-      @generator.should create('/tmp/features/login.feature')
+    it "should generate the features/authentication/login.feature file" do
+      @generator.should create('/tmp/features/authentication/login.feature')
     end
 
-    it "should  generate the features/steps/common_webrat.rb file" do
-      @generator.should create('/tmp/features/steps/common_webrat.rb')
+    it "should generate the features/authentication/steps/login_steps.rb file" do
+      @generator.should create('/tmp/features/authentication/steps/login_steps.rb')
     end
 
-    it "should have a requirement to the webrat session type on the env.rb file" do
-      @generator.render!
-      # IO.read(@generator.template(:env).destination).should =~ %r[merb_cucumber/world/webrat]
+    it "should generate the features/steps/webrat_steps.rb file" do
+      @generator.should create('/tmp/features/steps/webrat_steps.rb')
     end
 
+    it "should have a requirement to the webrat session type on the env.rb file"
   end
-
 end

data/spec/feature_generator_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/spec_helper'
-
+require File.join(File.dirname(__FILE__), '..', 'lib', 'generators', 'feature')
 
 def underscored_file_name(name)
   name.gsub(/\s+/, "_")
@@ -59,4 +59,4 @@ describe Merb::Generators::CucumberFeatureGenerator, "#render!" do
       @generator.should create("/tmp/features/steps/#{underscored_file_name(@name)}_steps.rb")
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,15 +1,11 @@
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
-
 require 'rubygems'
 require 'spec'
-require 'merb-core'
 require 'merb-gen'
 
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
 require 'templater/spec/helpers'
 
-__dir__ = File.dirname(__FILE__)
-require File.join(__dir__, "..", "lib", "generators", "cucumber")
-require File.join(__dir__, "..", "lib", "generators", "feature")
 Merb.disable(:initfile)
 
 Spec::Runner.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: david-merb_cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Roman Gonzalez
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-23 00:00:00 -08:00
+date: 2008-12-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,11 +54,12 @@ files:
 - lib/generators/cucumber
 - lib/generators/cucumber/templates
 - lib/generators/cucumber/templates/features
+- lib/generators/cucumber/templates/features/support
+- lib/generators/cucumber/templates/features/support/env.rb
 - lib/generators/cucumber/templates/features/steps
-- lib/generators/cucumber/templates/features/steps/common_webrat.rb
-- lib/generators/cucumber/templates/features/steps/common_result_steps.rb
+- lib/generators/cucumber/templates/features/steps/webrat_steps.rb
+- lib/generators/cucumber/templates/features/steps/result_steps.rb
 - lib/generators/cucumber/templates/features/steps/login_steps.rb
-- lib/generators/cucumber/templates/features/env.rb
 - lib/generators/cucumber/templates/features/login.feature
 - lib/generators/cucumber/templates/autotest
 - lib/generators/cucumber/templates/autotest/cucumber_merb_rspec.rb

data/lib/generators/cucumber/templates/features/login.feature

@@ -1,13 +0,0 @@
-Feature: Login
-  To ensure the safety of the application
-  A regular user of the system
-  Must authenticate before using the app
-
-  Scenario: Failed Login
-    Given I am not authenticated
-    When I go to /login
-    And I fill in "login" with "i_dont_exist"
-    And I fill in "password" with "and_i_dont_have_a_password"
-    And I press "Log In"
-    Then the login request should fail
-    Then I should see an error message

data/lib/generators/cucumber/templates/features/steps/login_steps.rb

@@ -1,3 +0,0 @@
-Given /^I am not authenticated$/ do
-  # yay!
-end