rwebspec 1.8.2 → 1.9

data/CHANGELOG

@@ -1,5 +1,11 @@
 CHANGELOG
 =========
+ 1.9
+  [Upgrade] support Watir 2 syntax
+  alias tr row
+  alias a link
+  
+
  1.8.2
   Add javascript_dialog in driver to support Watir 1.9
 

data/Rakefile

@@ -70,7 +70,7 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec"
-  s.version = "1.8.2"
+  s.version = "1.9"
   s.summary = "Executable functional specification for web applications in RSpec syntax and Watir"
   # s.description = ""
 

data/lib/rwebspec/driver.rb

@@ -279,6 +279,9 @@ module RWebSpec
     alias td cell
     alias check_box checkbox # seems watir doc is wrong, checkbox not check_box
     alias tr row
+    alias a link
+    alias img image
+
 
     [:back, :forward, :refresh].each do |method|
       define_method(method) do
@@ -289,12 +292,17 @@ module RWebSpec
     alias go_back back
     alias go_forward forward
 
-    [:images, :links, :buttons, :select_lists, :checkboxes, :radios, :text_fields].each do |method|
+    [:images, :links, :buttons, :select_lists, :checkboxes, :radios, :text_fields, :divs, :dls, :dds, :dts, :ems, :lis, :maps, :spans, :strongs, :ps, :pres, :labels, :cells, :rows].each do |method|
       define_method method do
         perform_operation { @web_browser.send(method) if @web_browser }
       end
     end
+		alias as links
+		alias trs rows
+		alias tds cells
+		alias imgs images
 
+	
     # Check one or more checkboxes with same name, can accept a string or an array of string as values checkbox, pass array as values will try to set mulitple checkboxes.
     #
     # page.check_checkbox('bad_ones', 'Chicken Little')
@@ -425,7 +433,7 @@ module RWebSpec
       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)
+        File.new(file, "w").puts absolutize_page_nokogiri(content, base_url, current_url_parent)
       else
         File.new(file, "w").puts content
       end
@@ -474,6 +482,21 @@ module RWebSpec
       rescue => e
         absolutize_page(content, base_url, parent_url)
       end
+    end  
+
+  	def absolutize_page_nokogiri(content, base_url, parent_url)
+      return absolutize_page(content, base_url, parent_url) if RUBY_PLATFORM == 'java'
+      begin
+        require 'nokogiri'
+        doc = Nokogiri::HTML(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
 
     ## 

data/lib/rwebspec/web_browser.rb

@@ -172,6 +172,8 @@ module RWebSpec
     alias td cell
     alias check_box checkbox  # seems watir doc is wrong, checkbox not check_box
     alias tr row
+    alias a link
+    alias img image
 
     # Wrapp of Watir's area to support Firefox and Watir
     #
@@ -285,12 +287,16 @@ module RWebSpec
       end
     end
 
-    [:images, :links, :buttons, :select_lists, :checkboxes, :radios, :text_fields, :divs, :dls, :dds, :dts, :ems, :lis, :maps, :spans, :strongs, :ps, :pres, :labels].each do |method|
+    [:images, :links, :buttons, :select_lists, :checkboxes, :radios, :text_fields, :divs, :dls, :dds, :dts, :ems, :lis, :maps, :spans, :strongs, :ps, :pres, :labels, :cells, :rows].each do |method|
       define_method method do
         @browser.send(method)
       end
     end
-
+		alias as links
+		alias trs rows
+		alias tds cells
+		alias imgs images
+		
     # current url
     def url
       @browser.url
@@ -509,7 +515,11 @@ module RWebSpec
       if values
         values.class == Array ? arys = values : arys = [values]
         arys.each {|cbx_value|
-          checkbox(:name, checkBoxName, cbx_value).set
+					if Watir::VERSION =~ /^1/ then		
+          	checkbox(:name, checkBoxName, cbx_value).set						
+					else
+          	checkbox(:name => checkBoxName, :value => cbx_value).set
+					end
         }
       else
         checkbox(:name, checkBoxName).set
@@ -524,7 +534,11 @@ module RWebSpec
       if values
         values.class == Array ? arys = values : arys = [values]
         arys.each {|cbx_value|
-          checkbox(:name, checkBoxName, cbx_value).clear
+					if Watir::VERSION =~ /^1/ then	
+          	checkbox(:name, checkBoxName, cbx_value).clear
+					else
+          	checkbox(:name => checkBoxName, :value => cbx_value).clear
+					end
         }
       else
         checkbox(:name, checkBoxName).clear
@@ -536,7 +550,11 @@ module RWebSpec
     #  Usage:
     #    click_radio_option("country", "Australia")
     def click_radio_option(radio_group, radio_option)
-      radio(:name, radio_group, radio_option).set
+			if Watir::VERSION =~ /^1/ then
+      	radio(:name, radio_group, radio_option).set				
+			else
+      	radio(:name => radio_group, :value => radio_option).set
+			end
     end
     alias click_radio_button click_radio_option
 
@@ -544,7 +562,11 @@ module RWebSpec
     #  Usage:
     #    click_radio_option("country", "Australia")
     def clear_radio_option(radio_group, radio_option)
-      radio(:name, radio_group, radio_option).clear
+			if Watir::VERSION =~ /^2/ then
+        radio(:name => radio_group, :value => radio_option).clear				
+			else
+        radio(:name, radio_group, radio_option).clear
+			end
     end
     alias clear_radio_button clear_radio_option
 

metadata

@@ -1,13 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: rwebspec
 version: !ruby/object:Gem::Version 
-  hash: 51
-  prerelease: 
+  prerelease: false
   segments: 
   - 1
-  - 8
-  - 2
-  version: 1.8.2
+  - 9
+  version: "1.9"
 platform: ruby
 authors: 
 - Zhimin Zhan
@@ -15,18 +13,16 @@ autorequire: rwebspec
 bindir: bin
 cert_chain: []
 
-date: 2011-07-06 00:00:00 +10:00
+date: 2011-08-11 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 1
         - 1
@@ -38,11 +34,9 @@ dependencies:
   name: commonwatir
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 53
         segments: 
         - 1
         - 8
@@ -94,27 +88,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - none
 rubyforge_project: rwebspec
-rubygems_version: 1.4.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Executable functional specification for web applications in RSpec syntax and Watir