culerity 0.2.12 → 0.2.13

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:major: 0
 :minor: 2
-:patch: 12
 :build: 
+:patch: 13
+:major: 0

data/lib/culerity/celerity_server.rb

@@ -20,7 +20,7 @@ module Culerity
             result = target(call.first).send call[1], *call[2..-1], &block
             _out << "[:return, #{proxify result}]\n"
           rescue => e
-            _out << "[:exception, \"#{e.class.name}\", #{e.message.inspect}, #{e.backtrace.inspect}]\n"
+            _out << "[:exception, \"#{e.class.name}\", #{e.message.inspect}, #{prepend_js_stack_trace(e).inspect}]\n"
           end
         end
 
@@ -77,5 +77,18 @@ module Culerity
         "Culerity::RemoteObjectProxy.new(#{result.object_id}, @io)"
       end
     end
+
+    def prepend_js_stack_trace(exception)
+      def extract_js_strack_trace(e)
+        if e.respond_to?(:getScriptStackTrace)
+          e.getScriptStackTrace
+        elsif e.respond_to?(:cause) && e.cause
+          extract_js_strack_trace e.cause
+        else
+          ""
+        end
+      end
+      extract_js_strack_trace(exception).split("\n") + exception.backtrace
+    end
   end
 end

data/lib/culerity/persistent_delivery.rb

@@ -2,10 +2,10 @@ require 'fileutils'
 
 module Culerity
   module PersistentDelivery
- 
+
     DELIVERIES_PATH =
       File.join(RAILS_ROOT, 'tmp', 'action_mailer_acceptance_deliveries.cache')
-    
+
     def self.included(base)
       base.class_eval do
         def self.deliveries
@@ -20,14 +20,13 @@ module Culerity
         end
       end
     end
- 
+
     def perform_delivery_persistent(mail)
-      deliveries << mail
-      File.open(DELIVERIES_PATH,'w') do |f| 
+      deliveries = self.class.deliveries << mail
+      File.open(DELIVERIES_PATH,'w') do |f|
         f << Marshal.dump(deliveries)
-      end 
-    end 
- 
+      end
+    end
   end
 end
 

data/lib/culerity/remote_browser_proxy.rb

@@ -13,13 +13,15 @@ module Culerity
     # +time_to_wait+ is 30 seconds by default
     # 
     # Returns true upon success
-    # Raises Timeout::Error when +time_to_wait+ is reached.
+    # Raises RuntimeError when +time_to_wait+ is reached.
     # 
     def wait_until time_to_wait=30, &block
-      Timeout.timeout(time_to_wait) do
-        until block.call
-          sleep 0.1
+      time_limit = Time.now + time_to_wait
+      until block.call 
+        if Time.now > time_limit
+          raise "wait_until timeout after #{time_to_wait} seconds"
         end
+        sleep 0.1
       end
       true
     end
@@ -29,13 +31,15 @@ module Culerity
     # +time_to_wait+ is 30 seconds by default
     # 
     # Returns true upon success
-    # Raises Timeout::Error when +time_to_wait+ is reached.
+    # Raises RuntimeError when +time_to_wait+ is reached.
     # 
     def wait_while time_to_wait=30, &block
-      Timeout.timeout(time_to_wait) do
-        while block.call
-          sleep 0.1
+      time_limit = Time.now + time_to_wait
+      while block.call
+        if Time.now > time_limit
+          raise "wait_while timeout after #{time_to_wait} seconds"
         end
+        sleep 0.1
       end
       true
     end

data/lib/culerity/remote_object_proxy.rb

@@ -20,7 +20,11 @@ module Culerity
     def id
       send_remote(:id)
     end
-
+    
+    def inspect
+      send_remote(:inspect)
+    end
+    
     def method_missing(name, *args, &block)
       send_remote(name, *args, &block)
     end
@@ -51,7 +55,11 @@ module Culerity
       if res.first == :return
         res[1]
       elsif res.first == :exception
-        raise CulerityException.new("#{res[1]}: #{res[2]}", res[3])
+        begin
+          raise "local trace"
+        rescue => ex
+          raise CulerityException.new("#{res[1]}: #{res[2]}", res[3] + ex.backtrace)
+        end
       end
     end
 

data/spec/celerity_server_spec.rb

