rwebspec 1.9 → 1.9.2

data/CHANGELOG

@@ -1,9 +1,15 @@
 CHANGELOG
 =========
+ 1.9.2
+  [] TestWise 2 
+
+ 1.9.1
+  [Fix] test_utils sentences and paragraphs
+
  1.9
   [Upgrade] support Watir 2 syntax
-  alias tr row
-  alias a link
+  [Update] alias tr row
+  [Update] alias a link
   
 
  1.8.2

data/Rakefile

@@ -70,9 +70,9 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec"
-  s.version = "1.9"
+  s.version = "1.9.2"
   s.summary = "Executable functional specification for web applications in RSpec syntax and Watir"
-  # s.description = ""
+  s.description = "Executable functional specification for web applications in RSpec syntax and Watir"
 
   s.author  = "Zhimin Zhan"
   s.email   = "zhimin@agileway.com.au"
@@ -91,7 +91,7 @@ spec = Gem::Specification.new do |s|
   s.files = s.files + Dir.glob( "docs/**/*" )
   s.add_dependency(%q<rspec>, ["= 1.1.12"])
 
-  s.add_dependency("commonwatir", ">= 1.8.1")
+  s.add_dependency("commonwatir", ">= 2.0")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/lib/rwebspec/driver.rb

@@ -41,6 +41,7 @@ module RWebSpec
         puts "Unicode may not work in IE, #{e}"
       end
 
+      base_url ||= $TESTWISE_PROJECT_BASE_URL
       base_url ||= $ITEST2_PROJECT_BASE_URL
       base_url ||= $BASE_URL
       raise "base_url must be set" if base_url.nil?
@@ -53,8 +54,8 @@ module RWebSpec
                          :go => true}
 
       options = default_options.merge options
-      options[:firefox] = true if "Firefox" == $ITEST2_BROWSER || "Firefox" == $BROWSER
-      ($ITEST2_HIDE_BROWSER) ? $HIDE_IE = true : $HIDE_IE = false
+      options[:firefox] = true if "Firefox" == $ITEST2_BROWSER || "Firefox" == $TESTWISE_BROWSER || "Firefox" == $BROWSER
+      ($TESTWISE_HIDE_BROWSER || $ITEST2_HIDE_BROWSER) ? $HIDE_IE = true : $HIDE_IE = false
 
       if base_url =~ /^file:/
         uri_base = base_url
@@ -196,7 +197,7 @@ module RWebSpec
         if url && url =~ /^http/
             http_response = client.get(url).body
         else
-            base_url = $ITEST2_PROJECT_BASE_URL || $BASE_URL
+            base_url = $TESTWISE_PROJECT_BASE_URL || $ITEST2_PROJECT_BASE_URL || $BASE_URL
             http_response = client.get("#{base_url}#{url}").body
         end
 				
@@ -397,14 +398,14 @@ module RWebSpec
     end
 
     def default_dump_dir
-      if $ITEST2_RUNNING_SPEC_ID && $ITEST2_WORKING_DIR
+      if ($TESTWISE_RUNNING_SPEC_ID && $TESTWISE_WORKING_DIR) || ($ITEST2_RUNNING_SPEC_ID && $ITEST2_WORKING_DIR)
 
-        $ITEST2_DUMP_DIR = File.join($ITEST2_WORKING_DIR, "dump")
+        $TESTWISE_DUMP_DIR = $ITEST2_DUMP_DIR = File.join($ITEST2_WORKING_DIR, "dump")
         FileUtils.mkdir($ITEST2_DUMP_DIR) unless File.exists?($ITEST2_DUMP_DIR)
 
-        spec_run_id = $ITEST2_RUNNING_SPEC_ID
+        spec_run_id = $TESTWISE_RUNNING_SPEC_ID || $ITEST2_RUNNING_SPEC_ID
         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)
+        to_dir = File.join($TESTWISE_DUMP_DIR, spec_run_dir_name)
       else
         to_dir = ENV['TEMP_DIR'] || (is_windows? ? "C:\\temp" : "/tmp")
       end
@@ -973,29 +974,6 @@ module RWebSpec
       end
     end
 
-    # take_screenshot to save the current active window
-    # TODO can't move mouse
-    def take_screenshot_old
-      if is_windows? && $ITEST2_DUMP_PAGE
-        begin
-          puts "[DEBUG] Capturing screenshots..."
-          screenshot_image_filename =  "rwebspec_" + Time.now.strftime("%m%d%H%M%S") + ".jpg"
-          the_dump_dir = default_dump_dir
-          FileUtils.mkdir_p(the_dump_dir) unless File.exists?(the_dump_dir)
-          screenshot_image_filepath = File.join(the_dump_dir, screenshot_image_filename)
-
-          screenshot_image_filepath.gsub!("/", "\\") if is_windows?
-          screen_capture(screenshot_image_filepath, true)
-
-          notify_screenshot_location(screenshot_image_filepath)
-        rescue
-          puts "error: #{Failed to capture screen}"
-        end
-      end
-    end
-
-
-
     # use win32screenshot library to save curernt active window, which shall be IE
     #
     def take_screenshot

