watir 1.6.5 → 1.6.6.rc1

data/lib/watir/page-container.rb

@@ -1,108 +1,117 @@
-module Watir    
-  # A PageContainer contains an HTML Document. In other words, it is a 
-  # what JavaScript calls a Window.
-  module PageContainer
-    include Watir::Exception
-
-    # This method checks the currently displayed page for http errors, 404, 500 etc
-    # It gets called internally by the wait method, so a user does not need to call it explicitly
-
-    def check_for_http_error
-      # check for IE7
-      n = self.document.invoke('parentWindow').navigator.appVersion
-      m=/MSIE\s(.*?);/.match( n )
-      if m and m[1] =='7.0'
-        if m = /HTTP (\d\d\d.*)/.match( self.title )
-          raise NavigationException, m[1]
-        end
-      else
-        # assume its IE6
-        url = self.document.location.href
-        if /shdoclc.dll/.match(url)
-          m = /id=IEText.*?>(.*?)</i.match(self.html)
-          raise NavigationException, m[1] if m
-        end
-      end
-      false
-    end 
-    
-    # The HTML Page
-    def page
-      document.documentelement
-    end
-    private :page
-        
-    # The HTML of the current page
-    def html
-      page.outerhtml
-    end
-    
-    # The url of the page object. 
-    def url
-      page.document.location.href
-    end
-    
-    # The text of the current page
-    def text
-      page.innertext.strip
-    end
-
-    def eval_in_spawned_process(command)
-      command.strip!
-      load_path_code = _code_that_copies_readonly_array($LOAD_PATH, '$LOAD_PATH')
-      ruby_code = "require 'watir/ie'; "
-#      ruby_code = "$HIDE_IE = #{$HIDE_IE};" # This prevents attaching to a window from setting it visible. However modal dialogs cannot be attached to when not visible.
-      ruby_code << "pc = #{attach_command}; " # pc = page container
-      # IDEA: consider changing this to not use instance_eval (it makes the code hard to understand)
-      ruby_code << "pc.instance_eval(#{command.inspect})"
-      exec_string = "start rubyw -e #{(load_path_code + '; ' + ruby_code).inspect}"
-      system(exec_string)
-    end
-    
-    def set_container container
-      @container = container
-      @page_container = self
-    end
-    
-    # This method is used to display the available html frames that Internet Explorer currently has loaded.
-    # This method is usually only used for debugging test scripts.
-    def show_frames
-      if allFrames = document.frames
-        count = allFrames.length
-        puts "there are #{count} frames"
-        for i in 0..count-1 do
-          begin
-            fname = allFrames.item(i).name.to_s
-            puts "frame  index: #{i + 1} name: #{fname}"
-          rescue => e
-            if e.to_s.match(/Access is denied/)
-              puts "frame  index: #{i + 1} Access Denied, see http://wiki.openqa.org/display/WTR/FAQ#access-denied" 
-            end
-          end
-        end
-      else
-        puts "no frames"
-      end
-    end
-
-    # Search the current page for specified text or regexp.
-    # Returns the index if the specified text was found.
-    # Returns matchdata object if the specified regexp was found.
-    # 
-    # *Deprecated* 
-    # Instead use 
-    #   IE#text.include? target 
-    # or
-    #   IE#text.match target
-    def contains_text(target)
-        if target.kind_of? Regexp
-          self.text.match(target)
-        elsif target.kind_of? String
-          self.text.index(target)
-        else
-          raise ArgumentError, "Argument #{target} should be a string or regexp."
-        end
-    end
-
-  end # module
+module Watir
+  # A PageContainer contains an HTML Document. In other words, it is a
+  # what JavaScript calls a Window.
+  module PageContainer
+    include Watir::Exception
+
+    # This method checks the currently displayed page for http errors, 404, 500 etc
+    # It gets called internally by the wait method, so a user does not need to call it explicitly
+
+    def check_for_http_error
+      # check for IE7
+      n = self.document.invoke('parentWindow').navigator.appVersion
+      m=/MSIE\s(.*?);/.match( n )
+      if m and m[1] =='7.0'
+        if m = /HTTP (\d\d\d.*)/.match( self.title )
+          raise NavigationException, m[1]
+        end
+      else
+        # assume its IE6
+        url = self.document.location.href
+        if /shdoclc.dll/.match(url)
+          m = /id=IEText.*?>(.*?)</i.match(self.html)
+          raise NavigationException, m[1] if m
+        end
+      end
+      false
+    end
+
+    # The HTML Page
+    def page
+      document.documentelement
+    end
+
+    private :page
+
+    # The HTML of the current page
+    def html
+      page.outerhtml
+    end
+
+    # The url of the page object.
+    def url
+      page.document.location.href
+    end
+
+    # The text of the current page
+    def text
+      page.innertext.strip
+    end
+
+    def click_no_wait(element)
+      ruby_code = "require 'rubygems';" <<
+              "require '#{File.expand_path(File.dirname(__FILE__))}/core';" <<
+              "#{element}.click!"
+      system(spawned_click_no_wait_command(ruby_code))
+    end
+
+    def spawned_click_no_wait_command(command)
+      unless $DEBUG
+        "start rubyw -e #{command.inspect}"
+      else
+        puts "#click_no_wait command:"
+        command = "ruby -e #{command.inspect}"
+        puts command
+        command
+      end
+    end
+
+    private :spawned_click_no_wait_command
+
+    def set_container container
+      @container = container
+      @page_container = self
+    end
+
+    # This method is used to display the available html frames that Internet Explorer currently has loaded.
+    # This method is usually only used for debugging test scripts.
+    def show_frames
+      if allFrames = document.frames
+        count = allFrames.length
+        puts "there are #{count} frames"
+        for i in 0..count-1 do
+          begin
+            fname = allFrames.item(i).name.to_s
+            puts "frame  index: #{i + 1} name: #{fname}"
+          rescue => e
+            if e.to_s.match(/Access is denied/)
+              puts "frame  index: #{i + 1} Access Denied, see http://wiki.openqa.org/display/WTR/FAQ#access-denied"
+            end
+          end
+        end
+      else
+        puts "no frames"
+      end
+    end
+
+    # Search the current page for specified text or regexp.
+    # Returns the index if the specified text was found.
+    # Returns matchdata object if the specified regexp was found.
+    #
+    # *Deprecated*
+    # Instead use
+    #   IE#text.include? target
+    # or
+    #   IE#text.match target
+    def contains_text(target)
+      if target.kind_of? Regexp
+        self.text.match(target)
+      elsif target.kind_of? String
+        self.text.index(target)
+      else
+        raise ArgumentError, "Argument #{target} should be a string or regexp."
+      end
+    end
+
+  end # module
 end

