culerity 0.2.9 → 0.2.10

data/CHANGES.md

@@ -1,3 +1,6 @@
+## 0.2.10
+* another speed improvement by only clearing cookies instead of closing browsers after each scenario (dewind)
+
 ## 0.2.9
 * fixed memory leaks within the java process by clearing proxies (dewind)
 * fixed syntax error when sending multiline lambdas (endor, langalex)

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
-:build: 
 :minor: 2
-:patch: 9
+:patch: 10
+:build: 

data/bin/run_celerity_server.rb

@@ -0,0 +1,4 @@
+#!/usr/bin/env jruby
+require File.dirname(__FILE__) << '/../lib/culerity/celerity_server'
+Culerity::CelerityServer.new(STDIN, STDOUT)
+

data/culerity.gemspec

@@ -5,13 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{culerity}
-  s.version = "0.2.9"
+  s.version = "0.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Lang"]
-  s.date = %q{2010-02-19}
+  s.date = %q{2010-04-28}
+  s.default_executable = %q{run_celerity_server.rb}
   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.executables = ["run_celerity_server.rb"]
   s.extra_rdoc_files = [
     "README.md"
   ]
@@ -22,6 +24,7 @@ Gem::Specification.new do |s|
      "README.md",
      "Rakefile",
      "VERSION.yml",
+     "bin/run_celerity_server.rb",
      "culerity.gemspec",
      "features/fixtures/jquery",
      "features/fixtures/sample_feature",
@@ -61,7 +64,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.5}
+  s.rubygems_version = %q{1.3.6}
   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/step_definitions/rails_setup_steps.rb

@@ -16,6 +16,7 @@ Given /^culerity is installed as a plugin$/ do
   `cp -rf #{File.dirname(__FILE__) + "/../../lib"} #{File.join(@active_project_folder, plugin_folder)}`
   `cp -rf #{File.dirname(__FILE__) + "/../../rails"} #{File.join(@active_project_folder, plugin_folder)}`
   `cp -rf #{File.dirname(__FILE__) + "/../../init.rb"} #{File.join(@active_project_folder, plugin_folder)}`
+  `cp -rf #{File.dirname(__FILE__) + "/../../bin"} #{File.join(@active_project_folder, plugin_folder)}`
 end
 
 When /^I add a feature file to test Rails index.html default file$/ do

data/lib/culerity.rb

@@ -18,10 +18,14 @@ module Culerity
     def close_browsers
       self.puts '["_close_browsers_"]'
     end
+    
+    def clear_proxies
+      self.puts '["_clear_proxies_"]'      
+    end
   end
 
   def self.run_server
-    IO.popen("jruby #{__FILE__}", 'r+').extend(ServerCommands)
+    IO.popen(File.dirname(__FILE__) + "/../bin/run_celerity_server.rb", 'r+').extend(ServerCommands)
   end
   
   def self.run_rails(options = {})
@@ -42,9 +46,3 @@ module Culerity
     end
   end
 end
-
-if __FILE__ == $0
-  require File.dirname(__FILE__) + '/culerity/celerity_server'
-  Culerity::CelerityServer.new STDIN, STDOUT
-end
-

data/lib/culerity/celerity_server.rb

@@ -13,6 +13,8 @@ module Culerity
         call, block = eval _in.gets.to_s.strip
         return if call == "_exit_"
         next(close_browsers) if call == "_close_browsers_"
+        next(clear_proxies) if call == "_clear_proxies_"
+        
         unless call.nil?
           begin
             result = target(call.first).send call[1], *call[2..-1], &block
@@ -28,6 +30,10 @@ module Culerity
     
     private
     
+    def clear_proxies
+      @proxies = {}
+    end
+    
     def configure_browser(options)
       @browser_options = options
     end

data/lib/culerity/persistent_delivery.rb

@@ -31,5 +31,5 @@ module Culerity
   end
 end
 
-ActionMailer::Base.send :include, Culerity::PersistentDelivery
+ActionMailer::Base.send :include, Culerity::PersistentDelivery if defined?(ActionMailer)
 

data/lib/culerity/remote_object_proxy.rb

@@ -62,8 +62,8 @@ module Culerity
     # Returns a string in the format "lambda { … }"
     #
     def block_to_string &block
-      result = block.call.to_s
-      unless result.is_a?(String) && result[/^lambda \s* \{ .*? \}/xm]
+      result = block.call.to_s.strip
+      unless result.is_a?(String) && result[/^lambda\s*(\{|do).+(\}|end)/xm]
         result = "lambda { #{result} }"
       end
       result.gsub("\n", ";")

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

@@ -1,21 +1,28 @@
 require 'culerity'
 
 Before do
-  $rails_server ||= Culerity::run_rails(:environment => 'culerity', :port => 3001)
+  $rails_server_pid ||= Culerity::run_rails(:environment => 'culerity', :port => 3001)
   $server ||= Culerity::run_server
-  $browser = Culerity::RemoteBrowserProxy.new $server, {:browser => :firefox3,
-    :javascript_exceptions => true,
-    :resynchronize => true,
-    :status_code_exceptions => true
-  }
-  $browser.log_level = :warning
+  unless $browser
+    $browser = Culerity::RemoteBrowserProxy.new $server, {:browser => :firefox3,
+      :javascript_exceptions => true,
+      :resynchronize => true,
+      :status_code_exceptions => true
+    }
+    $browser.log_level = :warning
+  end
   @host = 'http://localhost:3001'
 end
 
+After do
+  $server.clear_proxies
+  $browser.clear_cookies
+end
+
 at_exit do
   $browser.exit if $browser
   $server.close if $server
-  Process.kill(6, $rails_server.pid.to_i) if $rails_server
+  Process.kill(6, $rails_server_pid) if $rails_server_pid
 end
 
 Given /^(?:|I )am on (.+)$/ do |page_name|

data/spec/remote_object_proxy_spec.rb

@@ -13,6 +13,18 @@ describe Culerity::RemoteObjectProxy do
       block = lambda { "lambda { \ntrue\n}" }
       proxy.send(:block_to_string, &block).should == "lambda { ;true;}"
     end
+
+    it "should accept do end in lambda string instead of {}" do
+      code = <<-CODE
+        lambda do |page, message|
+          true
+        end
+      CODE
+      
+      proxy = Culerity::RemoteObjectProxy.new nil, nil
+      block = lambda { code }
+      proxy.send(:block_to_string, &block).should == "lambda do |page, message|;          true;        end"
+    end
     
     it "should return lambda string when block result isn't a lambda string" do
       proxy = Culerity::RemoteObjectProxy.new nil, nil

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: culerity
 version: !ruby/object:Gem::Version 
-  version: 0.2.9
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 10
+  version: 0.2.10
 platform: ruby
 authors: 
 - Alexander Lang
@@ -9,33 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-19 00:00:00 +01:00
-default_executable: 
+date: 2010-04-28 00:00:00 +02:00
+default_executable: run_celerity_server.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 description: Culerity integrates Cucumber and Celerity in order to test your application's full stack.
 email: alex@upstream-berlin.com
-executables: []
-
+executables: 
+- run_celerity_server.rb
 extensions: []
 
 extra_rdoc_files: 
@@ -47,6 +56,7 @@ files:
 - README.md
 - Rakefile
 - VERSION.yml
+- bin/run_celerity_server.rb
 - culerity.gemspec
 - features/fixtures/jquery
 - features/fixtures/sample_feature
@@ -95,18 +105,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Culerity integrates Cucumber and Celerity in order to test your application's full stack.