rwebspec 2.2.0 → 3.0

data/CHANGELOG

@@ -1,8 +1,25 @@
 CHANGELOG
 =========
 
+WATIR CHANGES
+[web_browser.rb]
+- remove waitForIE
+- select_list(...).set => select_list().select
+- cell removed.
+[assert.rb] assert_radio_option_checked (isSet? => set?)
+
+[TestWise]
+- can take screenshot, but not shown in report
+
  2.2.0
  [Change] Drop support for firewatir
+ [Enhancement] Set limit on message size sent to TestWise IDE
+
+ 2.1.3
+ [Fix] Page object to include Utils module
+
+ 2.1.2
+ [Change] add @browser instance to page objects
 
  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.2.0"
+  s.version = "3.0"
   s.summary = "Web application functional specification in Ruby"
   s.description = "Executable functional specification for web applications in RSpec syntax and Watir"
 
@@ -91,7 +91,7 @@ spec = Gem::Specification.new do |s|
   s.files = s.files + Dir.glob( "sample/**/*")
   s.files = s.files + Dir.glob( "docs/**/*" )
   s.add_dependency(%q<rspec>, ["= 1.1.12"])
-  s.add_dependency("commonwatir", ">= 2.0")
+  s.add_dependency("commonwatir", ">= 3.0")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/lib/extensions/watir_extensions.rb

