rwebspec 2.1.3 → 2.2.0

data/CHANGELOG

@@ -1,10 +1,8 @@
 CHANGELOG
 =========
- 2.1.3
- [Fix] Page object to include Utils module
 
- 2.1.2
- [Change] add @browser instance to page objects
+ 2.2.0
+ [Change] Drop support for firewatir
 
  2.1.1
  [Change] use Global variable for retry settings (instead of class variables)

data/Rakefile

@@ -71,7 +71,7 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec"
-  s.version = "2.1.3"
+  s.version = "2.2.0"
   s.summary = "Web application functional specification in Ruby"
   s.description = "Executable functional specification for web applications in RSpec syntax and Watir"
 

data/lib/rwebspec/driver.rb

@@ -102,11 +102,7 @@ module RWebSpec
     #
     def close_all_browsers
 			if @web_browser
-	      if is_firefox?
-	        FireWatir::Firefox.close_all
-	      else
-	        Watir::IE.close_all
-	      end
+	      Watir::IE.close_all
 			else
 				browser_type = $ITEST2_BROWSER ? $ITEST2_BROWSER.downcase.to_sym : :ie	
 	      WebBrowser.close_all_browsers(browser_type)				

data/lib/rwebspec/web_browser.rb

@@ -17,14 +17,6 @@ rescue LoadError => e
   $watir_loaded = false
 end
 
-begin
-  require "rubygems";
-  require "firewatir";
-  $firewatir_loaded = true
-rescue LoadError => e
-  puts e
-  $firewatir_loaded = false
-end
 
 begin
   require "rubygems";
@@ -34,7 +26,7 @@ rescue LoadError => e
   $celerity_loaded = false
 end
 
-raise "You have must at least Watir or Firewatir installed" unless $watir_loaded || $firewatir_loaded || $celerity_loaded
+raise "You have must at least Watir installed" unless $watir_loaded || $celerity_loaded
 
 module RWebSpec
 
@@ -56,50 +48,16 @@ module RWebSpec
 
       case RUBY_PLATFORM
       when /java/i
-        # Java, maybe firewatir or celerity
+        # Java, maybe 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
-        elsif $firewatir_loaded
-          initialize_firefox_browser(existing_browser, base_url, options)
-        else
+        raise "Not supported unless Celerity detected" unless $celerity_loaded
+        if $celerity_loaded then
           initialize_celerity_browser(base_url, options)
         end
-
       when /mswin|windows|mingw/i
-        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
-        initialize_firefox_browser(existing_browser, base_url, options)
-      end
-    end
-
-    def initialize_firefox_browser(existing_browser, base_url, options)
-      if existing_browser then
-        @browser = existing_browser
-        return
+        raise "Not supported, no Watir detected" unless $watir_loaded 
+        initialize_ie_browser(existing_browser, options)
       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 "The firefox brower with JSSH is not available, #{e}"
-        sleep 1
-      end
-      @browser = FireWatir::Firefox.start(base_url)
     end
 
     def initialize_celerity_browser(base_url, options)
@@ -167,15 +125,8 @@ module RWebSpec
     alias a link
     alias img image
 
-    # Wrapp of Watir's area to support Firefox and Watir
-    #
-    # Note: FireWatir does not support area directly, treat it as text_field
     def area(*args)
-      if is_firefox?
-        text_field(*args)
-      else
-        @browser.send("area", *args)
-      end
+      @browser.send("area", *args)
     end
 
     def modal_dialog(how=nil, what=nil)
@@ -270,8 +221,6 @@ module RWebSpec
 
     def page_title
       case @browser.class.to_s
-      when "FireWatir::Firefox"
-        @browser.title
       when "Watir::IE"
         @browser.document.title
       else
@@ -303,20 +252,13 @@ module RWebSpec
     end
 
     def is_firefox?
-      return false unless $firewatir_loaded
-      begin
-        @browser.class == FireWatir::Firefox
-      rescue => e
-        return false
-      end
+      return false
     end
 
     # Close the browser window.  Useful for automated test suites to reduce
     # test interaction.
     def close_browser
       case @browser.class.to_s
-      when "FireWatir::Firefox"
-        @browser.close
       when "Watir::IE"
         @browser.getIE.quit
       else
@@ -329,9 +271,6 @@ module RWebSpec
     def self.close_all_browsers(browser_type = :ie)      
 			if browser_type == :ie
         Watir::IE.close_all
-      elsif browser_type == :firefox
-        # raise "not supported in FireFox yet."
-				FireWatir::Firefox.new.close_all	
       end
     end
 
@@ -615,12 +554,7 @@ module RWebSpec
       default_options = {:browser => "IE"}
       options = default_options.merge(options)
       site_context = Context.new(options[:base_url]) if options[:base_url]
