watir-classic 3.0.0 → 3.1.0

data/lib/watir-classic/IEDialog/IEDialog.h

@@ -0,0 +1,15 @@
+extern "C" _declspec(dllexport) void ShowString(LPCTSTR dialogName);
+
+extern "C" _declspec(dllexport) void DoElementClick(LPCTSTR windowName, LPCTSTR elementName);
+
+extern "C" _declspec(dllexport) void DoButtonClick(LPCTSTR windowName, LPCTSTR buttonName);
+
+extern "C" _declspec(dllexport) void GetUnknown(HWND hWindow, int* pOut);
+
+void DoClick(LPCTSTR windowName, LPCTSTR elementId, LPCTSTR elementName);
+
+BOOL CALLBACK EnumChildProc(HWND hwnd,LPARAM lParam);
+
+IHTMLDocument2* GetDoc2(LPCTSTR windowName);
+
+IHTMLElement* FindElement(IHTMLDocument2* pDoc2, LPCTSTR elementId, LPCTSTR elementName);

data/lib/watir-classic/IEDialog/IEDialog.vcproj

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="IEDialog"
+	ProjectGUID="{E555398C-B93E-4D77-ACA2-03EAA7F7E94A}"
+	RootNamespace="IEDialog"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IEDIALOG_EXPORTS"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/IEDialog.dll"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/IEDialog.pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/IEDialog.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IEDIALOG_EXPORTS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/IEDialog.dll"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/IEDialog.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath=".\IEDialog.cpp">
+			</File>
+			<File
+				RelativePath=".\stdafx.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\IEDialog.h">
+			</File>
+			<File
+				RelativePath=".\stdafx.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+		<File
+			RelativePath=".\ReadMe.txt">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

data/lib/watir-classic/IEDialog/ReadMe.txt

@@ -0,0 +1,40 @@
+========================================================================
+    DYNAMIC LINK LIBRARY : IEDialog Project Overview
+========================================================================
+
+AppWizard has created this IEDialog DLL for you.  
+This file contains a summary of what you will find in each of the files that
+make up your IEDialog application.
+
+
+IEDialog.vcproj
+    This is the main project file for VC++ projects generated using an Application Wizard. 
+    It contains information about the version of Visual C++ that generated the file, and 
+    information about the platforms, configurations, and project features selected with the
+    Application Wizard.
+
+IEDialog.cpp
+    This is the main DLL source file.
+
+	When created, this DLL does not export any symbols. As a result, it  
+	will not produce a .lib file when it is built. If you wish this project 
+	to be a project dependency of some other project, you will either need to 
+	add code to export some symbols from the DLL so that an export library 
+	will be produced, or you can set the Ignore Input Library property to Yes 
+	on the General propert page of the Linker folder in the project's Property 
+	Pages dialog box.
+
+/////////////////////////////////////////////////////////////////////////////
+Other standard files:
+
+StdAfx.h, StdAfx.cpp
+    These files are used to build a precompiled header (PCH) file
+    named IEDialog.pch and a precompiled types file named StdAfx.obj.
+
+/////////////////////////////////////////////////////////////////////////////
+Other notes:
+
+AppWizard uses "TODO:" comments to indicate parts of the source code you
+should add to or customize.
+
+/////////////////////////////////////////////////////////////////////////////

data/lib/watir-classic/IEDialog/stdafx.cpp

@@ -0,0 +1,8 @@
+// stdafx.cpp : source file that includes just the standard includes
+// IEDialog.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file

data/lib/watir-classic/IEDialog/stdafx.h

@@ -0,0 +1,21 @@
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently, but
+// are changed infrequently
+//
+
+#pragma once
+
+
+#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
+// Windows Header Files:
+#include <windows.h>
+#include <mshtml.h>
+#include <oleacc.h>
+#include <atlbase.h>
+#include <atlcom.h>
+#include <atlwin.h>
+#include <atltypes.h>
+#include <atlctl.h>
+#include <atlhost.h>
+
+// TODO: reference additional headers your program requires here

data/lib/watir-classic/browser.rb

@@ -60,7 +60,7 @@ before you invoke Browser.new.
       # Create a new instance of a browser driver, as determined by the
       # configuration settings. (Don't be fooled: this is not actually 
       # an instance of Browser class.)
-      def new
+      def new ignored=nil # argument is needed to make watir-classic more compatible with watir-webdriver
         set_sub_options
         klass.new
       end

data/lib/watir-classic/container.rb

@@ -38,11 +38,6 @@ module Watir
     end
     private :copy_test_config
     
-    # Write the specified string to the log.
-    def log(what)
-      @container.logger.debug(what) if @logger
-    end
-    
     # Wait until Browser has finished loading the page.
     #--
     # called explicitly by most click and set methods
@@ -61,6 +56,10 @@ module Watir
       ModalDialog.new(self)
     end
 
+    def alert
+      Alert.new(self)
+    end
+
     # Searching for Page Elements
     # Not for external consumption
     #
@@ -69,34 +68,6 @@ module Watir
       return document.body.all
     end
     
