watirsplash 0.2.12 → 0.2.14

data/History.rdoc

@@ -1,3 +1,8 @@
+=== Version 0.2.14 / 2011-01-25
+
+* use newer RAutomation
+* use newer Win32::Screenshot - you may now uninstall ImageMagick and RMagick
+
 === Version 0.2.12 / 2010-10-15
 
  * really fix integration with RAutomation and AutoIt - uninstall all versions of Watir before installing this version of WatirSplash due to the conflicts of Watir's AutoIt version and RAutomation AutoIt version
@@ -127,4 +132,4 @@ This means that you can test easily tables now:
 
 === Version 0.1.0 / 2010-04-03
 
-First release of WatiRspec, a small library for combining Watir and RSpec for browser-based functional testing in Ruby.
+First release of WatiRspec, a small library for combining Watir and RSpec for browser-based functional testing in Ruby.

data/README.rdoc

@@ -80,16 +80,13 @@ testing right away!
 
 == INSTALL
 
-1) install Ruby 1.8.6:
+1) install Ruby 1.8:
     http://rubyinstaller.org/
     
-2) install ImageMagick with rmagick-win32 gem for saving the screenshots in PNG format:
-    http://rubyforge.org/frs/?group_id=12&release_id=42049
-
-3) install WatirSplash:
+2) install WatirSplash:
     gem install watirsplash
 
-4) in your project's directory:
+3) in your project's directory:
     watirsplash generate
 
 == WHAT NEXT?
@@ -98,4 +95,4 @@ You can read more information about the usage and features from the wiki at http
 
 == COPYRIGHT
 
-Copyright © 2010 Jarmo Pertman. See LICENSE for details.
+Copyright © 2010 Jarmo Pertman. See LICENSE for details.

data/Rakefile

@@ -30,12 +30,11 @@ Execute "watirsplash generate" under your project's directory to generate defaul
     gem.add_dependency("watir", "=1.6.6")
     gem.add_dependency("rspec", "=1.3.0")
     gem.add_dependency("diff-lcs")
-    gem.add_dependency("rautomation", ">=0.0.3")
+    gem.add_dependency("rautomation", "~>0.4")
     gem.add_dependency("require_all")
-    gem.add_dependency("rmagick")
     gem.add_dependency("syntax")
     gem.add_dependency("win32console")
-    gem.add_dependency("win32screenshot", ">=0.0.4")
+    gem.add_dependency("win32screenshot", "~>1.0.2")
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.2.12
+0.2.14

data/lib/watirsplash.rb

@@ -1,9 +1,6 @@
 require "rubygems"
 require "require_all"
 require "rautomation"
-# initialize explicitly RAutomation::Window object to load correct version of AutoIt
-RAutomation::Window.new(:title => "sometitle")
-
 gem "rspec", "=1.3.0"
 require "spec"
 gem "watir", "=1.6.6"

data/lib/watirsplash/html_formatter.rb

@@ -1,6 +1,5 @@
 require 'spec/runner/formatter/html_formatter'
 require 'win32/screenshot'
-require 'rmagick'
 require 'pathname'
 require 'fileutils'
 
@@ -62,9 +61,9 @@ module WatirSplash
     end
 
     def save_html # :nodoc:
+      file_name = file_path("browser.html")
       begin
         html = @browser.html
-        file_name = file_path("browser.html")
         File.open(file_name, 'w') {|f| f.puts html}
       rescue => e
         $stderr.puts "saving of html failed: #{e.message}"
@@ -73,15 +72,11 @@ module WatirSplash
     end
 
     def save_screenshot(description="Screenshot", hwnd=nil) # :nodoc:
+      file_name = file_path("screenshot.png", description)
+      hwnd ||= @browser.hwnd
+      @browser.bring_to_front
       begin