-      if (options[:browser] == "Firefox")
-        ff = FireWatir::Firefox.attach(how, what)        
-        return WebBrowser.new_from_existing(ff, site_context)
-      else
-        return WebBrowser.new_from_existing(Watir::IE.attach(how, what), site_context)
-      end
+      return WebBrowser.new_from_existing(Watir::IE.attach(how, what), site_context)
     end
 
     # Attach a Watir::IE instance to a popup window.

data/lib/rwebspec/web_page.rb

@@ -24,14 +24,14 @@ module RWebSpec
 
     include RWebSpec::Assert
     include RWebSpec::Driver
-    include RWebSpec::Utils
 
     # browser: passed to do assertion within the page
     # page_text: text used to identify the page, title will be the first candidate
     attr_accessor :page_specific_text
 
     def initialize(the_browser, page_specific_text = nil)
-      @web_browser = @browser =  @web_tester = the_browser
+      @web_browser = the_browser
+      @web_tester = the_browser
       @page_specific_text = page_specific_text
       begin
         snapshot if $TESTWISE_DUMP_PAGE || $ITEST2_DUMP_PAGE 

data/lib/rwebspec.rb

@@ -4,20 +4,6 @@
 #***********************************************************
 require "rubygems"
 
-# From 2.0, no default support for FireWatir. 
-#  
-if $ENABLE_FIREFOX 
-	# Try load firewatir first, which depends on ActiveSupport 
-	puts "Deprecated: Please use watir-webdriver or selenium-webdriver to run tests in Firefox"
-	begin
-	  require "firewatir";
-	  $firewatir_loaded = true
-	rescue LoadError => e
-	  puts e
-	  $firewatir_loaded = false
-	end
-end
-
 # Load active_support, so that we can use 1.days.ago
 begin
   require 'active_support/basic_object'
@@ -30,7 +16,7 @@ end
 require 'spec'
 
 unless defined? RWEBSPEC_VERSION
-  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "2.1.3"
+  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "2.2.0"
 end
 
 $testwise_polling_interval = 1 # seconds
@@ -63,7 +49,6 @@ require File.dirname(__FILE__) + "/rwebspec/load_test_helper"
 require File.dirname(__FILE__) + "/rwebspec/matchers/contains_text"
 require File.dirname(__FILE__) + "/extensions/rspec_extensions"
 
-require File.dirname(__FILE__) + "/extensions/firewatir_extensions" if $ENABLE_FIREFOX 
 if RUBY_PLATFORM =~ /mswin/ or RUBY_PLATFORM =~ /mingw/
 	require File.dirname(__FILE__) + "/extensions/watir_extensions"
   require File.dirname(__FILE__) + "/extensions/window_script_extensions.rb"

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rwebspec
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 2
-  - 1
-  - 3
-  version: 2.1.3
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Zhimin Zhan
@@ -14,16 +15,17 @@ autorequire: rwebspec
 bindir: bin
 cert_chain: []
 
-date: 2012-01-23 00:00:00 +10:00
-default_executable: 
+date: 2012-03-11 00:00:00 Z
 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
@@ -35,9 +37,11 @@ dependencies:
   name: commonwatir
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 0
@@ -57,7 +61,6 @@ files:
 - README
 - CHANGELOG
 - MIT-LICENSE
-- lib/extensions/firewatir_extensions.rb
 - lib/extensions/rspec_extensions.rb
 - lib/extensions/watir_extensions.rb
 - lib/extensions/window_script_extensions.rb
@@ -78,7 +81,6 @@ files:
 - lib/rwebspec/web_page.rb
 - lib/rwebspec/web_testcase.rb
 - lib/rwebspec.rb
-has_rdoc: true
 homepage: http://github.com/zhimin/rwebspec/tree/master
 licenses: []
 
@@ -88,23 +90,27 @@ 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.3.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Web application functional specification in Ruby

data/lib/extensions/firewatir_extensions.rb

@@ -1,74 +0,0 @@
-module FireWatir
-  class Firefox
-
-    @@firefox_started = false
-
-    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
-
-      waitTime = options[:waitTime] || 2
-
-      os = RUBY_PLATFORM
-      if RUBY_PLATFORM =~ /java/ then
-        require 'rbconfig'
-        os = Config::CONFIG['host_os']
-      end
-
-      case os
-      when /mswin/ || /mingw/
-        begin
-          # 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
-        rescue LoadError => e
-          path_to_bin = '"C:\Program Files\Mozilla Firefox\firefox.exe"'
-        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 "Error, should have set using rbconfig: #{os}"
-      end
-
-      @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
-        end
-      end
-      get_window_number()
-      set_browser_document()
-    end
-
-    def self.firefox_started=(value)
-      @@firefox_started = value
-    end
-
-  end
-end