langalex-culerity 0.2.2 → 0.2.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 2
-:patch: 2
 :major: 0
+:minor: 2
+:patch: 3

data/culerity.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{culerity}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Lang"]
-  s.date = %q{2009-08-16}
+  s.date = %q{2009-09-08}
   s.description = %q{Culerity integrates Cucumber and Celerity in order to test your application's full stack.}
   s.email = %q{alex@upstream-berlin.com}
   s.extra_rdoc_files = [
@@ -21,8 +21,10 @@ Gem::Specification.new do |s|
      "culerity.gemspec",
      "features/fixtures/sample_feature",
      "features/installing_culerity.feature",
+     "features/running_cucumber_without_explicitly_running_external_services.feature",
      "features/step_definitions/common_steps.rb",
      "features/step_definitions/culerity_setup_steps.rb",
+     "features/step_definitions/jruby_steps.rb",
      "features/step_definitions/rails_setup_steps.rb",
      "features/support/common.rb",
      "features/support/env.rb",
@@ -49,7 +51,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/langalex/culerity}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Culerity integrates Cucumber and Celerity in order to test your application's full stack.}
   s.test_files = [
     "spec/celerity_server_spec.rb",

data/features/installing_culerity.feature

@@ -12,7 +12,6 @@ Feature: Installing culerity
     When I run executable "script/generate" with arguments "culerity"
     And I setup load path to local code
   
-
   Scenario: Install culerity and setup jruby environment
     Given I have jruby installed
     When I invoke task "rake culerity:install"
@@ -39,6 +38,7 @@ Feature: Installing culerity
     And I run executable "cucumber" with arguments "features/"
     Then I should see "1 scenario"
     And I should see "5 steps (5 passed)"
+    And I should not see "WARNING: Speed up executing by running 'rake culerity:rails:start'"
 
   
   

data/features/running_cucumber_without_explicitly_running_external_services.feature

@@ -0,0 +1,24 @@
+Feature: Running cucumber without explicitly running external services
+  In order to reduce learning cost of using culerity
+  As a rails developer
+  I want the headless browser and rails processes to launch and shutdown automatically
+
+  Background:
+    Given a Rails app
+    And I run executable "script/generate" with arguments "cucumber"
+    And I delete file "features/step_definitions/webrat_steps.rb"
+    And I copy the project generators into "vendor/generators"
+    And I invoke task "rake db:migrate"
+    When I run executable "script/generate" with arguments "culerity"
+    And I setup load path to local code
+  
+  Scenario: Successfully run scenarios without requiring celerity or rails processes running
+    When I add a feature file to test Rails index.html default file
+    And I run executable "cucumber" with arguments "features/"
+    Then file "tmp/culerity_rails_server.pid" is not created
+    And I should see "1 scenario"
+    And I should see "5 steps (5 passed)"
+    And I should see "WARNING: Speed up execution by running 'rake culerity:rails:start'"
+  
+  
+  

data/features/step_definitions/common_steps.rb

@@ -110,6 +110,10 @@ Then /^I should see "([^\"]*)"$/ do |text|
   actual_output.should contain(text)
 end
 
+Then /^I should not see "([^\"]*)"$/ do |text|
+  actual_output = File.read(@stdout)
+  actual_output.should_not contain(text)
+end
 
 Then /^I should see$/ do |text|
   actual_output = File.read(@stdout)

data/features/step_definitions/jruby_steps.rb

@@ -0,0 +1,11 @@
+Given /^I have jruby installed$/ do
+  @jruby_cmd = `which jruby`.strip
+  raise "Need to setup @jruby_cmd to test jruby environment" if @jruby_cmd.blank?
+end
+
+Then /^the gem "([^\"]*)" is installed into jruby environment$/ do |gem_name|
+  raise "Need to setup @jruby_cmd to test jruby environment" if @jruby_cmd.blank?
+  gem_list = `#{@jruby_cmd} -S gem list #{gem_name}`
+  gem_list.should =~ /#{gem_name}/
+end
+

data/features/step_definitions/rails_setup_steps.rb

@@ -19,18 +19,8 @@ When /^I add a feature file to test Rails index.html default file$/ do
   end
 end
 
-Given /^I run the rails server in environment "([^\"]*)"$/ do |environment|
-  in_project_folder do
-    $rails_server ||= IO.popen("script/server -e #{environment} -p 3001", 'r+')
-    File.open("tmp/culerity_rails_server.pid", "w") { |file| file << $rails_server.pid; file.flush }
-  end
-end
-
 After do
   in_project_folder do
     Given 'I invoke task "rake culerity:rails:stop"'
   end
 end
-
-# rake culerity:rails:start [RAILS=culerity_development]
-# rake culerity:rails:stop

data/lib/culerity.rb

@@ -6,7 +6,7 @@ module Culerity
   module ServerCommands
     def exit_server
       self << '["_exit_"]'
-      close
+      Process.kill(6, self.pid.to_i)
     end
 
     def close_browsers
@@ -32,6 +32,15 @@ module Culerity
     # open named pipes to communicate with celerity_server + return them
   end
   
+  def self.run_rails
+    unless File.exists?("tmp/culerity_rails_server.pid")
+      puts "WARNING: Speed up execution by running 'rake culerity:rails:start'"
+      port        = 3001
+      environment = 'culerity_development'
+      puts "Launched rails on :#{port}..."
+      return IO.popen("script/server -e #{environment} -p #{port}", 'r+')
+    end
+  end
 end
 
 if __FILE__ == $0

data/rails_generators/culerity/templates/features/step_definitions/common_celerity_steps.rb

@@ -1,6 +1,8 @@
 require 'culerity'
 
 Before do
+  $rails_server ||= Culerity::run_rails
+  sleep 5
   $server ||= Culerity::run_server
   $browser = Culerity::RemoteBrowserProxy.new $server, {:browser => :firefox}
   @host = 'http://localhost:3001'
@@ -8,7 +10,8 @@ end
 
 at_exit do
   $browser.exit if $browser
-  $server.close if $server
+  $server.exit_server if $server
+  Process.kill(6, $rails_server.pid.to_i) if $rails_server
 end
 
 When /I press "(.*)"/ do |button|
@@ -84,4 +87,4 @@ def assert_successful_response
     `open -a /Applications/Safari.app #{tmp.path}`
     raise "Brower returned Response Code #{$browser.page.web_response.status_code}"
   end
-end
+end

data/rails_generators/culerity/templates/lib/tasks/culerity.rake

@@ -2,13 +2,14 @@ namespace 'culerity' do
   namespace 'rails' do
     desc "Starts a rails server for cucumber/culerity tests"
     task :start => :environment do
+      port = ENV['PORT'] || 3001
       environment = 'culerity_development'
       pid_file = RAILS_ROOT + "/tmp/culerity_rails_server.pid"
       if File.exists?(pid_file)
         puts "culerity rails server already running; if not, delete tmp/culerity_rails_server.pid and try again"
         exit 1
       end
-      rails_server = IO.popen("script/server -e #{environment} -p 3001", 'r+')
+      rails_server = IO.popen("script/server -e #{environment} -p #{port}", 'r+')
       File.open(pid_file, "w") { |file| file << rails_server.pid }
     end
 
@@ -23,12 +24,15 @@ namespace 'culerity' do
         puts "No culerity rails server running. Doing nothing."
       end
     end
+
+    desc "Restarts the rails server for cucumber/culerity tests"
+    task :restart => [:stop, :start]
   end
   
   desc "Install required gems into jruby"
   task :install => :environment do
-    jgem_cmd = `which jgem`.strip
+    jgem_cmd = `which jruby`.strip
     raise "ERROR: You need to install jruby to use culerity and celerity." if jgem_cmd.blank?
-    sh "#{jgem_cmd} install jarib-celerity --source=http://gems.github.com"
+    sh "#{jgem_cmd} -S gem install jarib-celerity --source=http://gems.github.com"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: langalex-culerity
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Alexander Lang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-16 00:00:00 -07:00
+date: 2009-09-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,8 +49,10 @@ files:
 - culerity.gemspec
 - features/fixtures/sample_feature
 - features/installing_culerity.feature
+- features/running_cucumber_without_explicitly_running_external_services.feature
 - features/step_definitions/common_steps.rb
 - features/step_definitions/culerity_setup_steps.rb
+- features/step_definitions/jruby_steps.rb
 - features/step_definitions/rails_setup_steps.rb
 - features/support/common.rb
 - features/support/env.rb