@@ -133,4 +133,16 @@ describe Culerity::CelerityServer do
     _out.should_receive(:<<).with(/^\[:exception, \"RuntimeError\", \"test exception with \\\"quotes\\\"\", \[.*\]\]\n$/)
     Culerity::CelerityServer.new(_in, _out)
   end
+  
+  it "should extract a js stack trace if available and prepend it on the regular backtrace" do
+    exception = RuntimeError.new("the exception")
+    exception.stub!(:cause => stub('ex2', :cause => stub('ex3', :getScriptStackTrace => "The\nStack\nTrace")))
+    
+    @browser.stub!(:goto).and_raise(exception)
+    _in = stub 'in'
+    _in.stub!(:gets).and_return("[[\"browser0\", \"goto\", \"/homepage\"]]\n", "[\"_exit_\"]\n")
+    _out = stub 'out'
+    _out.should_receive(:<<).with(/^\[:exception, \"RuntimeError\", \"the exception\", \[\"The\", \"Stack\", \"Trace\", \".*\"\]\]\n$/)
+    Culerity::CelerityServer.new(_in, _out)
+  end
 end

data/spec/remote_browser_proxy_spec.rb

@@ -28,7 +28,7 @@ describe Culerity::RemoteBrowserProxy do
     proxy = Culerity::RemoteBrowserProxy.new @io
     lambda {
       proxy.wait_until(0.1) { false }
-    }.should raise_error(Timeout::Error)
+    }.should raise_error(RuntimeError)
   end
   
   it "should return successfully when wait_until returns true" do
@@ -40,7 +40,7 @@ describe Culerity::RemoteBrowserProxy do
     proxy = Culerity::RemoteBrowserProxy.new @io
     lambda {
       proxy.wait_while(0.1) { true }
-    }.should raise_error(Timeout::Error)
+    }.should raise_error(RuntimeError)
   end
   
   it "should return successfully when wait_while returns !true" do

data/spec/remote_object_proxy_spec.rb

@@ -41,6 +41,13 @@ describe Culerity::RemoteObjectProxy do
     proxy = Culerity::RemoteObjectProxy.new 345, io
     proxy.goto '/homepage'
   end
+
+  it "should send inspect as a serialized method call to the output" do
+    io = stub 'io', :gets => '[:return, "inspect output"]'
+    io.should_receive(:<<).with(%Q{[[345, "inspect"]]\n})
+    proxy = Culerity::RemoteObjectProxy.new 345, io
+    proxy.inspect.should == "inspect output"
+  end
   
   it "should send the serialized method call with a proc argument to the output" do
     io = stub 'io', :gets => "[:return]"
@@ -57,7 +64,7 @@ describe Culerity::RemoteObjectProxy do
     
     proxy.send_remote(:method) { "lambda { true }" }
   end
-  
+    
   it "should return the deserialized return value" do
     io = stub 'io', :gets => "[:return, :okay]\n", :<< => nil
     proxy = Culerity::RemoteObjectProxy.new 345, io
@@ -72,6 +79,20 @@ describe Culerity::RemoteObjectProxy do
     }.should raise_error(Culerity::CulerityException)
   end
   
+  it "should include the full 'local' back trace in addition to the 'remote' backtrace" do
+    io = stub 'io', :gets => %Q{[:exception, "RuntimeError", "test exception", ["Remote", "Backtrace"]]}, :<< => nil
+    proxy = Culerity::RemoteObjectProxy.new 345, io
+    begin
+      proxy.goto '/home'
+    rescue => ex
+      puts ex.backtrace
+      ex.backtrace[0].should == "Remote"
+      ex.backtrace[1].should == "Backtrace"
+      ex.backtrace.detect {|line| line =~ /lib\/culerity\/remote_object_proxy\.rb/}.should_not be_nil
+      ex.backtrace.detect {|line| line =~ /spec\/remote_object_proxy_spec\.rb/}.should_not be_nil
+    end
+  end
+  
   it "should send exit" do
     io = stub 'io', :gets => '[:return]'
     io.should_receive(:<<).with('["_exit_"]')

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: culerity
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 2
-  - 12
-  version: 0.2.12
+  - 13
+  version: 0.2.13
 platform: ruby
 authors: 
 - Alexander Lang
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-20 00:00:00 +02:00
+date: 2010-12-19 00:00:00 +01:00
 default_executable: run_celerity_server.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -50,7 +55,6 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
-- .gitignore
 - CHANGES.md
 - MIT-LICENSE
 - README.md
@@ -98,28 +102,32 @@ homepage: http://github.com/langalex/culerity
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Culerity integrates Cucumber and Celerity in order to test your application's full stack.

data/.gitignore

@@ -1,6 +0,0 @@
-coverage
-rdoc
-pkg
-tmp
-*.sw?
-*.gem