-        hwnd ||= @browser.hwnd
-        @browser.bring_to_front
-        Win32::Screenshot.hwnd(hwnd) do |width, height, blob|
-          file_name = file_path("screenshot.png", description)
-          img = Magick::ImageList.new
-          img.from_blob(blob)
-          img.write(file_name)
-        end
+        Win32::Screenshot::Take.of(:window, :hwnd => hwnd).write(file_name)
       rescue => e
         $stderr.puts "saving of screenshot failed: #{e.message}"
       end
@@ -121,4 +116,4 @@ module WatirSplash
     end
 
   end
-end
+end

data/lib/watirsplash/spec_helper.rb

@@ -23,7 +23,7 @@ module WatirSplash
     module_function :formatter
 
     def method_missing name, *args #:nodoc:
-      @browser.respond_to?(name) ? @browser.send(name, *args) : super
+      @browser.respond_to?(name) ? @browser.send(name, *args) {yield} : super
     end
 
     # make sure that using method 'p' will be invoked on @browser

data/lib/watirsplash/watir.rb

@@ -30,8 +30,7 @@ module Watir
       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.text_field(:class => "Edit", :index => 0).set(File.native_path(file_path))
       save_as_window.button(:value => "&Save").click
 
       WaitHelper.wait_until {File.exists?(file_path)}
@@ -45,8 +44,7 @@ module Watir
       assert_exists
       self.click_no_wait
       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.text_field(:class => "Edit", :index => 0).set(File.native_path(file_path))
       window.button(:value => "&Open").click
     end
   end

data/spec/watir_ie_spec.rb

@@ -26,20 +26,20 @@ describe Watir::IE do
     end
   end
 
-  it "allows only absolute paths for #save_as" do
-    lambda {link(:text => "Download").save_as("download.zip")}.should raise_exception
-  end
-
-  it "works with FileField#set" do
-    field = file_field(:id => "upload")
-    file_path = File.expand_path(__FILE__)
-    field.set file_path
-    field.value.should match(/#{File.basename(__FILE__)}/)
-  end
-
-  it "doesn't allow to use FileField#set with non existing file" do
-    field = file_field(:id => "upload")
-    lambda {field.set "upload.zip"}.should raise_exception
+  context Watir::FileField do
+    context "#set" do
+      it "sets the file to upload with the browser" do
+        field = file_field(:id => "upload")
+        file_path = File.expand_path(__FILE__)
+        field.set file_path
+        wait_until(5) {field.value =~ /#{File.basename(__FILE__)}/}
+      end
+
+      it "doesn't allow to use FileField#set with non existing file" do
+        field = file_field(:id => "upload")
+        lambda {field.set "upload.zip"}.should raise_exception
+      end
+    end
   end
 
   it "has wait_until" do
@@ -54,4 +54,4 @@ describe Watir::IE do
     @browser.should_not exist
   end
 
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: watirsplash
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 2
-  - 12
-  version: 0.2.12
+  - 14
+  version: 0.2.14
 platform: ruby
 authors: 
 - Jarmo Pertman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 +03:00
+date: 2011-01-26 00:00:00 +02:00
 default_executable: watirsplash
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,14 +70,13 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 3
         segments: 
         - 0
-        - 0
-        - 3
-        version: 0.0.3
+        - 4
+        version: "0.4"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -95,7 +94,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rmagick
+  name: syntax
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -109,7 +108,7 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: syntax
+  name: win32console
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -123,35 +122,21 @@ dependencies:
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: win32console
+  name: win32screenshot
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
+        - 1
         - 0
-        version: "0"
+        - 2
+        version: 1.0.2
   type: :runtime
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: win32screenshot
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 0
-        - 4
-        version: 0.0.4
-  type: :runtime
-  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: 
@@ -202,7 +187,7 @@ licenses: []
 post_install_message: |-
   *************************
   
-  Thank you for installing WatirSplash 0.2.12! Don't forget to take a look at README and History files!
+  Thank you for installing WatirSplash 0.2.14! 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.
   
@@ -241,7 +226,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: watirsplash 0.2.12
+summary: watirsplash 0.2.14
 test_files: 
 - spec/spec_helper_spec.rb
 - spec/spec_match_array_spec.rb