data/lib/watir/popup.rb

@@ -1,30 +1,30 @@
-module Watir
-  # POPUP object
-  class PopUp
-    def initialize(container)
-      @container = container
-      @page_container = container.page_container
-    end
-    
-    def button(caption)
-      return JSButton.new(@container.getIE.hwnd, caption)
-    end
-  end
-  
-  class JSButton
-    def initialize(hWnd, caption)
-      @hWnd = hWnd
-      @caption = caption
-    end
-    
-    def startClicker(waitTime=3)
-      clicker = WinClicker.new
-      clicker.clickJSDialog_Thread
-      # clickerThread = Thread.new(@caption) {
-      #   sleep waitTime
-      #   puts "After the wait time in startClicker"
-      #   clickWindowsButton_hwnd(hwnd, buttonCaption)
-      #}
-    end
-  end
+module Watir
+  # POPUP object
+  class PopUp
+    def initialize(container)
+      @container = container
+      @page_container = container.page_container
+    end
+    
+    def button(caption)
+      return JSButton.new(@container.getIE.hwnd, caption)
+    end
+  end
+  
+  class JSButton
+    def initialize(hWnd, caption)
+      @hWnd = hWnd
+      @caption = caption
+    end
+    
+    def startClicker(waitTime=3)
+      clicker = WinClicker.new
+      clicker.clickJSDialog_Thread
+      # clickerThread = Thread.new(@caption) {
+      #   sleep waitTime
+      #   puts "After the wait time in startClicker"
+      #   clickWindowsButton_hwnd(hwnd, buttonCaption)
+      #}
+    end
+  end
 end

data/lib/watir/process.rb

@@ -1,20 +1,20 @@
-module Watir
-  module Process
-    
-    # Returns the number of windows processes running with the specified name.
-    def self.count name
-      mgmt = WIN32OLE.connect('winmgmts:\\\\.')
-      processes = mgmt.InstancesOf('win32_process')
-      processes.extend Enumerable
-      processes.select{|x| x.name == name}.length
-    end
-    
-  end
-  
-  class IE
-    # Returns the number of IEXPLORE processes currently running.
-    def self.process_count
-      Watir::Process.count 'iexplore.exe'
-    end    
-  end
+module Watir
+  module Process
+    
+    # Returns the number of windows processes running with the specified name.
+    def self.count name
+      mgmt = WIN32OLE.connect('winmgmts:\\\\.')
+      processes = mgmt.InstancesOf('win32_process')
+      processes.extend Enumerable
+      processes.select{|x| x.name == name}.length
+    end
+    
+  end
+  
+  class IE
+    # Returns the number of IEXPLORE processes currently running.
+    def self.process_count
+      Watir::Process.count 'iexplore.exe'
+    end    
+  end
 end

data/lib/watir/screen_capture.rb

@@ -1,115 +1,115 @@
-
-require 'Win32API'
-
-module Watir
-  module ScreenCapture
-    
-    KEYEVENTF_KEYUP = 0x2
-    SW_HIDE         = 0
-    SW_SHOW         = 5
-    SW_SHOWNORMAL   = 1
-    VK_CONTROL      = 0x11
-    VK_F4           = 0x73
-    VK_MENU         = 0x12
-    VK_RETURN       = 0x0D
-    VK_SHIFT        = 0x10
-    VK_SNAPSHOT     = 0x2C
-    VK_TAB      = 0x09
-    GMEM_MOVEABLE = 0x0002
-    CF_TEXT = 1
-
-    # this method saves the current window or whole screen as either a bitmap or a jpeg
-    # It uses paint to save the file, so will barf if a duplicate filename is selected, or  the path doesnt exist etc
-    #    * filename        - string  -  the name of the file to save. If its not fully qualified the current directory is used
-    #    * active_window   - boolean - if true, the whole screen is captured, if false,  just the active window is captured
-    #    * save_as_bmp     - boolean - if true saves the file as a bitmap, saves it as a jpeg otherwise
-    def screen_capture(filename , active_window_only=false, save_as_bmp=false)
-
-
-      keybd_event = Win32API.new("user32", "keybd_event", ['I','I','L','L'], 'V')
-      vkKeyScan = Win32API.new("user32", "VkKeyScan", ['I'], 'I')
-      winExec = Win32API.new("kernel32", "WinExec", ['P','L'], 'L')
-      openClipboard = Win32API.new('user32', 'OpenClipboard', ['L'], 'I')
-      setClipboardData = Win32API.new('user32', 'SetClipboardData', ['I', 'I'], 'I')
-      closeClipboard = Win32API.new('user32', 'CloseClipboard', [], 'I')
-      globalAlloc = Win32API.new('kernel32', 'GlobalAlloc', ['I', 'I'], 'I')
-      globalLock = Win32API.new('kernel32', 'GlobalLock', ['I'], 'I')
-      globalUnlock = Win32API.new('kernel32', 'GlobalUnlock', ['I'], 'I')
-      memcpy = Win32API.new('msvcrt', 'memcpy', ['I', 'P', 'I'], 'I')
-
-     
-      filename = Dir.getwd.tr('/','\\') + '\\' + filename unless filename.index('\\')
-
-      if active_window_only ==false
-          keybd_event.Call(VK_SNAPSHOT,0,0,0)   # Print Screen
-      else
-          keybd_event.Call(VK_SNAPSHOT,1,0,0)   # Alt+Print Screen
-      end 
-
-      winExec.Call('mspaint.exe', SW_SHOW)
-      sleep(1)
-     
-      # Ctrl + V  : Paste
-      keybd_event.Call(VK_CONTROL, 1, 0, 0)
-      keybd_event.Call(vkKeyScan.Call(?V), 1, 0, 0)
-      keybd_event.Call(vkKeyScan.Call(?V), 1, KEYEVENTF_KEYUP, 0)
-      keybd_event.Call(VK_CONTROL, 1, KEYEVENTF_KEYUP, 0)
-
-
-      # Alt F + A : Save As
-      keybd_event.Call(VK_MENU, 1, 0, 0)
-      keybd_event.Call(vkKeyScan.Call(?F), 1, 0, 0)
-      keybd_event.Call(vkKeyScan.Call(?F), 1, KEYEVENTF_KEYUP, 0)
-      keybd_event.Call(VK_MENU, 1, KEYEVENTF_KEYUP, 0)
-      keybd_event.Call(vkKeyScan.Call(?A), 1, 0, 0)
-      keybd_event.Call(vkKeyScan.Call(?A), 1, KEYEVENTF_KEYUP, 0)
-      sleep(1)
-
-      # copy filename to clipboard
-      hmem = globalAlloc.Call(GMEM_MOVEABLE, filename.length+1)
-      mem = globalLock.Call(hmem)
-      memcpy.Call(mem, filename, filename.length+1)
-      globalUnlock.Call(hmem)
-      openClipboard.Call(0)
-      setClipboardData.Call(CF_TEXT, hmem) 
-      closeClipboard.Call 
-      sleep(1)
-      
-      # Ctrl + V  : Paste
-      keybd_event.Call(VK_CONTROL, 1, 0, 0)
-      keybd_event.Call(vkKeyScan.Call(?V), 1, 0, 0)
-      keybd_event.Call(vkKeyScan.Call(?V), 1, KEYEVENTF_KEYUP, 0)
-      keybd_event.Call(VK_CONTROL, 1, KEYEVENTF_KEYUP, 0)
-
-      if save_as_bmp == false
-        # goto the combo box
-        keybd_event.Call(VK_TAB, 1, 0, 0)
-        keybd_event.Call(VK_TAB, 1, KEYEVENTF_KEYUP, 0)
-        sleep(0.5)
-
-        # select the first entry with J
-        keybd_event.Call(vkKeyScan.Call(?J), 1, 0, 0)
-        keybd_event.Call(vkKeyScan.Call(?J), 1, KEYEVENTF_KEYUP, 0)
-        sleep(0.5)
-      end  
-
-      # Enter key
-      keybd_event.Call(VK_RETURN, 1, 0, 0)
-      keybd_event.Call(VK_RETURN, 1, KEYEVENTF_KEYUP, 0)
-      sleep(1)
-     
-      # Alt + F4 : Exit
-      keybd_event.Call(VK_MENU, 1, 0, 0)
-      keybd_event.Call(VK_F4, 1, 0, 0)
-      keybd_event.Call(VK_F4, 1, KEYEVENTF_KEYUP, 0)
-      keybd_event.Call(VK_MENU, 1, KEYEVENTF_KEYUP, 0)
-      sleep(1) 
-
-    end
-  end
-
-end
-
-
-#screenCapture( "f.bmp", false , true)
-
+
+require 'Win32API'
+
+module Watir
+  module ScreenCapture
+    
+    KEYEVENTF_KEYUP = 0x2
+    SW_HIDE         = 0
+    SW_SHOW         = 5
+    SW_SHOWNORMAL   = 1
+    VK_CONTROL      = 0x11
+    VK_F4           = 0x73
+    VK_MENU         = 0x12
+    VK_RETURN       = 0x0D
+    VK_SHIFT        = 0x10
+    VK_SNAPSHOT     = 0x2C
+    VK_TAB      = 0x09
+    GMEM_MOVEABLE = 0x0002
+    CF_TEXT = 1
+
+    # this method saves the current window or whole screen as either a bitmap or a jpeg
+    # It uses paint to save the file, so will barf if a duplicate filename is selected, or  the path doesnt exist etc
+    #    * filename        - string  -  the name of the file to save. If its not fully qualified the current directory is used
+    #    * active_window   - boolean - if true, the whole screen is captured, if false,  just the active window is captured
+    #    * save_as_bmp     - boolean - if true saves the file as a bitmap, saves it as a jpeg otherwise
+    def screen_capture(filename , active_window_only=false, save_as_bmp=false)
+
+
+      keybd_event = Win32API.new("user32", "keybd_event", ['I','I','L','L'], 'V')
+      vkKeyScan = Win32API.new("user32", "VkKeyScan", ['I'], 'I')
+      winExec = Win32API.new("kernel32", "WinExec", ['P','L'], 'L')
+      openClipboard = Win32API.new('user32', 'OpenClipboard', ['L'], 'I')
+      setClipboardData = Win32API.new('user32', 'SetClipboardData', ['I', 'I'], 'I')
+      closeClipboard = Win32API.new('user32', 'CloseClipboard', [], 'I')
+      globalAlloc = Win32API.new('kernel32', 'GlobalAlloc', ['I', 'I'], 'I')
+      globalLock = Win32API.new('kernel32', 'GlobalLock', ['I'], 'I')
+      globalUnlock = Win32API.new('kernel32', 'GlobalUnlock', ['I'], 'I')
+      memcpy = Win32API.new('msvcrt', 'memcpy', ['I', 'P', 'I'], 'I')
+
+     
+      filename = Dir.getwd.tr('/','\\') + '\\' + filename unless filename.index('\\')
+
+      if active_window_only ==false
+          keybd_event.Call(VK_SNAPSHOT,0,0,0)   # Print Screen
+      else
+          keybd_event.Call(VK_SNAPSHOT,1,0,0)   # Alt+Print Screen
+      end 
+
+      winExec.Call('mspaint.exe', SW_SHOW)
+      sleep(1)
+     
+      # Ctrl + V  : Paste
+      keybd_event.Call(VK_CONTROL, 1, 0, 0)
+      keybd_event.Call(vkKeyScan.Call(?V), 1, 0, 0)
+      keybd_event.Call(vkKeyScan.Call(?V), 1, KEYEVENTF_KEYUP, 0)
+      keybd_event.Call(VK_CONTROL, 1, KEYEVENTF_KEYUP, 0)
+
+
+      # Alt F + A : Save As
+      keybd_event.Call(VK_MENU, 1, 0, 0)
+      keybd_event.Call(vkKeyScan.Call(?F), 1, 0, 0)
+      keybd_event.Call(vkKeyScan.Call(?F), 1, KEYEVENTF_KEYUP, 0)
+      keybd_event.Call(VK_MENU, 1, KEYEVENTF_KEYUP, 0)
+      keybd_event.Call(vkKeyScan.Call(?A), 1, 0, 0)
+      keybd_event.Call(vkKeyScan.Call(?A), 1, KEYEVENTF_KEYUP, 0)
+      sleep(1)
+
+      # copy filename to clipboard
+      hmem = globalAlloc.Call(GMEM_MOVEABLE, filename.length+1)
+      mem = globalLock.Call(hmem)
+      memcpy.Call(mem, filename, filename.length+1)
+      globalUnlock.Call(hmem)
+      openClipboard.Call(0)
+      setClipboardData.Call(CF_TEXT, hmem) 
+      closeClipboard.Call 
+      sleep(1)
+      
+      # Ctrl + V  : Paste
+      keybd_event.Call(VK_CONTROL, 1, 0, 0)
+      keybd_event.Call(vkKeyScan.Call(?V), 1, 0, 0)
+      keybd_event.Call(vkKeyScan.Call(?V), 1, KEYEVENTF_KEYUP, 0)
+      keybd_event.Call(VK_CONTROL, 1, KEYEVENTF_KEYUP, 0)
+
+      if save_as_bmp == false
+        # goto the combo box
+        keybd_event.Call(VK_TAB, 1, 0, 0)
+        keybd_event.Call(VK_TAB, 1, KEYEVENTF_KEYUP, 0)
+        sleep(0.5)
+
+        # select the first entry with J
+        keybd_event.Call(vkKeyScan.Call(?J), 1, 0, 0)
+        keybd_event.Call(vkKeyScan.Call(?J), 1, KEYEVENTF_KEYUP, 0)
+        sleep(0.5)
+      end  
+
+      # Enter key
+      keybd_event.Call(VK_RETURN, 1, 0, 0)
+      keybd_event.Call(VK_RETURN, 1, KEYEVENTF_KEYUP, 0)
+      sleep(1)
+     
+      # Alt + F4 : Exit
+      keybd_event.Call(VK_MENU, 1, 0, 0)
+      keybd_event.Call(VK_F4, 1, 0, 0)
+      keybd_event.Call(VK_F4, 1, KEYEVENTF_KEYUP, 0)
+      keybd_event.Call(VK_MENU, 1, KEYEVENTF_KEYUP, 0)
+      sleep(1) 
+
+    end
+  end
+
+end
+
+
+#screenCapture( "f.bmp", false , true)
+