-    # This method shows the available objects on the current page.
-    # This is usually only used for debugging or writing new test scripts.
-    # This is a nice feature to help find out what HTML objects are on a page
-    # when developing a test case using Watir.
-    def show_all_objects
-      puts "-----------Objects in page -------------"
-      doc = document
-      s = ""
-      props = ["name", "id", "value", "alt", "src"]
-      doc.all.each do |n|
-        begin
-          s += n.invoke("type").to_s.ljust(16)
-        rescue
-          next
-        end
-        props.each do |prop|
-          begin
-            p = n.invoke(prop)
-            s += "  " + "#{prop}=#{p}".to_s.ljust(18)
-          rescue
-            # this object probably doesnt have this property
-          end
-        end
-        s += "\n"
-      end
-      puts s
-    end
-    
     # Locator Methods
     #
     # Not for external use, but cannot set to private due to usages in Element

data/lib/watir-classic/core.rb

@@ -11,8 +11,6 @@ require 'watir-classic/wait'
 require 'watir-classic/wait_helper'
 require 'watir-classic/element_extensions'
 
-require 'logger'
-require 'watir-classic/logger'
 require 'watir-classic/container'
 require 'watir-classic/xpath_locator'
 require 'watir-classic/locator'
@@ -38,6 +36,6 @@ require 'watir-classic/module'
 
 require 'rautomation'
 require 'watir-classic/dialogs/file_field'
-require 'watir-classic/dialogs/javascript'
+require 'watir-classic/dialogs/alert'
 
 require 'watir-classic/supported_elements'

data/lib/watir-classic/dialogs/alert.rb

@@ -0,0 +1,46 @@
+module Watir
+  class Alert
+    include ElementExtensions
+
+    WINDOW_TITLES = ['Message from webpage', 'Windows Internet Explorer', 'Microsoft Internet Explorer', /Mensaje de p.*/, "Explorer User Prompt"]
+
+    def initialize(container)
+      @container = container
+    end
+
+    def exists?
+      dialog.present?
+    end
+
+    alias_method :present?, :exists?
+
+    def close
+      dialog.close
+      wait_until_not_exists
+    end
+
+    def text
+      dialog.text
+    end
+
+    def ok
+      dialog.button(:value => "OK").click
+      wait_until_not_exists
+    end
+
+    def set(text)
+      dialog.text_field.set text
+    end
+
+    private 
+
+    def dialog
+      @window ||= RAutomation::Window.new(:hwnd => @container.hwnd).child(:title => /^(#{WINDOW_TITLES.join('|')})$/)
+    end
+
+    def wait_until_not_exists
+      Wait.until(3) {!exists?}
+      @container.page_container.wait
+    end
+  end
+end

data/lib/watir-classic/dialogs/file_field.rb

@@ -6,6 +6,7 @@ module Watir
       click_no_wait
       set_file_name file_path.gsub(File::SEPARATOR, File::ALT_SEPARATOR)
       open_button.click
+      Wait.until(5) {value.include?(File.basename(file_path))}
     end
 
     alias_method :value=, :set

data/lib/watir-classic/drag_and_drop_helper.rb

@@ -4,26 +4,34 @@ module Watir
     def drag_and_drop_on(target)
       perform_action do
         assert_target target
-        drop_x, drop_y = target.send :source_x_y
-        drag_to drop_x, drop_y
+        drag_to do |mouse|
+          ole_object.document.parentWindow.scrollTo(*target.send(:source_x_y_relative))
+          drop_x, drop_y = target.send(:source_x_y)
+          mouse.move :x => drop_x, :y => drop_y
+        end
       end
     end
 
     def drag_and_drop_by(distance_x, distance_y)
       perform_action do
-        drag_x, drag_y = source_x_y
-        drag_to drag_x + distance_x, drag_y + distance_y
+        drag_to do |mouse|
+          drag_x, drag_y = source_x_y
+          ole_object.document.parentWindow.scrollTo(drag_x + distance_x, drag_y + distance_y)
+          drag_x, drag_y = source_x_y
+          mouse.move :x => drag_x + distance_x, :y => drag_y + distance_y
+        end
       end
     end
 
     private
 
-    def drag_to(drop_x, drop_y)
+    def drag_to
+      ole_object.document.parentWindow.scrollTo(*source_x_y_relative)
       drag_x, drag_y = source_x_y
       mouse = page_container.rautomation.mouse
       mouse.move :x => drag_x , :y => drag_y
       mouse.press
-      mouse.move :x => drop_x, :y => drop_y
+      yield mouse
       mouse.release
     end
 
@@ -31,6 +39,10 @@ module Watir
       center_x_y_absolute left_edge_absolute, top_edge_absolute
     end
 
+    def source_x_y_relative
+      center_x_y_absolute left_edge, top_edge
+    end
+
     def assert_target(target)
       target.assert_exists
       target.assert_enabled

data/lib/watir-classic/element.rb

@@ -296,8 +296,6 @@ module Watir
     end
 
     def dispatch_event(event)
-      assert_exists
-
       if IE.version_parts.first.to_i >= 9 && container.page_container.document.documentMode.to_i >= 9
         ole_object.dispatchEvent(create_event(event))
       else