rwebspec 6.2.0 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5573de85d53760dcc6e601d4f580262f76359ce
-  data.tar.gz: c6d7642e66b2684c68a8905c95cf7c7d5f306fe0
+  metadata.gz: fe3a0a083f9ec7923ca112fdcdf56d622859e6c6
+  data.tar.gz: 4dff3812fcf3995a6d5ca4a8182b6735dc88508e
 SHA512:
-  metadata.gz: 47638dcb16b3bf65e5a824b9c381764afc791ccdc13eff0bdc800b4d0ffd5956787b5134893e35181ecd27f9e8f750277454525eb3820b92740766f79c927a2d
-  data.tar.gz: 4df38f3a99225a8fdacbec2b37838a06b7028a2d4471e92a58142f8148509507b79fdb1c35881767797f19899691a2371db004f28c8938c60e0ca2eafdc6e5a9
+  metadata.gz: 98b92a1d388de81b48ad5703c687f926192fbd80713f6b13458fb0eb3fd9b490aa50376410f1dac4f1c6b3c3a098e21b52c168da8feaa7a0ccdffaa94cf9c905
+  data.tar.gz: e3ed768733939ac7d6dc918b46c995c4aec48f13c30c187d47573f4c28e6f75db5e3de1e3932178613d8f17a010069666977a027d436499a696b50a1d0d03c58

data/CHANGELOG

@@ -1,6 +1,9 @@
 CHANGELOG
 =========
 
+6.2.1
+[Fix] More compatible with TestWise 4
+
 6.2
 [Change] Support TestWise 5 pause
 

data/Rakefile

@@ -77,7 +77,7 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec"
-  s.version = "6.2.0"
+  s.version = "6.2.1"
   s.summary = "Web application functional specification in Ruby"
   s.description = "Executable functional specification for web applications in RSpec syntax with Watir or Selenium WebDriver"
 

data/lib/plugins/testwise_plugin.rb

@@ -14,7 +14,7 @@ module RWebSpec
       return $TESTWISE_DEBUGGING && $TESTWISE_RUNNING_AS == "test_case"
     end
 
-    def debug(message)
+    def write_to_console(message)
       Thread.pass
   		if (ENV["RUN_IN_TESTWISE"] && ENV["RUN_IN_TESTWISE"].to_s == "true" || $RUN_IN_TESTWISE) && message 
   			the_sent_msg = message.to_s
@@ -26,7 +26,7 @@ module RWebSpec
   			puts message
   		end
     end
-    alias write_to_console debug
+    alias debug write_to_console
 
 
     # Support of TestWise to ajust the intervals between keystroke/mouse operations
@@ -88,24 +88,30 @@ module RWebSpec
     end
 
 
-    def connect_to_testwise (message_type, body)
+    def connect_to_testwise(message_type, body)
       Thread.pass
+      testwise_port = $TESTWISE_TRACE_PORT || ENV["TESTWISE_TRACE_PORT"].to_i || 7025
+      testwise_socket = nil
       begin
         the_message = message_type + "|" + body
         if @last_message == the_message then # ignore the message same as preivous one
           return
         end
-        testwise_port = ENV["TESTWISE_TRACE_PORT"].to_i || $TESTWISE_TRACE_PORT || 7025
         testwise_socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
         testwise_socket.connect(Socket.pack_sockaddr_in(testwise_port, '127.0.0.1'))
         testwise_socket.puts(the_message)
         @last_message = the_message
-        testwise_socket.close
       rescue => e
+        puts "Failed to connect to TestWise on port #{testwise_port}, #{e}, #{e.backtrace}"
+      ensure 
+        if testwise_socket
+          testwise_socket.close();
+        end
       end
     end
 
     def check_for_pause
+      
       json_data = fetch_debug_server_status
 
       if json_data["testwise_ready_to_pause"]
@@ -126,11 +132,14 @@ module RWebSpec
 
     def fetch_debug_server_status
       testwise_debug_server_port =  ENV["TESTWISE_DEBUG_PORT"].to_i || $TESTWISE_DEBUG_PORT || 7035
-      server = TCPSocket.open("127.0.0.1", testwise_debug_server_port)
-      server.puts("debug_status")
-      msg = server.gets.chomp
-      server.close
-      json_data = JSON.parse(msg)
+      if testwise_debug_server_port 
+        puts "debug server port: #{testwise_debug_server_port}"
+        server = TCPSocket.open("127.0.0.1", testwise_debug_server_port)
+        server.puts("debug_status")
+        msg = server.gets.chomp
+        server.close
+        json_data = JSON.parse(msg)
+      end
     end
 
   end

data/lib/rwebspec-webdriver/driver.rb

@@ -347,7 +347,10 @@ module RWebSpec
         begin
           dump_caller_stack
           operation_delay
-					check_for_pause
+          if defined? TestWiseRuntimeSupport
+					  check_for_pause
+			    end
+			  
           yield
         rescue RuntimeError => re
           puts "[DEBUG] operation error: #{re}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rwebspec
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.2.1
 platform: ruby
 authors:
 - Zhimin Zhan
 autorequire: rwebspec
 bindir: bin
 cert_chain: []
-date: 2015-10-25 00:00:00.000000000 Z
+date: 2015-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec