zhimin-rwebspec 1.4.0.2 → 1.4.1

data/lib/rwebspec/itest_plugin.rb

@@ -1,68 +1,79 @@
-require 'socket'
-
-module RWebSpec
-  module ITestPlugin
-
-    def connect_to_itest(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
-    alias connect_to_itest2 connect_to_itest
-
-    def debug(message)
-      connect_to_itest(" DEBUG", message + "\r\n") if $RUN_IN_ITEST
-    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
-
-    # 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
-        caller.each_with_index do |position, idx|
-          next unless position =~ /\A(.*?):(\d+)/
-          file = $1
-          # TODO: send multiple trace to be parse with pages.rb
-          # next if file =~ /example\/example_methods\.rb$/ or file =~ /example\/example_group_methods\.rb$/ or file =~ /driver\.rb$/ or file =~ /timeout\.rb$/ # don't include rspec or ruby trace
-
-          if file.include?("_spec.rb") || file.include?("_test.rb") || file.include?("_cmd.rb")
-            connect_to_itest(" TRACE", position)
-          end
-
-          break if idx > 4 or file =~ /"_spec\.rb$/
-        end
-      rescue => e
-        puts "failed to capture log: #{e}"
-      end
-    end
-
-  end
-end
+require 'socket'
+
+module RWebSpec
+  module ITestPlugin
+
+    def connect_to_itest(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
+    alias connect_to_itest2 connect_to_itest
+
+    def debug(message)
+      connect_to_itest(" DEBUG", message + "\r\n") if $RUN_IN_ITEST
+    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
+
+    # 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_itest(" TRACE", trace_lines.reverse.join("|"))
+        end
+
+      rescue => e
+        puts "failed to capture log: #{e}"
+      end
+    end
+
+  end
+end

data/lib/rwebspec/web_browser.rb

@@ -361,6 +361,7 @@ module RWebSpec
     def click_button_with_caption(caption)
       wait_before_and_after { button(:caption, caption).click }
     end
+    alias click_button click_button_with_caption
 
     # Click a button with value
     # Usage:
@@ -557,6 +558,18 @@ module RWebSpec
     end
 
 
+    # Verify the next page following an operation.
+    #
+    # Typical usage:
+    #   browser.expect_page HomePage
+    def expect_page(page_clazz, argument = nil)
+      if argument
+        page_clazz.new(self, argument)
+      else
+        page_clazz.new(self)
+      end
+    end
+
     # is it running in MS Windows platforms?
     def self.is_windows?
       RUBY_PLATFORM.downcase.include?("mswin") or RUBY_PLATFORM.downcase.include?("mingw")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zhimin-rwebspec
 version: !ruby/object:Gem::Version 
-  version: 1.4.0.2
+  version: 1.4.1
 platform: ruby
 authors: 
 - Zhimin Zhan
@@ -76,7 +76,6 @@ files:
 - lib/watir_extensions.rb
 has_rdoc: true
 homepage: http://github.com/zhimin/rwebspec/tree/master
-licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -97,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: rwebspec
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Executable functional specification for web applications in RSpec syntax and Watir