zhimin-rwebspec 1.4.0 → 1.4.0.1

data/CHANGELOG

@@ -2,6 +2,8 @@ CHANGELOG
 =========
  1.4.0
   Renamed to rwebspec
+  1.9 compliance
+  TODO: support JRuby to run against Firefox and Celerity
 
  1.3.1
    [Enhancement] better absolutize the hyperlinks in dumped page source

data/Rakefile

@@ -10,13 +10,13 @@ $:.unshift(File.dirname(__FILE__) + "/lib")
 #require 'rwebspec'
 
 desc "Default task"
-task :default => [ :clean, :spec, :gem]
-# task :default => [ :clean, :spec, :rdoc, :gem]
+task :default => [ :clean, :spec, :rdoc, :chm, :gem]
 
 desc "Clean generated files"
 task :clean do
   rm_rf 'pkg'
   rm_rf 'doc'
+  rm_rf 'chm'
 end
 
 desc 'Run all specs'
@@ -39,7 +39,7 @@ end
 # using DarkFish - http://deveiate.org/projects/Darkfish-Rdoc/
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'doc'
-  rdoc.title = 'rWebUnit'
+  rdoc.title = 'RWebSpec'
   rdoc.rdoc_files.include('lib/rwebspec.rb')
   rdoc.rdoc_files.include('lib/rwebspec/*.rb')
     rdoc.options += [
@@ -48,10 +48,22 @@ Rake::RDocTask.new do |rdoc|
       ]
 end
 
+Rake::RDocTask.new("chm") do |rdoc|
+  rdoc.rdoc_dir = 'chm'
+  rdoc.title = 'RWebSpec'
+  rdoc.rdoc_files.include('lib/rwebspec.rb')
+  rdoc.rdoc_files.include('lib/rwebspec/*.rb')
+    rdoc.options += [
+        '-SHN',
+        '-f', 'chm',  # This is the important bit
+      ]
+end
+
+
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec"
-  s.version = "1.4.0"
+  s.version = "1.4.0.1"
   s.summary = "Executable functional specification for web applications in RSpec syntax and Watir"
   # s.description = ""
 

data/lib/rwebspec/driver.rb

@@ -346,7 +346,7 @@ module RWebSpec
         spec_run_dir_name = spec_run_id.to_s.rjust(4, "0") unless spec_run_id == "unknown"
         to_dir = File.join($ITEST2_DUMP_DIR, spec_run_dir_name)
       else
-        to_dir = ENV['TEMP_DIR'] || "C:\\temp"
+        to_dir = ENV['TEMP_DIR'] || (is_windows? ? "C:\\temp" : "/tmp") 
       end
 
       if options[:filename]
@@ -401,6 +401,7 @@ module RWebSpec
     # absolutize_page referencs using hpricot
     #   
     def absolutize_page_hpricot(content, base_url, parent_url)
+      return  absolutize_page(content, base_url, parent_url) if RUBY_PLATFORM == 'java'
       begin
         require 'hpricot'
         doc = Hpricot(content)
@@ -502,6 +503,7 @@ module RWebSpec
     # Support browser (IE) operations using unicode
     #  Example:
     #   click_button("Google 搜索")
+    # Reference: http://jira.openqa.org/browse/WTR-219
     def support_utf8
       if is_windows?
         require 'win32ole'

data/lib/rwebspec/web_browser.rb

@@ -42,54 +42,94 @@ module RWebSpec
     attr_accessor :context
 
     def initialize(base_url = nil, existing_browser = nil, options = {})
-      default_options = {:speed => "zippy", :visible => true,
-          :highlight_colour => 'yellow',  :close_others => true}
+      default_options = {:speed => "zippy",
+                         :visible => true,
+                         :highlight_colour => 'yellow',
+                         :close_others => true
+      }
       options = default_options.merge options
       @context = Context.new base_url if base_url
 
-      if $celerity_loaded
-        @browser = Celerity::Browser.new(:proxy => options[:proxy])
-        @browser.goto(base_url)
-      else
-        if (existing_browser) then
-          @browser = existing_browser
-        else
-          if (options[:firefox] &&  $firewatir_loaded) || ($firewatir_loaded and !$watir_loaded)
-            # JSSH is running, 9997
-            begin
-              require 'net/telnet'
-              firefox_jssh = Net::Telnet::new("Host" => "127.0.0.1", "Port" => 9997)
-              FireWatir::Firefox.firefox_started = true
-            rescue => e
-              # puts "debug: XXX #{e}"
-              sleep 1
+      case RUBY_PLATFORM
+        when /java/i
+          # Java, maybe firewatir or celerity
+          puts "Ruby java platform"
+          raise "Not supported, no FireWatir or Celerity detected" unless $firewatir_loaded || $celerity_loaded
+          if $firewatir_loaded && $celerity_loaded then
+            # choose one out of two, :default to celerity
+            if options[:firefox] then
+              initialize_firefox_browser(existing_browser, base_url, options)
+            else
+              initialize_celerity_browser(base_url, options)
             end
-            @browser = FireWatir::Firefox.start(base_url)
-          elsif $watir_loaded
-            @browser = Watir::IE.new
+          elsif $firewatir_loaded
+            initialize_firefox_browser(existing_browser, base_url, options)
+          else
+            initialize_celerity_browser(base_url, options)
           end
-        end
 
+        when /mswin|windows|mingw/i
+          puts "Ruby windows platform"
+          raise "Not supported, no Watir or FireWatir detected" unless $watir_loaded || $firewatir_loaded
+          if $firewatir_loaded && options[:firefox] then
+            initialize_firefox_browser(existing_browser, base_url, options)
+          else
+            initialize_ie_browser(existing_browser, options)
+          end
+        else
+          raise "Not supported, no FireWatirdetected" unless $firewatir_loaded
+          puts "Ruby Linux or Mac platform: firefox"
+          initialize_firefox_browser(base_url, options)
       end
+    end
 
-      raise "rWebUnit initialiazation error, most likely Watir or Firewatir not present" if @browser.nil?
-      if  $watir_loaded && @browser.class == Watir::IE
-        if $ITEST2_EMULATE_TYPING  &&  $ITEST2_TYPING_SPEED then
-          @browser.set_slow_speed if $ITEST2_TYPING_SPEED == 'slow'
-          @browser.set_fast_speed if $ITEST2_TYPING_SPEED == 'fast'
-        else
-          @browser.speed = :zippy
-        end
-        @browser.activeObjectHighLightColor = options[:highlight_colour]
-        @browser.visible = options[:visible] unless $HIDE_IE
+    def initialize_firefox_browser(existing_browser, base_url, options)
+      if existing_browser then
+        @browser = existing_browser
+        return
+      end
+      # JSSH is running, 9997
+      begin
+        require 'net/telnet'
+        firefox_jssh = Net::Telnet::new("Host" => "127.0.0.1", "Port" => 9997)
+        FireWatir::Firefox.firefox_started = true
+      rescue => e
+        # puts "debug: XXX #{e}"
+        sleep 1
+      end
+      @browser = FireWatir::Firefox.start(base_url)
+    end
 
-        if RUBY_VERSION =~ /^1\.8/ && options[:close_others] then
-          puts "close other browser instances not working yet in Ruby 1.9.1 version of Watir"
-          @browser.close_others
-        end
+    def initialize_celerity_browser(base_url, options)
+      default_celerity_options = { :proxy => nil,  :browser => :firefox, :resynchronize => true, :log_level => :off }
+      options = default_celerity_options.merge options
+      options.each { |k, v| options.delete(k) unless default_celerity_options.keys.include?(k)}
+      puts "Starting Celerity: #{options.inspect}"
+      @browser = Celerity::Browser.new(options)
+      @browser.goto(base_url)
+    end
 
+    def initialize_ie_browser(existing_browser, options)
+      if existing_browser then
+        @browser = existing_browser
+        return
       end
 
+      @browser = Watir::IE.new
+      if $ITEST2_EMULATE_TYPING && $ITEST2_TYPING_SPEED then
+        @browser.set_slow_speed if $ITEST2_TYPING_SPEED == 'slow'
+        @browser.set_fast_speed if $ITEST2_TYPING_SPEED == 'fast'
+      else
+        @browser.speed = :zippy
+      end
+      @browser.activeObjectHighLightColor = options[:highlight_colour]
+      @browser.visible = options[:visible] unless $HIDE_IE
+      #NOTE: close_others fails
+      if RUBY_VERSION =~ /^1\.8/ && options[:close_others] then
+        @browser.close_others
+      else
+        puts "close other browser instances not working yet in Ruby 1.9.1 version of Watir"
+      end
     end
 
     def self.reuse(base_url, options)
@@ -139,6 +179,7 @@ module RWebSpec
       @browser.html()
       #@browser.document.body
     end
+
     alias html_body page_source
 
     def html
@@ -150,10 +191,13 @@ module RWebSpec
     end
 
     def page_title
-      if is_firefox?
+  	  case @browser.class.to_s
+ 	  when "FireWatir::Firefox" 	  
         @browser.title
-      else
+      when "Watir::IE"
         @browser.document.title
+      else
+        @browser.title
       end
     end
 
@@ -188,13 +232,17 @@ module RWebSpec
     # Close the browser window.  Useful for automated test suites to reduce
     # test interaction.
     def close_browser
-      if is_firefox? then
+ 	  case @browser.class.to_s
+ 	  when "FireWatir::Firefox" 	  
         @browser.close
+      when "Watir::IE"
+        @browser.getIE.quit      
       else
-        @browser.getIE.quit
+        puts "#{@browser.class} can't close, ignore"
       end
       sleep 2
     end
+
     alias close close_browser
 
     #TODO determine browser type, check FireWatir support or not
@@ -273,6 +321,7 @@ module RWebSpec
         wait_before_and_after { text_field(:name, name).set(text) }
       end
     end
