akephalos2 2.0.8.1-java → 2.0.9-java

data/lib/akephalos/capybara.rb

@@ -256,6 +256,7 @@ class Capybara::Driver::Akephalos < Capybara::Driver::Base
   # Reset session
   def reset!
     cookies.clear
+    browser.close_all_windows()
     browser.visit('about:blank')
   end
 

data/lib/akephalos/client.rb

@@ -89,11 +89,7 @@ else
       # @param [String] url the URL to load
       # @return [Page] the loaded page
       def visit(url)
-        begin
-          client.getPage(url)
-        rescue Exception => e
-          raise e unless e.message == 'java.lang.NullPointerException: null'
-        end
+        client.getPage(url)
         page
       end
 
@@ -175,6 +171,10 @@ else
         yield if block_given?
         return handler.text
       end
+      
+      def close_all_windows()
+        @client.closeAllWindows()
+      end
 
       private
 

data/lib/akephalos/node.rb

@@ -164,13 +164,8 @@ module Akephalos
     # Click the node and then wait for any triggered JavaScript callbacks to
     # fire.
     def click
-      begin
-        @_node.click
-        @_node.getPage.getEnclosingWindow.getJobManager.waitForJobs(1000)
-        @_node.getPage.getEnclosingWindow.getJobManager.waitForJobsStartingBefore(1000)
-      rescue Exception => e
-        raise e unless e.message == 'java.lang.NullPointerException: null'
-      end
+      @_node.click
+      @_node.getPage.getWebClient.waitForBackgroundJavaScriptStartingBefore(3000)
     end
 
     # Search for child nodes which match the given XPath selector.

data/lib/akephalos/version.rb

@@ -1,3 +1,3 @@
 module Akephalos #:nodoc
-  VERSION = "2.0.8.1"
+  VERSION = "2.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: akephalos2
 version: !ruby/object:Gem::Version
-  version: 2.0.8.1
+  version: 2.0.9
   prerelease: 
 platform: java
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-18 00:00:00.000000000 Z
+date: 2011-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70348427096640 !ruby/object:Gem::Requirement
+  requirement: &70214150648720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348427096640
+  version_requirements: *70214150648720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70348427094340 !ruby/object:Gem::Requirement
+  requirement: &70214150646380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348427094340
+  version_requirements: *70214150646380
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70348427107300 !ruby/object:Gem::Requirement
+  requirement: &70214150660220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348427107300
+  version_requirements: *70214150660220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70348427104760 !ruby/object:Gem::Requirement
+  requirement: &70214150657080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348427104760
+  version_requirements: *70214150657080
 description: Headless Browser for Integration Testing with Capybara
 email: bj.schaefer@gmail.com
 executables: