watir 1.6.5 → 1.6.6.rc1

data/lib/watir/contrib/enabled_popup.rb

@@ -1,21 +1,21 @@
-# http://www.vbcity.com/forums/topic.asp?tid=108859
-require 'watir/ie'
-module Watir
-  module PageContainer
-    include Win32
-    def enabled_popup(timeout=4)
-      # Use handle of our parent window to see if we have any currently
-      # enabled popup.
-      hwnd_modal = 0
-      Waiter.wait_until(timeout) do
-        hwnd_modal, arr = GetWindow.call(hwnd, GW_ENABLEDPOPUP)
-        hwnd_modal > 0
-      end
-      # use hwnd() method to find the IE or Container hwnd (overriden by IE)
-      if hwnd_modal == hwnd() || 0 == hwnd_modal
-        hwnd_modal = nil
-      end
-      hwnd_modal
-    end
-  end
+# http://www.vbcity.com/forums/topic.asp?tid=108859
+require 'watir/ie'
+module Watir
+  module PageContainer
+    include Win32
+    def enabled_popup(timeout=4)
+      # Use handle of our parent window to see if we have any currently
+      # enabled popup.
+      hwnd_modal = 0
+      Waiter.wait_until(timeout) do
+        hwnd_modal, arr = GetWindow.call(hwnd, GW_ENABLEDPOPUP)
+        hwnd_modal > 0
+      end
+      # use hwnd() method to find the IE or Container hwnd (overriden by IE)
+      if hwnd_modal == hwnd() || 0 == hwnd_modal
+        hwnd_modal = nil
+      end
+      hwnd_modal
+    end
+  end
 end

data/lib/watir/contrib/ie-new-process.rb

@@ -1,27 +1,27 @@
-# based on http://svn.instiki.org/instiki/trunk/test/watir/e2e.rb
-# and http://rubyforge.org/pipermail/wtr-general/2005-November/004108.html
-
-require 'watir/ie-process'
-
-class IEProcess < Watir::IE::Process 
-  def stop
-    right_to_terminate_process = 1
-    handle = Win32API.new('kernel32.dll', 'OpenProcess', 'lil', 'l').
-    call(right_to_terminate_process, 0, @process_id)
-    Win32API.new('kernel32.dll', 'TerminateProcess', 'll', 'l').call(handle, 0)
-  end
-  
-end
-
-module Watir
-  class IE
-    def process_id
-      @process_id ||= IEProcess.process_id_from_hwnd @ie.hwnd
-    end
-    attr_writer :process_id
-    def kill
-      iep = IEProcess.new process_id
-      iep.stop
-    end
-  end
-end
+# based on http://svn.instiki.org/instiki/trunk/test/watir/e2e.rb
+# and http://rubyforge.org/pipermail/wtr-general/2005-November/004108.html
+
+require 'watir/ie-process'
+
+class IEProcess < Watir::IE::Process 
+  def stop
+    right_to_terminate_process = 1
+    handle = Win32API.new('kernel32.dll', 'OpenProcess', 'lil', 'l').
+    call(right_to_terminate_process, 0, @process_id)
+    Win32API.new('kernel32.dll', 'TerminateProcess', 'll', 'l').call(handle, 0)
+  end
+  
+end
+
+module Watir
+  class IE
+    def process_id
+      @process_id ||= IEProcess.process_id_from_hwnd @ie.hwnd
+    end
+    attr_writer :process_id
+    def kill
+      iep = IEProcess.new process_id
+      iep.stop
+    end
+  end
+end

data/lib/watir/contrib/page_checker.rb

@@ -1,29 +1,29 @@
-#  This module includes checkers which are run on every page load
-# 
-#  In order to use this module, add a require to one of your test scripts: 
-#  require 'watir/contrib/page_checker' 
-#  To add checkers, call the ie.add_checker method
-#
-#  ie.add_checker(PageCheckers::NAVIGATION_CHECKER)
-#
-#  Checkers are Ruby proc objects which are called within Watir::IE and passed 
-#  the current instance of ie. 
-
-module PageCheckers        
-
-	# This checker iterates through  the current document including any frames
-	# and checks for http errors, 404, 500 etc
-	NAVIGATION_CHECKER = lambda do |ie|
-		if ie.document.frames.length > 1
-			1.upto ie.document.frames.length do |i|
-				begin
-					ie.frame(:index, i).check_for_http_error
-				rescue Watir::Exception::UnknownFrameException
-					# frame can be already destroyed
-				end          
-			end
-		else
-			ie.check_for_http_error
-		end
-	end
-end
+#  This module includes checkers which are run on every page load
+# 
+#  In order to use this module, add a require to one of your test scripts: 
+#  require 'watir/contrib/page_checker' 
+#  To add checkers, call the ie.add_checker method
+#
+#  ie.add_checker(PageCheckers::NAVIGATION_CHECKER)
+#
+#  Checkers are Ruby proc objects which are called within Watir::IE and passed 
+#  the current instance of ie. 
+
+module PageCheckers        
+
+	# This checker iterates through  the current document including any frames
+	# and checks for http errors, 404, 500 etc
+	NAVIGATION_CHECKER = lambda do |ie|
+		if ie.document.frames.length > 1
+			1.upto ie.document.frames.length do |i|
+				begin
+					ie.frame(:index, i).check_for_http_error
+				rescue Watir::Exception::UnknownFrameException
+					# frame can be already destroyed
+				end          
+			end
+		else
+			ie.check_for_http_error
+		end
+	end
+end

data/lib/watir/cookiemanager.rb

@@ -1,56 +1,56 @@
-# should be moved to watir/contrib
-# use of modules here is ugly
-
-require 'find'
-module Watir
-  module CookieManager 
-
-    class Dir
-        def Dir.visit(dir = '.', files_first = false, &block)
-            if files_first
-                paths = []
-                Find.find(dir) { |path| paths << path }
-                paths.reverse_each {|path| yield path}
-            else
-                Find.find(dir, &block)
-            end
-        end
-        # simulates unix rm -rf command
-        def Dir.rm_rf(dir)
-            Dir.visit(dir, true) do |path|
-                if FileTest.directory?(path)
-                    begin
-                        Dir.unlink(path)
-                    rescue # Security Exception for Content.IE
-                    end
-                else
-                    begin
-                        File.unlink(path)
-                    rescue #Security exception index.dat etc.
-                    end
-                end
-            end
-        end
-    end
-
-    class WatirHelper
-        #taken from shlObj.h  used in win32 SHGetSpecialFolderLocation
-        #define CSIDL_INTERNET_CACHE            0x0020
-        #define CSIDL_COOKIES                   0x0021
-        #define CSIDL_HISTORY                   0x0022
-        COOKIES = 0x0021
-        INTERNET_CACHE = 0x0020
-        
-        def  WatirHelper.getSpecialFolderLocation(specFolderName)
-            shell = WIN32OLE.new('Shell.Application')
-            folder = shell.Namespace(specFolderName)
-            folderItem = folder.Self
-            folderPath = folderItem.Path
-        end
-        def  WatirHelper.deleteSpecialFolderContents(specFolderName)
-            Dir.rm_rf(self.getSpecialFolderLocation(specFolderName))
-        end
-        
-    end
-  end  
+# should be moved to watir/contrib
+# use of modules here is ugly
+
+require 'find'
+module Watir
+  module CookieManager 
+
+    class Dir
+        def Dir.visit(dir = '.', files_first = false, &block)
+            if files_first
+                paths = []
+                Find.find(dir) { |path| paths << path }
+                paths.reverse_each {|path| yield path}
+            else
+                Find.find(dir, &block)
+            end
+        end
+        # simulates unix rm -rf command
+        def Dir.rm_rf(dir)
+            Dir.visit(dir, true) do |path|
+                if FileTest.directory?(path)
+                    begin
+                        Dir.unlink(path)
+                    rescue # Security Exception for Content.IE
+                    end
+                else
+                    begin
+                        File.unlink(path)
+                    rescue #Security exception index.dat etc.
+                    end
+                end
+            end
+        end
+    end
+
+    class WatirHelper
+        #taken from shlObj.h  used in win32 SHGetSpecialFolderLocation
+        #define CSIDL_INTERNET_CACHE            0x0020
+        #define CSIDL_COOKIES                   0x0021
+        #define CSIDL_HISTORY                   0x0022
+        COOKIES = 0x0021
+        INTERNET_CACHE = 0x0020
+        
+        def  WatirHelper.getSpecialFolderLocation(specFolderName)
+            shell = WIN32OLE.new('Shell.Application')
+            folder = shell.Namespace(specFolderName)
+            folderItem = folder.Self
+            folderPath = folderItem.Path
+        end
+        def  WatirHelper.deleteSpecialFolderContents(specFolderName)
+            Dir.rm_rf(self.getSpecialFolderLocation(specFolderName))
+        end
+        
+    end
+  end  
 end

data/lib/watir/core.rb

@@ -0,0 +1,28 @@
+# these require statements are needed for Watir
+# to work with minimum functionality
+#
+# this is needed for #click_no_wait to perform faster
+require 'watir/win32ole'
+
+require 'logger'
+require 'watir/exceptions'
+require 'watir/matches'
+
+require 'watir/core_ext'
+require 'watir/logger'
+require 'watir/container'
+require 'watir/locator'
+require 'watir/page-container'
+require 'watir/ie-class'
+require 'watir/element'
+require 'watir/element_collections'
+require 'watir/form'
+require 'watir/non_control_elements'
+require 'watir/input_elements'
+require 'watir/table'
+require 'watir/image'
+require 'watir/link'
+require 'watir/html_element'
+
+require 'watir/waiter'
+require 'watir/module'

data/lib/watir/core_ext.rb

@@ -1,18 +1,18 @@
-class String
-  
-  #
-  # "Watir::Span" => "Span"
-  # 
-  
-  def demodulize
-    gsub(/^.*::/, '')
-  end
-  
-  #
-  # "FooBar" => "foo_bar"
-  # 
-  
-  def underscore
-    gsub(/\B[A-Z][^A-Z]/, '_\&').downcase.gsub(' ', '_')
-  end
+class String
+  
+  #
+  # "Watir::Span" => "Span"
+  # 
+  
+  def demodulize
+    gsub(/^.*::/, '')
+  end
+  
+  #
+  # "FooBar" => "foo_bar"
+  # 
+  
+  def underscore
+    gsub(/\B[A-Z][^A-Z]/, '_\&').downcase.gsub(' ', '_')
+  end
 end

data/lib/watir/datahandler.rb

@@ -1,107 +1,107 @@
-require 'watir/win32ole'
-
-class String
-
-	def pred
-		self[0..-2] << (self[-1]-1).chr
-	end
-
-end
-
-class DataHandler
-
-	# This allows you to put data in a csv file or an xls file and access it in your scripts for
-	# a data driven approach.
-	# 
-	# You can supply a file with extension csv or xls and it will just work
-	#
-	# e.g.
-	# require 'datahandler'
-	# d = DataHandler.new("data.csv")
-	# loginId = d.data[0].LoginId		--> line 1 of the csv file and column LoginId
-	# pin = d.data[0].Pin				--> line 1 of the cvs file and column Pin
-	#
-	# b = Datahandler.new("data.xls")
-	# loginId = b.data[0].LoginId                   --> line 1 of workbook 1 of the xls file with column LoginId
-	#
-	# Remember that line 1 of the data is referenced by using 0 - and this excludes the header line.
-	#
-	def initialize(datafile)
-		
-		# if the data files are in the same dir as the one you execute from this works
-		directory = `dir`
-		directory.match(/Directory of(.+)$/)
-		working_directory = $1.to_s.gsub(/\\/,"/").gsub(/^\s/,"")
-		file = "#{working_directory.chomp}\\#{datafile}"
-		
-		# otherwise it will take the location you specify
-		if File.exists?(file)
-			@datafile = file
-		else
-			@datafile = datafile
-		end
-		
-		@excel = WIN32OLE::new('excel.Application')
-		@workbook = @excel.Workbooks.Open(@datafile)
-		@worksheet = @workbook.Worksheets(1)
-		@excel['Visible'] = false
-		
-	end
-	
-	def csv_data
-		csv_data = File.readlines(@datafile)
-		header = csv_data[0].split(",")
-		header.each{|z| z.chomp!}
-		data = Struct.new("Data", *header)
-		csv_data.shift
-		data_array = []
-		csv_data.each do |line|
-			line.each{|z| line.chomp!}
-			data_array << data.new(*line.split(","))
-		end
-	return data_array
-	end
-	
-	def number_columns
-		column = last_column = "a"
-		while @worksheet.Range("a1:#{column}1")['Value']
-			if !@worksheet.Range("#{column}1")['Value']
-				last_column = column.pred
-				break
-			end
-			column.succ!
-		end
-	last_column
-	end
-		
-	def xls_data
-		line = "1"
-		data = []
-			while @worksheet.Range("a#{line}")['Value']
-			   data << @worksheet.Range("a#{line}:#{number_columns}#{line}")['Value']
-			   line.succ!
-			end
-		
-		header = data[0].flatten
-		dataObject = Struct.new("DataObject", *header)
-		data.shift
-		data_array = []
-		data.each do |line|
-			data_array << dataObject.new(*line.flatten)
-		end
-	@excel.Quit
-	@excel = nil
-	GC.start
-	data_array
-	end
-	
-	def data
-		extension = @datafile.split(".")[-1]
-		if extension == "xls"
-			xls_data
-		elsif extension == "csv"
-			csv_data
-		end
-	end
-	
-end
+require 'watir/win32ole'
+
+class String
+
+	def pred
+		self[0..-2] << (self[-1]-1).chr
+	end
+
+end
+
+class DataHandler
+
+	# This allows you to put data in a csv file or an xls file and access it in your scripts for
+	# a data driven approach.
+	# 
+	# You can supply a file with extension csv or xls and it will just work
+	#
+	# e.g.
+	# require 'datahandler'
+	# d = DataHandler.new("data.csv")
+	# loginId = d.data[0].LoginId		--> line 1 of the csv file and column LoginId
+	# pin = d.data[0].Pin				--> line 1 of the cvs file and column Pin
+	#
+	# b = Datahandler.new("data.xls")
+	# loginId = b.data[0].LoginId                   --> line 1 of workbook 1 of the xls file with column LoginId
+	#
+	# Remember that line 1 of the data is referenced by using 0 - and this excludes the header line.
+	#
+	def initialize(datafile)
+		
+		# if the data files are in the same dir as the one you execute from this works
+		directory = `dir`
+		directory.match(/Directory of(.+)$/)
+		working_directory = $1.to_s.gsub(/\\/,"/").gsub(/^\s/,"")
+		file = "#{working_directory.chomp}\\#{datafile}"
+		
+		# otherwise it will take the location you specify
+		if File.exists?(file)
+			@datafile = file
+		else
+			@datafile = datafile
+		end
+		
+		@excel = WIN32OLE::new('excel.Application')
+		@workbook = @excel.Workbooks.Open(@datafile)
+		@worksheet = @workbook.Worksheets(1)
+		@excel['Visible'] = false
+		
+	end
+	
+	def csv_data
+		csv_data = File.readlines(@datafile)
+		header = csv_data[0].split(",")
+		header.each{|z| z.chomp!}
+		data = Struct.new("Data", *header)
+		csv_data.shift
+		data_array = []
+		csv_data.each do |line|
+			line.each{|z| line.chomp!}
+			data_array << data.new(*line.split(","))
+		end
+	return data_array
+	end
+	
+	def number_columns
+		column = last_column = "a"
+		while @worksheet.Range("a1:#{column}1")['Value']
+			if !@worksheet.Range("#{column}1")['Value']
+				last_column = column.pred
+				break
+			end
+			column.succ!
+		end
+	last_column
+	end
+		
+	def xls_data
+		line = "1"
+		data = []
+			while @worksheet.Range("a#{line}")['Value']
+			   data << @worksheet.Range("a#{line}:#{number_columns}#{line}")['Value']
+			   line.succ!
+			end
+		
+		header = data[0].flatten
+		dataObject = Struct.new("DataObject", *header)
+		data.shift
+		data_array = []
+		data.each do |line|
+			data_array << dataObject.new(*line.flatten)
+		end
+	@excel.Quit
+	@excel = nil
+	GC.start
+	data_array
+	end
+	
+	def data
+		extension = @datafile.split(".")[-1]
+		if extension == "xls"
+			xls_data
+		elsif extension == "csv"
+			csv_data
+		end
+	end
+	
+end