+
     alias set_form_element enter_text_into_field_with_name
     alias enter_text enter_text_into_field_with_name
 

data/lib/rwebspec/web_page.rb

@@ -62,6 +62,7 @@ module RWebSpec
     def source
       @web_browser.page_source
     end
+    alias html source
 
     # return current page title
     def title
@@ -75,9 +76,10 @@ module RWebSpec
 
     # TO validate
     def contains?(ary)
+      return true if ary.nil?
       the_page_source = source
       found = false
-      ary.each do |str|
+      ary.each_line do |str|
         found ||= the_page_source.include?(str)
       end
       return found

data/lib/rwebspec.rb

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

data/lib/watir_extensions.rb

@@ -1,65 +1,69 @@
+if RUBY_PLATFORM == "java" then
+  # no need to load firefox extension
+else
+  module FireWatir
+    class Firefox
 
-module FireWatir
-  class Firefox
+      @@firefox_started = false
 
-    @@firefox_started = false
-
-    def initialize(options = {})
-      if(options.kind_of?(Integer))
-        options = {:waitTime => options}
-      end
+      def initialize(options = {})
+        if(options.kind_of?(Integer))
+          options = {:waitTime => options}
+        end
 
-      if(options[:profile])
-        profile_opt = "-no-remote -P #{options[:profile]}"
-      else
-        profile_opt = ""
-      end
+        if(options[:profile])
+          profile_opt = "-no-remote -P #{options[:profile]}"
+        else
+          profile_opt = ""
+        end
 
-      waitTime = options[:waitTime] || 2
+        waitTime = options[:waitTime] || 2
 
-      case RUBY_PLATFORM
-      when /mswin/
-        # Get the path to Firefox.exe using Registry.
-        require 'win32/registry.rb'
-        path_to_bin = ""
-        Win32::Registry::HKEY_LOCAL_MACHINE.open('SOFTWARE\Mozilla\Mozilla Firefox') do |reg|
-          keys = reg.keys
-          reg1 = Win32::Registry::HKEY_LOCAL_MACHINE.open("SOFTWARE\\Mozilla\\Mozilla Firefox\\#{keys[0]}\\Main")
-          reg1.each do |subkey, type, data|
-            if(subkey =~ /pathtoexe/i)
-              path_to_bin = data
+        case RUBY_PLATFORM
+        when /mswin/
+          # Get the path to Firefox.exe using Registry.
+          require 'win32/registry.rb'
+          path_to_bin = ""
+          Win32::Registry::HKEY_LOCAL_MACHINE.open('SOFTWARE\Mozilla\Mozilla Firefox') do |reg|
+            keys = reg.keys
+            reg1 = Win32::Registry::HKEY_LOCAL_MACHINE.open("SOFTWARE\\Mozilla\\Mozilla Firefox\\#{keys[0]}\\Main")
+            reg1.each do |subkey, type, data|
+              if(subkey =~ /pathtoexe/i)
+                path_to_bin = data
+              end
             end
           end
-        end
 
-      when /linux/i
-        path_to_bin = `which firefox`.strip
-      when /darwin/i
-        path_to_bin = '/Applications/Firefox.app/Contents/MacOS/firefox'
-      when /java/
-        raise "Not implemented: Create a browser finder in JRuby"
-      end
+        when /linux/i
+          path_to_bin = `which firefox`.strip
+        when /darwin/i
+          path_to_bin = '/Applications/Firefox.app/Contents/MacOS/firefox'
+        when /java/
+          raise "Not implemented: Create a browser finder in JRuby"
+        end
 
-      @t = Thread.new { system("#{path_to_bin} -jssh #{profile_opt}")} unless @@firefox_started
+        @t = Thread.new { system("#{path_to_bin} -jssh #{profile_opt}")} unless @@firefox_started
 
-      sleep waitTime
-      begin
-        set_defaults()
-      rescue Watir::Exception::UnableToStartJSShException
-        if !@t # no new thread starting browser, try again
-          puts "Firefox with JSSH not detected after you indicated @@firefox_started"
-          @t = Thread.new { system("#{path_to_bin} -jssh #{profile_opt}")}
-          sleep waitTime
-          set_defaults
+        sleep waitTime
+        begin
+          set_defaults()
+        rescue Watir::Exception::UnableToStartJSShException
+          if !@t # no new thread starting browser, try again
+            puts "Firefox with JSSH not detected after you indicated @@firefox_started"
+            @t = Thread.new { system("#{path_to_bin} -jssh #{profile_opt}")}
+            sleep waitTime
+            set_defaults
+          end
         end
+        get_window_number()
+        set_browser_document()
       end
-      get_window_number()
-      set_browser_document()
-    end
 
-    def self.firefox_started=(value)
-      @@firefox_started = value
-    end
+      def self.firefox_started=(value)
+        @@firefox_started = value
+      end
 
+    end
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zhimin-rwebspec
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  version: 1.4.0.1
 platform: ruby
 authors: 
 - Zhimin Zhan