rwebspec 1.7.1 → 1.8.1

data/CHANGELOG

@@ -1,5 +1,15 @@
 CHANGELOG
 =========
+ 1.8.1
+   [Upgrade] new take screenshot library
+   [Fix] only take screenshot on failed assertions if $task_screenshot is set
+   [Enhancement] add close_all for firefox browser (pass by argument)
+   [Enhancement] refactored driver.close_all_browsers
+   [New] background_visit now works new http-client version
+   [New] element_by_id() for firefox
+   [New] web_page.url 
+   [Fix] More correctly detect platform: mswin or mingw
+   [New] add Array.sum methods
 
  1.7.1
    [New] New version scheme, matching Watir versioning, appending minor number

data/Rakefile

@@ -70,12 +70,12 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec"
-  s.version = "1.7.1"
+  s.version = "1.8.1"
   s.summary = "Executable functional specification for web applications in RSpec syntax and Watir"
   # s.description = ""
 
   s.author  = "Zhimin Zhan"
-  s.email   = "zhimin@agileway.net"
+  s.email   = "zhimin@agileway.com.au"
   s.homepage= "http://github.com/zhimin/rwebspec/tree/master"
   s.rubyforge_project = "rwebspec"
 
@@ -91,7 +91,7 @@ spec = Gem::Specification.new do |s|
   s.files = s.files + Dir.glob( "docs/**/*" )
   s.add_dependency(%q<rspec>, ["= 1.1.12"])
 
-  s.add_dependency("commonwatir", ">= 1.8.0")
+  s.add_dependency("commonwatir", ">= 1.8.1")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/lib/rwebspec/assert.rb

@@ -377,7 +377,7 @@ module RWebSpec
         yield
       rescue StandardError => e
         # puts "[DEBUG] Assertion error: #{e}"
-        take_screenshot
+        take_screenshot if $take_screenshot
         raise e
       end
     end

data/lib/rwebspec/driver.rb

@@ -95,21 +95,25 @@ module RWebSpec
         # @web_browser.close_browser unless $ITEST2_LEAVE_BROWSER_OPEN_AFTER_RUN
         @web_browser.close_browser
       else
-        WebBrowser.close_all_browsers
+				close_all_browsers
       end
     end
-
     alias close_ie close_browser
 
 
     # Close all opening browser windows
     #
     def close_all_browsers
-      if is_firefox?
-        FireWatir::Firefox.close_all
-      else
-        Watir::IE.close_all
-      end
+			if @web_browser
+	      if is_firefox?
+	        FireWatir::Firefox.close_all
+	      else
+	        Watir::IE.close_all
+	      end
+			else
+				browser_type = $ITEST2_BROWSER ? $ITEST2_BROWSER.downcase.to_sym : :ie	
+	      WebBrowser.close_all_browsers(browser_type)				
+			end
     end
 
     # Verify the next page following an operation.
@@ -168,7 +172,6 @@ module RWebSpec
         @web_browser.goto_page(page) if @web_browser
       }
     end
-
     alias visit goto_page
 
     
@@ -181,29 +184,32 @@ module RWebSpec
     end
 
     # Go to specific url in background (i.e not via browwser, different from goto_url)
-    # This won't share the session with what's currenlty in browser
+    # This won't share the session with what's currenlty in browser, proxy setting
     #
     # One use example: resetting database
     #   background_visit("/reset")
     #
-    def background_visit(url)
+    def background_visit(url, opts = {})
       require 'httpclient'
       begin
         client = HTTPClient.new
         if url && url =~ /^http/
-            http_response = client.get(url).body.content
+            http_response = client.get(url).body
         else
             base_url = $ITEST2_PROJECT_BASE_URL || $BASE_URL
-            http_response = client.get("#{base_url}#{url}").body.content
+            http_response = client.get("#{base_url}#{url}").body
         end
+				
+				http_response = http_response.content if http_response.respond_to?("content")
       rescue => e
         raise e
       end
     end
     
-    # Attach to existinb browser window
+    # Attach to existing browser window
     #
-    #  attach_browser(:title,    )
+    #  attach_browser(:title, "Page" )
+    #  attach_browser(:url, "http://wwww..." )
     def attach_browser(how, what, options = {})
       options.merge!(:browser => is_firefox? ? "Firefox" : "IE") unless options[:browser]
       begin
@@ -941,7 +947,7 @@ module RWebSpec
 
     # take_screenshot to save the current active window
     # TODO can't move mouse
-    def take_screenshot
+    def take_screenshot_old
       if is_windows? && $ITEST2_DUMP_PAGE
         begin
           puts "[DEBUG] Capturing screenshots..."
@@ -961,6 +967,38 @@ module RWebSpec
     end
 
 