data/lib/rwebspec/rspec_helper.rb

@@ -80,7 +80,7 @@ module RWebSpec
 
     # When running
     def debugging?
-      $ITEST2_DEBUGGING && $ITEST2_RUNNING_AS == "test_case"
+      ($ITEST2_DEBUGGING && $ITEST2_RUNNING_AS == "test_case") || ($TESTWISE_DEBUGGING && $TESTWISE_RUNNING_AS == "test_case")
     end
 
     # RSpec Matchers

data/lib/rwebspec/test_utils.rb

@@ -133,7 +133,11 @@ module RWebSpec
     # Generate a given number of words. If a range is passed, it will generate
     # a random number of words within that range.
     def words(total)
-      (1..interpret_value(total)).map { WORDS[random_number(0, total)] }.join(' ')
+      if total.class == Range
+        (1..interpret_value(total)).map { WORDS[random_number(total.min, total.max)] }.join(' ')
+      else
+        (1..interpret_value(total)).map { WORDS[random_number(0, total)] }.join(' ')
+      end
     end
 
     # Generate a given number of sentences. If a range is passed, it will generate

data/lib/rwebspec/testwise_plugin.rb

@@ -1,83 +1,93 @@
-require 'socket'
-
-module RWebSpec
-  module TestWisePlugin
-
-    def debug(message)
-      connect_to_testwise(" DEBUG", message.to_s + "\r\n") if $RUN_IN_TESTWISE && message
-    end
-
-
-    # Support of iTest to ajust the intervals between keystroke/mouse operations
-    def operation_delay
-      begin
-        if $ITEST2_OPERATION_DELAY && $ITEST2_OPERATION_DELAY > 0 &&
-                $ITEST2_OPERATION_DELAY && $ITEST2_OPERATION_DELAY < 30000  then # max 30 seconds
-          sleep($ITEST2_OPERATION_DELAY / 1000)
-        end
-
-        while $ITEST2_PAUSE
-          debug("Paused, waiting ...")
-          sleep 1
-        end
-      rescue => e
-        puts "Error on delaying: #{e}"
-        # ignore
-      end
-    end
-
-    def notify_screenshot_location(image_file_path)
-      connect_to_testwise("  SHOT", image_file_path)
-    end
-
-    # find out the line (and file) the execution is on, and notify iTest via Socket
-    def dump_caller_stack
-      return unless $ITEST2_TRACE_EXECUTION
-      begin
-        trace_lines = []
-        trace_file = nil
-        found_first_spec_reference = false
-        caller.each_with_index do |position, idx|
-          next unless position =~ /\A(.*?):(\d+)/
-          trace_file = $1
-          if trace_file =~ /(_spec|_test|_rwebspec)\.rb\s*$/
-            found_first_spec_reference = true
-            trace_lines << position
-            break
-          end
-          trace_lines << position
-          break if trace_file =~ /example\/example_methods\.rb$/ or trace_file =~ /example\/example_group_methods\.rb$/
-          break if trace_lines.size > 10
-          # TODO: send multiple trace to be parse with pages.rb
-          # break if trace_file =~ /example\/example_methods\.rb$/ or trace_file =~ /example\/example_group_methods\.rb$/ or trace_file =~ /driver\.rb$/ or trace_file =~ /timeout\.rb$/ # don't include rspec or ruby trace
-        end
-
-        #  (trace_file.include?("_spec.rb") || trace_file.include?("_rwebspec.rb") || trace_file.include?("_test.rb") || trace_file.include?("_cmd.rb"))
-        if !trace_lines.empty?
-          connect_to_testwise(" TRACE", trace_lines.reverse.join("|"))
-        end
-
-      rescue => e
-        puts "failed to capture log: #{e}"
-      end
-    end
-
-
-    def connect_to_testwise (message_type, body)
-      begin
-        the_message = message_type + "|" + body
-        if @last_message == the_message then # ignore the message same as preivous one
-          return
-        end
-        itest_port = $ITEST2_TRACE_PORT || 7025
-        itest_socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-        itest_socket.connect(Socket.pack_sockaddr_in(itest_port, '127.0.0.1'))
-        itest_socket.puts(the_message)
-        @last_message = the_message
-        itest_socket.close
-      rescue => e
-      end
-    end
-
-  end
+require 'socket'
+
+module RWebSpec
+  module TestWisePlugin
+
+    def debug(message)
+      Thread.pass
+      connect_to_testwise(" DEBUG", message.to_s + "\r\n") if $RUN_IN_TESTWISE && message
+    end
+
+
+    # Support of iTest to ajust the intervals between keystroke/mouse operations
+    def operation_delay
+      begin
+        if $ITEST2_OPERATION_DELAY && $ITEST2_OPERATION_DELAY > 0 &&
+               $ITEST2_OPERATION_DELAY < 30000  then # max 30 seconds
+          Thread.pass
+          sleep($ITEST2_OPERATION_DELAY / 1000)
+        end    
+    		
+				if $TESTWISE_OPERATION_DELAY && $TESTWISE_OPERATION_DELAY > 0 &&
+                $TESTWISE_OPERATION_DELAY < 30000  then # max 30 seconds
+          Thread.pass
+          sleep($TESTWISE_OPERATION_DELAY / 1000)
+        end
+
+        while $TESTWISE_PAUSE || $ITEST2_PAUSE
+          Thread.pass
+          debug("Paused, waiting ...")
+          sleep 1
+        end
+      rescue => e
+        puts "Error on delaying: #{e}"
+        # ignore
+      end
+    end
+
+    def notify_screenshot_location(image_file_path)
+      connect_to_testwise("  SHOT", image_file_path)
+    end
+
+    # find out the line (and file) the execution is on, and notify iTest via Socket
+    def dump_caller_stack
+      return unless ($TESTWISE_TRACE_EXECUTION || $ITEST2_TRACE_EXECUTION)
+      begin
+        trace_lines = []
+        trace_file = nil
+        found_first_spec_reference = false
+        caller.each_with_index do |position, idx|
+          next unless position =~ /\A(.*?):(\d+)/
+          trace_file = $1
+          if trace_file =~ /(_spec|_test|_rwebspec)\.rb\s*$/ || trace_file =~ /\.feature$/
+            found_first_spec_reference = true
+            trace_lines << position
+            break
+          end
+          trace_lines << position
+          break if trace_file =~ /example\/example_methods\.rb$/ or trace_file =~ /example\/example_group_methods\.rb$/
+          break if trace_lines.size > 10
+          # TODO: send multiple trace to be parse with pages.rb
+          # break if trace_file =~ /example\/example_methods\.rb$/ or trace_file =~ /example\/example_group_methods\.rb$/ or trace_file =~ /driver\.rb$/ or trace_file =~ /timeout\.rb$/ # don't include rspec or ruby trace
+        end
+
+        #  (trace_file.include?("_spec.rb") || trace_file.include?("_rwebspec.rb") || trace_file.include?("_test.rb") || trace_file.include?("_cmd.rb"))
+        if !trace_lines.empty?
+          connect_to_testwise(" TRACE", trace_lines.reverse.join("|"))
+        end
+
+      rescue => e
+        puts "failed to capture log: #{e}"
+      end
+    end
+
+
+    def connect_to_testwise (message_type, body)
+      Thread.pass
+      begin
+        the_message = message_type + "|" + body
+        if @last_message == the_message then # ignore the message same as preivous one
+          return
+        end
+        itest_port = $TESTWISE_TRACE_PORT || $ITEST2_TRACE_PORT || 7025
+        itest_socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+        itest_socket.connect(Socket.pack_sockaddr_in(itest_port, '127.0.0.1'))
+        itest_socket.puts(the_message)
+        @last_message = the_message
+        itest_socket.close
+      rescue => e
+      end
+    end
+
+  end
 end

