watirsplash 0.2.8 → 0.2.9

data/History.rdoc

@@ -1,3 +1,9 @@
+=== Version 0.2.9 / 2010-10-14
+
+ * AutoItHelper is no more! Using RAutomation gem instead
+ * JavaScript error messages are not screenshotted anymore due to it's complexity and vagueness of the messages themselves
+ * deleted #wait_until? and #wait_while? methods
+
 === Version 0.2.8 / 2010-10-06
 
  * use Watir 1.6.6 and RSpec 1.3.0 from now on

data/Rakefile

@@ -30,6 +30,7 @@ Execute "watirsplash generate" under your project's directory to generate defaul
     gem.add_dependency("watir", "=1.6.5")
     gem.add_dependency("rspec", "=1.3.0")
     gem.add_dependency("diff-lcs")
+    gem.add_dependency("rautomation")
     gem.add_dependency("require_all")
     gem.add_dependency("rmagick")
     gem.add_dependency("syntax")

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.9

data/lib/watirsplash.rb

@@ -5,13 +5,13 @@ require "spec"
 gem "watir", "=1.6.6"
 require "watir"
 require "pathname"
+require "rautomation"
 require_rel "watirsplash/wait_helper"
 require_rel "watirsplash/element_extensions"
 require_rel "watirsplash/file_helper"
 require_rel "watirsplash/spec_helper"
 require_rel "watirsplash/spec"
 require_rel "watirsplash/watir"
-require_rel "watirsplash/auto_it_helper"
 require_rel "watirsplash/util"
 WatirSplash::Util.load_environment
 

data/lib/watirsplash/html_formatter.rb

@@ -42,7 +42,6 @@ module WatirSplash
 
     def extra_failure_content(failure) # :nodoc:
       if @browser.exists?
-        save_javascript_error
         save_html
         save_screenshot
       end
@@ -89,24 +88,6 @@ module WatirSplash
       file_name
     end
 
-    def save_javascript_error # :nodoc:
-      file_name = nil
-      begin
-        if @browser.is_a?(Watir::IE) && @browser.status =~ /Error on page/
-          autoit = Watir::autoit
-          autoit.AutoItSetOption("MouseCoordMode", 0)
-          autoit.ControlClick("[TITLE:#{@browser.title}]", "", "[CLASS:msctls_statusbar32]", "left", 2)
-          popup_title = "[REGEXPTITLE:^(Windows )?Internet Explorer$]"
-          autoit.WinWait(popup_title, "", 10)
-          file_name = save_screenshot("JS_Error", autoit.WinGetHandle(popup_title).hex)
-          autoit.WinClose(popup_title)
-        end
-      rescue => e
-        $stderr.puts "saving of javascript error failed: #{e.message}"
-      end
-      file_name
-    end
-
     # Generates unique file name and path for each example.
     #
     # All file names generated with this method will be shown

data/lib/watirsplash/wait_helper.rb

@@ -26,13 +26,6 @@ module Watir
       raise TimeoutError, "timed out after #{timeout} seconds"
     end
 
-    def wait_until?(timeout = 60, &block)
-      wait_until(timeout, &block)
-      true
-    rescue TimeoutError
-      false
-    end
-
     #
     # Wait while the block evaluates to true or times out.
     #
@@ -47,13 +40,5 @@ module Watir
 
       raise TimeoutError, "timed out after #{timeout} seconds"
     end
-
-    def wait_while?(timeout = 60, &block)
-      wait_until(timeout, &block)
-      true
-    rescue TimeoutError
-      false
-    end
-
   end # WaitHelper
 end # Watir

data/lib/watirsplash/watir.rb

@@ -1,7 +1,7 @@
 module Watir
   module PageCheckers
     # raises an error if javascript error was found
-    JAVASCRIPT_ERRORS_CHECKER = lambda {|ie| raise "Got JavaScript error!" if ie.status =~ /Error on page/}
+    JAVASCRIPT_ERRORS_CHECKER = lambda {|ie| raise "Expected no JavaScript errors to appear on page, but having some!" if ie.status =~ /Error on page/}
   end
 end
 
@@ -25,10 +25,16 @@ module Watir
       path = Pathname.new(file_path)
       raise "path to #{file_path} has to be absolute!" unless path.absolute?
       self.click_no_wait
-      AutoIt::Window.new("File Download").button("&Save").click
-      save_as_window = AutoIt::Window.new("Save As")
-      save_as_window.text_field("Edit1").set(File.native_path(file_path))
-      save_as_window.button("&Save").click
+      download_window = RAutomation::Window.new(:title => "File Download",
+                                                :text => "Do you want to open or save this file?")
+      WaitHelper.wait_until {download_window.present?}
+      download_window.button(:value => "&Save").click
+
+      save_as_window = RAutomation::Window.new(:title => "Save As")
+      WaitHelper.wait_until {save_as_window.present?}
+      save_as_window.text_field(:class_name => "Edit1").set(File.native_path(file_path))
+      save_as_window.button(:value => "&Save").click
+
       WaitHelper.wait_until {File.exists?(file_path)}
       file_path
     end
@@ -39,9 +45,10 @@ module Watir
       raise "#{file_path} has to exist to set!" unless File.exists?(file_path)
       assert_exists
       self.click_no_wait
-      window = AutoIt::Window.new(/choose file( to upload)?/i)
-      window.text_field("Edit1").set(File.native_path(file_path))
-      window.button("&Open").click
+      window = RAutomation::Window.new(:title => /choose file( to upload)?/i)
+      WaitHelper.wait_until {window.present?}
+      window.text_field(:class_name => "Edit1").set(File.native_path(file_path))
+      window.button(:value => "&Open").click
     end
   end
 