+
+    # use win32screenshot library to save curernt active window, which shall be IE
+    #
+    def take_screenshot
+      # puts "calling new take screenshot"
+      if $testwise_screenshot_supported && is_windows?
+        # puts "testwise supported: #{$testwise_screenshot_supported}"
+        begin
+          screenshot_image_filename =  "screenshot_" + Time.now.strftime("%m%d%H%M%S") + ".jpg"
+          the_dump_dir = default_dump_dir
+          FileUtils.mkdir_p(the_dump_dir) unless File.exists?(the_dump_dir)
+          screenshot_image_filepath = File.join(the_dump_dir, screenshot_image_filename)
+          screenshot_image_filepath.gsub!("/", "\\") if is_windows?
+
+          FileUtils.rm_f(screenshot_image_filepath) if File.exist?(screenshot_image_filepath)
+
+          if is_firefox? then
+            Win32::Screenshot::Take.of(:window, :title => /mozilla\sfirefox/i).write(screenshot_image_filepath)					
+					elsif ie
+            Win32::Screenshot::Take.of(:window, :title => /internet\sexplorer/i).write(screenshot_image_filepath)					
+          else
+            Win32::Screenshot::Take.of(:foreground).write(screenshot_image_filepath)
+          end
+          notify_screenshot_location(screenshot_image_filepath)
+        rescue => e
+          puts "error on taking screenshot: #{e}"
+        end
+      end
+    end
+
+		# end of methods
+
   end
 
 end

data/lib/rwebspec/popup.rb

@@ -112,7 +112,7 @@ module RWebSpec
     def prepare_to_click_button_in_popup(button = "OK", wait_time = 3)
       #  !@web_browser.is_firefox?
       # TODO: firefox is OK
-      if RUBY_PLATFORM =~ /mswin/  then
+      if RUBY_PLATFORM =~ /mswin/ || RUBY_PLATFORM =~ /mingw/  then
         start_checking_js_dialog(button, wait_time)
       else
         raise "this only support on Windows and on IE"

data/lib/rwebspec/test_utils.rb

@@ -9,6 +9,11 @@ class Array
   def average
     inject(0.0) { |sum, e| sum + e } / length
   end
+
+	# why it is removed total
+	def sum
+    inject(0.0) { |sum, e| sum + e }
+	end
 end
 
 # useful hekoer methods for testing

data/lib/rwebspec/web_browser.rb

@@ -326,15 +326,14 @@ module RWebSpec
       end
       sleep 2
     end
-
     alias close close_browser
 
-    #TODO determine browser type, check FireWatir support or not
-    def self.close_all_browsers
-      if RUBY_PLATFORM.downcase.include?("mswin")
+    def self.close_all_browsers(browser_type = :ie)      
+			if browser_type == :ie
         Watir::IE.close_all
-      else
+      elsif browser_type == :firefox
         # raise "not supported in FireFox yet."
+				FireWatir::Firefox.new.close_all	
       end
     end
 
@@ -553,7 +552,9 @@ module RWebSpec
     def element_by_id(elem_id)
       if is_firefox?
         # elem = @browser.document.getElementById(elem_id)
-        elem = div(:id, elem_id) || label(:id, elem_id)  || button(:id, elem_id) || span(:id, elem_id) || hidden(:id, elem_id) || link(:id, elem_id) || radio(:id, elem_id)
+        # elem = div(:id, elem_id) || label(:id, elem_id)  || button(:id, elem_id) || 
+				# span(:id, elem_id) || hidden(:id, elem_id) || link(:id, elem_id) || radio(:id, elem_id)
+				elem = browser.element_by_xpath("//*[@id='#{elem_id}']")
       else
         elem = @browser.document.getElementById(elem_id)
       end
@@ -576,7 +577,7 @@ module RWebSpec
     end
 
     def select_file_for_upload(file_field, file_path)
-      normalized_file_path = RUBY_PLATFORM.downcase.include?("mswin") ? file_path.gsub("/", "\\") : file_path
+      normalized_file_path = RUBY_PLATFORM.downcase.include?("mingw") ? file_path.gsub("/", "\\") : file_path
       file_field(:name, file_field).set(normalized_file_path)
     end
 

data/lib/rwebspec/web_page.rb

@@ -80,6 +80,10 @@ module RWebSpec
       @web_browser.text
     end
 
+    def url
+      @web_browser.url
+    end
+
     # TO validate
     def contains?(ary)
       return true if ary.nil?

data/lib/rwebspec.rb

@@ -24,7 +24,16 @@ require 'active_support/core_ext'
 require 'spec'
 
 unless defined? RWEBSPEC_VERSION
-  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "1.7.1"
+  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "1.8.1"
+end
+
+if  RUBY_PLATFORM =~ /mswin/ or RUBY_PLATFORM =~ /mingw/
+ $testwise_screenshot_supported = false
+ begin
+   require 'win32/screenshot'
+   $testwise_screenshot_supported = true
+ rescue LoadError => no_screen_library_error
+ end  
 end
 
 # Extra full path to load libraries

data/lib/watir_extensions.rb

@@ -24,7 +24,7 @@ module FireWatir
       end
 
       case os
-      when /mswin/
+      when /mswin/ || /mingw/
         begin
           # Get the path to Firefox.exe using Registry.
           require 'win32/registry.rb'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rwebspec
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 53
   prerelease: 
   segments: 
   - 1
-  - 7
+  - 8
   - 1
-  version: 1.7.1
+  version: 1.8.1
 platform: ruby
 authors: 
 - Zhimin Zhan
@@ -15,7 +15,7 @@ autorequire: rwebspec
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 +10:00
+date: 2011-05-28 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,16 +42,16 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 55
+        hash: 53
         segments: 
         - 1
         - 8
-        - 0
-        version: 1.8.0
+        - 1
+        version: 1.8.1
   type: :runtime
   version_requirements: *id002
 description: 
-email: zhimin@agileway.net
+email: zhimin@agileway.com.au
 executables: []
 
 extensions: []