@@ -1,85 +1,6 @@
-gem 'watir'
-require 'fileutils'
-require 'watir/container'
-require 'watir/element_collections'
-require 'watir/element'
-
-module Watir
-  # Base class for html elements.
-  # This is not a class that users would normally access.
-  class Element
-
-    def method_missing(method_name, *args, &block)
-
-      if ($TESTWISE_DIR || $TESTWISE_BROWSER) &&  method_name.to_s =~ /(.*)_no_wait/ && self.respond_to?($1)
-        ruby_code = testwise_generate_ruby_code(self, $1, *args)
-        testwise_click_no_wait(ruby_code)
-
-      elsif method_name.to_s =~ /(.*)_no_wait/ && self.respond_to?($1)
-        puts "[Watir] handle it"
-        assert_exists
-        assert_enabled
-        highlight(:set)
-        ruby_code = generate_ruby_code(self, $1, *args)
-        system(spawned_no_wait_command(ruby_code))
-        highlight(:clear)
-      else
-        super
-      end
-
-    end
-
-
-    def testwise_generate_ruby_code(element, method_name, *args)
-      element = "#{self.class}.new(#{@page_container.attach_command}, :unique_number, #{self.unique_number})"
-      method = build_method(method_name, *args)
-      watir_load_path = []
-      watir_lib_path = nil
-      $LOAD_PATH.each do |x|
-        if x =~ /rautomation/ || x =~ /watir/
-          watir_load_path << x
-          if x =~ /\/gems\/watir-/
-            watir_lib_path = x
-          end
-        end
-      end
-      watir_load_path = $LOAD_PATH
-      ruby_code = "$:.unshift(#{watir_load_path.map {|p| "'#{p}'" }.join(").unshift(")});" <<
-      "require '#{watir_lib_path}/watir/core';#{element}.#{method};"
-      return ruby_code
-    end
-
-    # customiiation here
-    #
-    def testwise_click_no_wait(ruby_code)
-      begin
-        puts "[TestWise] I am handling it"
-        assert_exists
-        assert_enabled
-        highlight(:set)
-        current_path = File.expand_path(".")
-
-        # not necessary
-        # ruby_code.gsub("C:/Program Files/TestWise/vendor/bundle/ruby/1.8", "C:/rubyshell/ruby/lib/ruby/gems/1.8")
-
-        # Trick 1: need to set RUBYOPT, otherwise might get -F error    
-        ENV["RUBYOPT"] = "-rubygems"
-        
-        # Trick 2: need to wrap no-wait click operation in a thread
-        Thread.new do
-	        # this will pop up Windows Command window
-          # system("ruby", "-e", ruby_code)
-          system("rubyw", "-e", ruby_code)
-        end
-        highlight(:clear)
-      rescue RuntimeError => re
-        puts re.backtrace
-
-      rescue => e
-        puts "Failed to click_no_wait: #{e.backtrace}"
-        raise e
-      end
-    end
-
-  end
-end
+##  
+# Watir's click_no_wait won't work without the line below in TestWise
+#
+# The idea is set to load rubygems correctly when invoke system("ruby") 
+# in the framework
+ENV["RUBYOPT"] = "-rubygems"

data/lib/plugins/testwise_plugin.rb

@@ -1,11 +1,20 @@
 require 'socket'
 
+MAX_MESSAGE_LENGTH = 8192 # < 10K
+
 module RWebSpec
   module TestWisePlugin
 
     def debug(message)
       Thread.pass
-      connect_to_testwise(" DEBUG", message.to_s + "\r\n") if $RUN_IN_TESTWISE && message
+			if $RUN_IN_TESTWISE && message					
+				the_sent_msg = message.to_s
+				if the_sent_msg.size > MAX_MESSAGE_LENGTH 
+					the_sent_msg = the_sent_msg[0..MAX_MESSAGE_LENGTH] + "..."
+				end
+	      connect_to_testwise(" DEBUG",  the_sent_msg + "\r\n") 
+			end
+			
     end
 
 

data/lib/rwebspec.rb

@@ -16,7 +16,7 @@ end
 require 'spec'
 
 unless defined? RWEBSPEC_VERSION
-  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "2.2.0"
+  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "3.0"
 end
 
 $testwise_polling_interval = 1 # seconds
@@ -49,9 +49,10 @@ require File.dirname(__FILE__) + "/rwebspec/load_test_helper"
 require File.dirname(__FILE__) + "/rwebspec/matchers/contains_text"
 require File.dirname(__FILE__) + "/extensions/rspec_extensions"
 
+# Watir 3 API Changes, no Watir/Container
 if RUBY_PLATFORM =~ /mswin/ or RUBY_PLATFORM =~ /mingw/
 	require File.dirname(__FILE__) + "/extensions/watir_extensions"
-  require File.dirname(__FILE__) + "/extensions/window_script_extensions.rb"
+#  require File.dirname(__FILE__) + "/extensions/window_script_extensions.rb"
 end
 
 require File.dirname(__FILE__) + "/plugins/testwise_plugin.rb"

data/lib/rwebspec/assert.rb

@@ -98,7 +98,7 @@ module RWebSpec
     def assert_checkbox_not_selected(checkbox_name)
       @web_browser.checkboxes.each { |checkbox|
         if (checkbox.name == checkbox_name) then
-          perform_assertion {  assert(!checkbox.isSet?, "Checkbox #{checkbox_name} is checked unexpectly") }
+          perform_assertion {  assert(!checkbox.set?, "Checkbox #{checkbox_name} is checked unexpectly") }
         end
       }
     end
@@ -108,7 +108,7 @@ module RWebSpec
     def assert_checkbox_selected(checkbox_name)
       @web_browser.checkboxes.each { |checkbox|
         if (checkbox.name == checkbox_name) then
-          perform_assertion { assert(checkbox.isSet?, "Checkbox #{checkbox_name} not checked") }
+          perform_assertion { assert(checkbox.set?, "Checkbox #{checkbox_name} not checked") }
         end
       }
     end
@@ -120,7 +120,7 @@ module RWebSpec
     def assert_option_value_not_present(select_name, option_value)
       @web_browser.select_lists.each { |select|
         continue unless select.name == select_name
-        select.o.each do |option| # items in the list
+        select.options.each do |option| # items in the list
           perform_assertion {  assert(!(option.value == option_value), "unexpected select option: #{option_value} for #{select_name} found") }
         end
       }
@@ -131,7 +131,7 @@ module RWebSpec
     def assert_option_not_present(select_name, option_label)
       @web_browser.select_lists.each { |select|
         next unless select.name == select_name
-        select.o.each do |option| # items in the list
+        select.options.each do |option| # items in the list
           perform_assertion {  assert(!(option.text == option_label), "unexpected select option: #{option_label} for #{select_name} found") }
         end
       }
@@ -142,7 +142,7 @@ module RWebSpec
     def assert_option_value_present(select_name, option_value)
       @web_browser.select_lists.each { |select|
         next unless select.name == select_name
-        select.o.each do |option| # items in the list
+        select.options.each do |option| # items in the list
           return if option.value == option_value
         end
       }
@@ -155,7 +155,7 @@ module RWebSpec
     def assert_option_present(select_name, option_label)
       @web_browser.select_lists.each { |select|
         next unless select.name == select_name
-        select.o.each do |option| # items in the list
+        select.options.each do |option| # items in the list
           return if option.text == option_label
         end
       }
@@ -168,7 +168,7 @@ module RWebSpec
     def assert_option_equals(select_name, option_label)
       @web_browser.select_lists.each { |select|
         next unless select.name == select_name
-        select.o.each do |option| # items in the list
+        select.options.each do |option| # items in the list
           if (option.text == option_label) then
             perform_assertion { assert_equal(select.value, option.value, "Select #{select_name}'s value is not equal to expected option label: '#{option_label}'") }
           end
@@ -211,7 +211,7 @@ module RWebSpec
     def assert_radio_option_selected(radio_group, radio_option)
       @web_browser.radios.each { |radio|
         if (radio.name == radio_group and radio_option == radio.value) then
-          perform_assertion { assert(radio.isSet?, "Radio button #{radio_group}-[#{radio_option}] not checked") }
+          perform_assertion { assert(radio.set?, "Radio button #{radio_group}-[#{radio_option}] not checked") }
         end
       }
     end
@@ -222,7 +222,7 @@ module RWebSpec
     def assert_radio_option_not_selected(radio_group, radio_option)
       @web_browser.radios.each { |radio|
         if (radio.name == radio_group and radio_option == radio.value) then
-          perform_assertion {  assert(!radio.isSet?, "Radio button #{radio_group}-[#{radio_option}] checked unexpected") }
+          perform_assertion {  assert(!radio.set?, "Radio button #{radio_group}-[#{radio_option}] checked unexpected") }
         end
       }
     end

data/lib/rwebspec/driver.rb

@@ -60,7 +60,7 @@ module RWebSpec
         uri_base = "#{uri.scheme}://#{uri.host}:#{uri.port}"
       end
 
-      if options[:start_new] || $celerity_loaded
+      if options[:start_new]
         @web_browser = WebBrowser.new(uri_base, nil, options)
       else
         @web_browser = WebBrowser.reuse(uri_base, options) # Reuse existing browser
@@ -151,10 +151,6 @@ module RWebSpec
       @web_browser.is_firefox? if @web_browser
     end
 
-    def is_celerity? 
-      RUBY_PLATFORM =~ /java/ && @web_browser
-    end
-
     # Go to another page on the testing site.
     #
     #  open_browser("http://www.itest2.com")
@@ -264,14 +260,14 @@ module RWebSpec
     # table 	<table> tags, including row and cell methods for accessing nested elements
     # text_field 	<input> tags with the type=text (single-line), type=textarea (multi-line), and type=password
     # p 	<p> (paragraph) tags, because
-    [:area, :button, :cell, :checkbox, :div, :form, :frame, :h1, :h2, :h3, :h4, :h5, :h6, :hidden, :image, :li, :link, :map, :pre, :row, :radio, :select_list, :span, :table, :text_field, :paragraph, :file_field, :label].each do |method|
+    [:area, :button, :td, :checkbox, :div, :form, :frame, :h1, :h2, :h3, :h4, :h5, :h6, :hidden, :image, :li, :link, :map, :pre, :tr, :radio, :select_list, :span, :table, :text_field, :paragraph, :file_field, :label].each do |method|
       define_method method do |* args|
         perform_operation { @web_browser.send(method, * args) if @web_browser }
       end
     end
-    alias td cell
+    alias cell td
     alias check_box checkbox # seems watir doc is wrong, checkbox not check_box
-    alias tr row
+    alias row tr
     alias a link
     alias img image
 
@@ -765,45 +761,8 @@ module RWebSpec
       login_win.click_button("OK")
     end
 
-    # Use JSSH to pass authentication
-    #  Window title "Authentication required"
-    def basic_authentication_firefox(username, password, wait = 3)
-      jssh_command = "
-    var length = getWindows().length;
-    var win;
-    var found = false;
-    for (var i = 0; i < length; i++) {
-      win = getWindows()[i];
-      if(win.document.title == \"Authentication Required\") {
-        found = true;
-        break;
-      }
-    }
-    if (found) {
-      var jsdocument = win.document;
-      var dialog = jsdocument.getElementsByTagName(\"dialog\")[0];
-      jsdocument.getElementsByTagName(\"textbox\")[0].value = \"#{username}\";
-      jsdocument.getElementsByTagName(\"textbox\")[1].value = \"#{password}\";
-      dialog.getButton(\"accept\").click();
-    }
-    \n"
-      sleep(wait)
-      $jssh_socket.send(jssh_command, 0)
-      # read_socket()
-    end
-
-    def basic_authentication_celerity(username, password)
-      @web_browser.celerity.credentials = "#{username}:#{password}"
-    end
-
     def basic_authentication(username, password, options = {})
-      if is_celerity?
-        basic_authentication_celerity(username, password)
-      elsif is_firefox?
-        basic_authentication_firefox(username, password)
-      else
-        basic_authentication_ie(options[:title], username, password, options)
-      end
+      basic_authentication_ie(options[:title], username, password, options)
     end
 
 	 # end of methods

data/lib/rwebspec/web_browser.rb

@@ -17,16 +17,7 @@ rescue LoadError => e
   $watir_loaded = false
 end
 
-
-begin
-  require "rubygems";
-  require "celerity";
-  $celerity_loaded = true
-rescue LoadError => e
-  $celerity_loaded = false
-end
-
-raise "You have must at least Watir installed" unless $watir_loaded || $celerity_loaded
+raise "You have must at least Watir installed" unless $watir_loaded
 
 module RWebSpec
 
@@ -46,33 +37,15 @@ module RWebSpec
       options = default_options.merge options
       @context = Context.new base_url if base_url
 
-      case RUBY_PLATFORM
-      when /java/i
-        # Java, maybe celerity
-        puts "Ruby java platform"
-        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 detected" unless $watir_loaded 
-        initialize_ie_browser(existing_browser, options)
-      end
+      initialize_ie_browser(existing_browser, options)
     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)}
-      @browser = Celerity::Browser.new(options)
-      @browser.goto(base_url)
-    end
 
     def initialize_ie_browser(existing_browser, options)
       @browser = existing_browser ||  Watir::IE.new
-      if ($TESTWISE_EMULATE_TYPING && $TESTWISE_TYPING_SPEED) || ($ITEST2_EMULATE_TYPING && $ITEST2_TYPING_SPEED) then
-        @browser.set_slow_speed if $TESTWISE_TYPING_SPEED == "slow" || $ITEST2_TYPING_SPEED == 'slow'
-        @browser.set_fast_speed if $TESTWISE_TYPING_SPEED == 'fast' || $ITEST2_TYPING_SPEED == 'fast'
+      if ($TESTWISE_EMULATE_TYPING && $TESTWISE_TYPING_SPEED) then
+        @browser.set_slow_speed if $TESTWISE_TYPING_SPEED == "slow"
+        @browser.set_fast_speed if $TESTWISE_TYPING_SPEED == 'fast'
       else
         @browser.speed = :zippy
       end
@@ -114,14 +87,14 @@ module RWebSpec
     ##
     #  Delegate to Watir
     #
-    [:button, :cell, :checkbox, :div, :form, :frame, :h1, :h2, :h3, :h4, :h5, :h6, :hidden, :image, :li, :link, :map, :pre, :row, :radio, :select_list, :span, :table, :text_field, :paragraph, :file_field, :label].each do |method|
+    [:button, :td, :checkbox, :div, :form, :frame, :h1, :h2, :h3, :h4, :h5, :h6, :hidden, :image, :li, :link, :map, :pre, :tr, :radio, :select_list, :span, :table, :text_field, :paragraph, :file_field, :label].each do |method|
       define_method method do |*args|
         @browser.send(method, *args)
       end
     end
-    alias td cell
+    alias cell td
     alias check_box checkbox  # seems watir doc is wrong, checkbox not check_box
-    alias tr row
+    alias row tr
     alias a link
     alias img image
 
@@ -258,12 +231,7 @@ module RWebSpec
     # Close the browser window.  Useful for automated test suites to reduce
     # test interaction.
     def close_browser
-      case @browser.class.to_s
-      when "Watir::IE"
-        @browser.getIE.quit
-      else
-        puts "#{@browser.class} can't close, ignore"
-      end
+      @browser.close
       sleep 2
     end
     alias close close_browser
@@ -298,11 +266,8 @@ module RWebSpec
     # performed.  Most action methods in Watir::Simple already call this before
     # and after.
     def wait_for_browser
-      if $celerity_loaded then
-        # puts "ignore, using celerity"
-      else
-        @browser.waitForIE unless is_firefox?
-      end
+			  # Watir 3 does not support it any more
+        # @browser.waitForIE unless is_firefox?
     end
 
 
@@ -330,6 +295,7 @@ module RWebSpec
     #    ....
     #    goto_page("/purchase")  # full url => http://www.itest.com/purchase
     def goto_page(page)
+			# puts "DEBUG calling goto page => #{page}" 
       @browser.goto full_url(page);
     end
 
@@ -606,18 +572,6 @@ module RWebSpec
 
     # return underlying browser
     def ie
-      raise "can't call this as it is configured to use Firefox" if is_firefox?
-      @browser
-    end
-
-    # return underlying firefox browser object, raise error if not running using Firefox
-    def firefox
-      raise "can't call this as it is configured to use IE" unless is_firefox?
-      @browser
-    end
-
-    def celerity
-      raise "can't call this as it is configured to use Celerity" unless RUBY_PLATFORM =~ /java/
       @browser
     end
 

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 = the_browser
-      @web_tester = the_browser
+      @web_browser = @browser =  @web_tester = the_browser
       @page_specific_text = page_specific_text
       begin
         snapshot if $TESTWISE_DUMP_PAGE || $ITEST2_DUMP_PAGE 

metadata

@@ -1,13 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: rwebspec
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
+  prerelease: false
   segments: 
-  - 2
-  - 2
+  - 3
   - 0
-  version: 2.2.0
+  version: "3.0"
 platform: ruby
 authors: 
 - Zhimin Zhan
@@ -15,17 +13,16 @@ autorequire: rwebspec
 bindir: bin
 cert_chain: []
 
-date: 2012-03-11 00:00:00 Z
+date: 2012-04-30 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
@@ -37,15 +34,13 @@ dependencies:
   name: commonwatir
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
-        - 2
+        - 3
         - 0
-        version: "2.0"
+        version: "3.0"
   type: :runtime
   version_requirements: *id002
 description: Executable functional specification for web applications in RSpec syntax and Watir
@@ -81,6 +76,7 @@ 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: []
 
@@ -90,27 +86,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.8.15
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Web application functional specification in Ruby