data/lib/rwebspec/web_browser.rb

@@ -111,24 +111,16 @@ module RWebSpec
     end
 
     def initialize_ie_browser(existing_browser, options)
-      if existing_browser then
-        @browser = existing_browser
-        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
-        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'
+      @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'
       else
         @browser.speed = :zippy
       end
+			
+			return if existing_browser
+
       @browser.activeObjectHighLightColor = options[:highlight_colour]
       @browser.visible = options[:visible] unless $HIDE_IE
       #NOTE: close_others fails
@@ -144,7 +136,7 @@ module RWebSpec
     end
 
     def self.reuse(base_url, options)
-      if self.is_windows? && $ITEST2_BROWSER != "Firefox"
+      if self.is_windows? && ($TESTWISE_BROWSER != "Firefox" && $ITEST2_BROWSER != "Firefox")
         Watir::IE.each do |browser_window|
           return WebBrowser.new(base_url, browser_window, options)
         end

data/lib/rwebspec/web_page.rb

@@ -34,8 +34,8 @@ module RWebSpec
       @web_tester = the_browser
       @page_specific_text = page_specific_text
       begin
-        snapshot if $ITEST2_DUMP_PAGE
-        delay = $ITEST2_PAGE_DELAY
+        snapshot if $TESTWISE_DUMP_PAGE || $ITEST2_DUMP_PAGE 
+        delay = $TESTWISE_PAGE_DELAY || $ITEST2_PAGE_DELAY
         sleep(delay)
       rescue => e
       end

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 9
-  version: "1.9"
+  - 2
+  version: 1.9.2
 platform: ruby
 authors: 
 - Zhimin Zhan
@@ -13,7 +14,7 @@ autorequire: rwebspec
 bindir: bin
 cert_chain: []
 
-date: 2011-08-11 00:00:00 +10:00
+date: 2011-08-18 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,13 +39,12 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 8
-        - 1
-        version: 1.8.1
+        - 2
+        - 0
+        version: "2.0"
   type: :runtime
   version_requirements: *id002
-description: 
+description: Executable functional specification for web applications in RSpec syntax and Watir
 email: zhimin@agileway.com.au
 executables: []