vapir-ie 1.9.0 → 1.10.0

data/lib/vapir-ie/element.rb

@@ -168,10 +168,10 @@ module Vapir
     # Options:
     # - :wait => true or false. If true, waits for the javascript call to return, and calls the #wait method. 
     #   If false, does not wait for the javascript to return and does not call #wait.
-    #   Default is true.
+    #   Default is the current config.wait value (which is by default true).
     # - :highlight => true or false. Highlights the element while clicking if true. Default is true. 
     def click(options={})
-      options={:wait => true, :highlight => true}.merge(options)
+      options={:wait => config.wait, :highlight => true}.merge(options)
       result=nil
       with_highlight(options) do
         assert_enabled if respond_to?(:assert_enabled)
@@ -226,7 +226,7 @@ module Vapir
     # Takes options:
     # - :highlight => true or false. Highlights the element while clicking if true. Default is true. 
     def click_no_wait(options={})
-      click(options.merge(:wait => false))
+      with_config(:wait => false) { click(options) }
     end
 
     # Executes a user defined "fireEvent" for objects with JavaScript events tied to them such as DHTML menus.
@@ -239,7 +239,7 @@ module Vapir
         event_type = "on"+event_type
       end
       
-      options={:highlight => true, :wait => true}.merge(options)
+      options={:highlight => true, :wait => config.wait}.merge(options)
       with_highlight(options) do
         assert_enabled if respond_to?(:assert_enabled)
         if options[:wait]
@@ -315,11 +315,11 @@ module Vapir
     #   raises: UnknownObjectException  if the object is not found
     #           ObjectDisabledException if the object is currently disabled
     def fire_event_no_wait(event, options={})
-      fire_event(event, options.merge(:wait => false))
+      with_config(:wait => false) { fire_event(event, options) }
     end
     
     def wait(options={})
-      @container.wait(options)
+      @container.wait(options) if config.wait
     end
 
     def self.element_object_style(element_object, document_object)

data/lib/vapir-ie/frame.rb

@@ -11,6 +11,7 @@ module Vapir
     # (clicking a link or whatever) tend to affect other frames too; waiting on just this frame doesn't 
     # make sense. 
     def wait(options={}) # :nodoc:
+      return unless config.wait
       if browser # prefer to wait on the browser
         browser.wait(options)
       elsif container # if we don't have the browser, wait on the container (presumably this exists) 

data/lib/vapir-ie/page_container.rb

@@ -90,6 +90,7 @@ module Vapir
     # Note: This code needs to be prepared for the ie object to be closed at 
     # any moment!
     def wait(options={})
+      return unless config.wait
       unless options.is_a?(Hash)
         raise ArgumentError, "given options should be a Hash, not #{options.inspect} (#{options.class})\nold conflicting arguments of no_sleep or last_url are gone"
       end

data/lib/vapir-ie/version.rb

@@ -1,5 +1,5 @@
 module Vapir
   class IE
-    VERSION = '1.9.0'
+    VERSION = '1.10.0'
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: vapir-ie
 version: !ruby/object:Gem::Version 
-  hash: 51
   prerelease: false
   segments: 
   - 1
-  - 9
+  - 10
   - 0
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors: 
 - Ethan
@@ -15,34 +14,30 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-04 00:00:00 -04:00
+date: 2011-09-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: vapir-common
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 51
         segments: 
         - 1
-        - 9
+        - 10
         - 0
-        version: 1.9.0
+        version: 1.10.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: win32-process
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 0
         - 5
@@ -53,11 +48,9 @@ dependencies:
   name: nokogiri
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 4
@@ -69,11 +62,9 @@ dependencies:
   name: ffi
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         - 5
@@ -81,7 +72,6 @@ dependencies:
         version: 0.5.4
     - - <
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 2
         - 0
@@ -93,11 +83,9 @@ dependencies:
   name: winwindow
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 0
         - 4
@@ -162,20 +150,16 @@ 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"
@@ -183,7 +167,7 @@ requirements:
 - Microsoft Windows
 - Internet Explorer
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Library for automating the Internet Explorer browser in Ruby