data/spec/watir_ie_spec.rb

@@ -47,14 +47,6 @@ describe Watir::IE do
     lambda {wait_until(0.5) {sleep 0.1; false}}.should raise_exception(Watir::WaitHelper::TimeoutError)
   end
 
-  it "has wait_until?" do
-    result = wait_until? {sleep 0.1; true}
-    result.should be_true
-
-    result = wait_until?(0.5) {sleep 0.1; false}
-    result.should be_false
-  end
-
   it "closes the browser even when Watir::IE#run_error_checks throws an exception" do
     @browser.add_checker lambda {raise "let's fail IE#wait in IE#close"}
     @browser.should exist

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watirsplash
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 +03:00
+date: 2010-10-14 00:00:00 +03:00
 default_executable: watirsplash
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,7 +65,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: require_all
+  name: rautomation
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -79,7 +79,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rmagick
+  name: require_all
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -93,7 +93,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: syntax
+  name: rmagick
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -107,7 +107,7 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: win32console
+  name: syntax
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -121,9 +121,23 @@ dependencies:
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: win32screenshot
+  name: win32console
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: win32screenshot
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -135,7 +149,7 @@ dependencies:
         - 4
         version: 0.0.4
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 description: WatirSplash makes testing of web applications splashin' easy by combining best features of Watir, RSpec and Ruby!
 email: jarmo.p@gmail.com
 executables: 
@@ -154,7 +168,6 @@ files:
 - VERSION
 - bin/watirsplash
 - lib/watirsplash.rb
-- lib/watirsplash/auto_it_helper.rb
 - lib/watirsplash/element_extensions.rb
 - lib/watirsplash/file_helper.rb
 - lib/watirsplash/generator.rb
@@ -187,7 +200,7 @@ licenses: []
 post_install_message: |-
   *************************
   
-  Thank you for installing WatirSplash 0.2.8! Don't forget to take a look at README and History files!
+  Thank you for installing WatirSplash 0.2.9! Don't forget to take a look at README and History files!
   
   Execute "watirsplash generate" under your project's directory to generate default project structure.
   
@@ -226,7 +239,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: watirsplash 0.2.8
+summary: watirsplash 0.2.9
 test_files: 
 - spec/spec_helper_spec.rb
 - spec/spec_match_array_spec.rb

data/lib/watirsplash/auto_it_helper.rb

@@ -1,121 +0,0 @@
-module AutoIt
-  class Window
-    include Watir::WaitHelper
-
-    class << self
-      def autoit
-        @@autoit
-      end
-    end
-
-    @@autoit = Watir.autoit
-    attr_reader :locator
-
-    def initialize(window_locator)
-      @locator =
-              case window_locator
-                when Regexp
-                  "[REGEXPTITLE:#{window_locator}]"
-                when Fixnum
-                  "[HANDLE:#{window_locator.to_s(16).rjust(8, "0")}]"
-                else
-                  window_locator
-              end
-      @title = window_locator
-    end
-
-    # makes window active
-    # * returns true if activation was successful and false otherwise
-    def activate
-      @@autoit.WinWait(@locator, "", 1) == 1 &&
-              @@autoit.WinActivate(@locator) != 0 &&
-              @@autoit.WinActive(@locator) != 0
-    end
-
-    def text
-      @@autoit.WinGetText(@locator)
-    end
-
-    def exists?
-      @@autoit.WinExists(@locator) == 1
-    end
-
-    def close
-      @@autoit.WinClose(@locator)
-      @@autoit.WinKill(@locator)
-    end
-
-    def button(name)
-      Button.new(self, name)
-    end
-
-    def text_field(name)
-      TextField.new(self, name)
-    end
-
-    def method_missing name, *args #:nodoc:
-      @@autoit.respond_to?(name) ? @@autoit.send(name, *args) : super
-    end
-  end
-
-  class Button
-    include Watir::WaitHelper
-
-    def initialize(window, button_name)
-      @window = window
-      @name = button_name
-    end
-
-    # clicks specified button on window with specified title,
-    # activates window automatically and makes sure that the click
-    # was successful
-    def click
-      clicked = false
-      wait_until do
-        @window.activate &&
-                Window.autoit.ControlFocus(@window.locator, "", @name) == 1 &&
-                Window.autoit.ControlClick(@window.locator, "", @name) == 1 &&
-                clicked = true # is clicked at least once
-
-        clicked && !exists?
-      end
-    end
-
-    def exists?
-      not Window.autoit.ControlGetHandle(@window.locator, "", @name).empty?
-    end
-  end
-
-  class TextField
-    include Watir::WaitHelper
-
-    def initialize(window, field_name)
-      @window = window
-      @name = field_name
-    end
-
-    # sets specified field's value on window with specified title,
-    # activates window automatically and makes sure that the field's
-    # value got changed
-    def set(text)
-      wait_until do
-        @window.activate &&
-                Window.autoit.ControlFocus(@window.locator, "", @name) == 1 &&
-                Window.autoit.ControlSetText(@window.locator, "", @name, text) == 1 &&
-                value == text
-      end
-    end
-
-    def clear
-      set ""
-    end
-
-    def value
-      Window.autoit.ControlGetText(@window.locator, "", @name)
-    end
-
-    def exists?
-      not Window.autoit.ControlGetHandle(@window.locator, "", @name).empty?
-    end
-  end
-end