rwebunit 1.3.0 → 1.3.1

data/CHANGELOG

@@ -1,6 +1,9 @@
 CHANGELOG
 =========
-
+  1.3.1
+   [Enhancement] better absolutize the hyperlinks in dumped page source
+   [Fixes] logic in allowing method
+ 
   1.3
    add new syntax for including pages
    extend RWebUnit::UsingPages

data/Rakefile

@@ -50,7 +50,7 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebunit"
-  s.version = "1.3.0"
+  s.version = "1.3.1"
   s.summary = "An wrap of WATIR/FireWatir for functional testing of web applications"
   # s.description = ""
 

data/lib/rwebunit.rb

@@ -13,7 +13,7 @@ end
 require 'active_support/core_ext'
 require 'spec'
 
-RWEBUNIT_VERSION = "1.3.0"
+RWEBUNIT_VERSION = "1.3.1"
 
 # Extra full path to load libraries
 require File.dirname(__FILE__) + "/rwebunit/using_pages"

data/lib/rwebunit/driver.rb

@@ -337,7 +337,7 @@ module RWebUnit
       if options[:dir]
         # already defined the dir
         to_dir = options[:dir]
-      elsif $ITEST2_RUNNING_SPEC_ID
+      elsif $ITEST2_RUNNING_SPEC_ID && $ITEST2_WORKING_DIR
 
         $ITEST2_DUMP_DIR = File.join($ITEST2_WORKING_DIR, "dump")
         FileUtils.mkdir($ITEST2_DUMP_DIR) unless File.exists?($ITEST2_DUMP_DIR)
@@ -364,41 +364,71 @@ module RWebUnit
       current_url =~ /(.*\/).*$/
       current_url_parent = $1
       if options[:replacement] && base_url =~ /^http:/
+        File.new(file, "w").puts absolutize_page_hpricot(content, base_url, current_url_parent)
+      else
+        File.new(file, "w").puts content
+      end
 
-        # <link rel="stylesheet" type="text/css" href="/stylesheets/default.css" />
-        # '<script type="text/javascript" src="http://www.jeroenwijering.com/embed/swfobject.js"></script>'
-        # <script type="text/javascript" src="/javascripts/prototype.js"></script>
-        # <script type="text/javascript" src="/javascripts/scriptaculous.js?load=effects,builder"></script>
-        # <script type="text/javascript" src="/javascripts/extensions/gallery/lightbox.js"></script>
-        # <link href="/stylesheets/extensions/gallery/lightbox.css" rel="stylesheet" type="text/css" />
-        # <img src="images/mission_48.png" />
-
-        modified_content = ""
-
-        content.each_line do |line|
-          if line =~ /<script\s+.*src=["'']?(.*)["'].*/i then
-            script_src = $1
-            substitute_relative_path_in_src_line(line, script_src, base_url, current_url_parent)
-          elsif line =~ /<link\s+.*href=["'']?(.*)["'].*/i then
-            link_href = $1
-            substitute_relative_path_in_src_line(line, link_href, base_url, current_url_parent)
-          elsif line =~ /<img\s+.*src=["'']?(.*)["'].*/i then
-            img_src = $1
-            substitute_relative_path_in_src_line(line, img_src, base_url, current_url_parent)
-          end
+    end
 
-          modified_content += line
-        end
 
-        File.new(file, "w").puts modified_content
-      else
-        File.new(file, "w").puts content
+    # <link rel="stylesheet" type="text/css" href="/stylesheets/default.css" />
+    # '<script type="text/javascript" src="http://www.jeroenwijering.com/embed/swfobject.js"></script>'
+    # <script type="text/javascript" src="/javascripts/prototype.js"></script>
+    # <script type="text/javascript" src="/javascripts/scriptaculous.js?load=effects,builder"></script>
+    # <script type="text/javascript" src="/javascripts/extensions/gallery/lightbox.js"></script>
+    # <link href="/stylesheets/extensions/gallery/lightbox.css" rel="stylesheet" type="text/css" />
+    # <img src="images/mission_48.png" />
+    def absolutize_page(content, base_url, current_url_parent)
+      modified_content = ""
+      content.each_line do |line|
+        if line =~ /<script\s+.*src=["'']?(.*)["'].*/i then
+          script_src = $1
+          substitute_relative_path_in_src_line(line, script_src, base_url, current_url_parent)
+        elsif line =~ /<link\s+.*href=["'']?(.*)["'].*/i then
+          link_href = $1
+          substitute_relative_path_in_src_line(line, link_href, base_url, current_url_parent)
+        elsif line =~ /<img\s+.*src=["'']?(.*)["'].*/i then
+          img_src = $1
+          substitute_relative_path_in_src_line(line, img_src, base_url, current_url_parent)
+        end
 
+        modified_content += line
       end
+      return modified_content
+    end
 
-
+    # absolutize_page referencs using hpricot
+    #   
+    def absolutize_page_hpricot(content, base_url, parent_url)
+      begin
+        require 'hpricot'
+        doc = Hpricot(content)
+        base_url.slice!(-1) if ends_with?(base_url, "/")
+        (doc/'link').each { |e| e['href'] = absolutify_url(e['href'], base_url, parent_url) || ""}
+        (doc/'img').each { |e| e['src'] = absolutify_url(e['src'], base_url, parent_url) || ""}        
+        (doc/'script').each { |e| e['src'] = absolutify_url(e['src'], base_url, parent_url) || ""}
+        return doc.to_html
+      rescue => e
+        absolutize_page(content, base_url, parent_url)
+      end
     end
 
+    ## 
+    # change 
+    #   <script type="text/javascript" src="/javascripts/prototype.js"></script>
+    # to
+    #   <script type="text/javascript" src="http://itest2.com/javascripts/prototype.js"></script>
+    def absolutify_url(src, base_url, parent_url)
+      if src.nil? || src.empty? || src == "//:" || src =~ /\s*http:\/\//i
+        return src
+      end
+      
+      return "#{base_url}#{src}" if src =~ /^\s*\//
+      return "#{parent_url}#{src}" if parent_url
+      return src
+    end
+    
     # substut
     def substitute_relative_path_in_src_line(line, script_src, host_url, page_parent_url)
       unless script_src =~ /^["']?http:/
@@ -465,6 +495,10 @@ module RWebUnit
       RUBY_PLATFORM.downcase.include?("mswin") or RUBY_PLATFORM.downcase.include?("mingw32")
     end
 
+    def is_linux?
+      RUBY_PLATFORM.downcase.include?("linux")
+    end
+
     # Support browser (IE) operations using unicode
     #  Example:
     #   click_button("Google 搜索")
@@ -476,10 +510,6 @@ module RWebUnit
     end
     alias support_unicode support_utf8
 
-    def is_linux?
-      RUBY_PLATFORM.downcase.include?("linux")
-    end
-
     #= Convenient functions
     #
 
@@ -515,13 +545,7 @@ module RWebUnit
     # Example:
     #   allow { click_button('Register') }
     def allow(&block)
-      operation_performed_ok = false
-      begin
-        yield
-        operation_performed_ok  = true
-      rescue
-      end
-      operation_performed_ok
+      yield
     end
     alias shall_allow  allow
     alias allowing  allow

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rwebunit
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Zhimin Zhan
@@ -9,7 +9,7 @@ autorequire: rwebunit
 bindir: bin
 cert_chain: []
 
-date: 2009-06-01 00:00:00 +10:00
+date: 2009-08-02 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency