rwebspec 3.1.0 → 3.1.3

data/CHANGELOG

@@ -1,6 +1,9 @@
 CHANGELOG
 =========
 
+3.1.3
+- changed rows => trs, cells => tds with Watir 3
+
 3.1 (may break existing test)
 - Support RSpec 2
 

data/Rakefile

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rdoc' # require rdoc 2
@@ -23,10 +23,10 @@ task :clean do
 end
 
 desc 'Run all specs'
-Spec::Rake::SpecTask.new('spec') do |t|
+RSpec::Core::RakeTask.new('spec') do |t|
   t.spec_opts = ['--format', 'specdoc', '--colour']
   # t.libs = ["lib", "server/lib" ]
-  t.spec_files = Dir['spec/**/*_spec.rb'].sort
+  t.pattern = Dir['spec/**/*_spec.rb'].sort
 end
 
 # Generate the RDoc documentation
@@ -71,7 +71,7 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec"
-  s.version = "3.1.0"
+  s.version = "3.1.3"
   s.summary = "Web application functional specification in Ruby"
   s.description = "Executable functional specification for web applications in RSpec syntax and Watir"
 

data/lib/plugins/testwise_plugin.rb

@@ -1,6 +1,7 @@
 require 'socket'
 
 MAX_MESSAGE_LENGTH = 8192 # < 10K
+$testwise_support = true
 
 module RWebSpec
   module TestWisePlugin
@@ -28,7 +29,7 @@ module RWebSpec
           sleep($TESTWISE_OPERATION_DELAY / 1000)
         end
 
-        while $TESTWISE_PAUSE || $ITEST2_PAUSE
+        while $TESTWISE_PAUSE
           Thread.pass
           debug("Paused, waiting ...")
           sleep 1
@@ -45,7 +46,7 @@ module RWebSpec
 
     # 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)
+      return unless ($TESTWISE_TRACE_EXECUTION)
       begin
         trace_lines = []
         trace_file = nil
@@ -83,7 +84,7 @@ module RWebSpec
         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_port = $TESTWISE_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)

data/lib/rwebspec/driver.rb

@@ -38,7 +38,7 @@ module RWebSpec
       end
 
       base_url ||= $TESTWISE_PROJECT_BASE_URL
-      base_url ||= $ITEST2_PROJECT_BASE_URL
+      base_url ||= $TESTWISE_PROJECT_BASE_URL
       base_url ||= $BASE_URL
       raise "base_url must be set" if base_url.nil?
 
@@ -50,8 +50,8 @@ module RWebSpec
                          :go => true}
 
       options = default_options.merge options
-      options[:firefox] = true if "Firefox" == $ITEST2_BROWSER || "Firefox" == $TESTWISE_BROWSER || "Firefox" == $BROWSER
-      ($TESTWISE_HIDE_BROWSER || $ITEST2_HIDE_BROWSER) ? $HIDE_IE = true : $HIDE_IE = false
+      options[:firefox] = true if "Firefox" == $TESTWISE_BROWSER || "Firefox" == $TESTWISE_BROWSER || "Firefox" == $BROWSER
+      ($TESTWISE_HIDE_BROWSER || $TESTWISE_HIDE_BROWSER) ? $HIDE_IE = true : $HIDE_IE = false
 
       if base_url =~ /^file:/
         uri_base = base_url
@@ -89,7 +89,7 @@ module RWebSpec
     def close_browser
       if @web_browser
         # Old TestWise version
-        # @web_browser.close_browser unless $ITEST2_LEAVE_BROWSER_OPEN_AFTER_RUN
+        # @web_browser.close_browser unless $TESTWISE_LEAVE_BROWSER_OPEN_AFTER_RUN
         @web_browser.close_browser
       else
 				close_all_browsers
@@ -104,7 +104,7 @@ module RWebSpec
 			if @web_browser
 	      Watir::IE.close_all
 			else
-				browser_type = $ITEST2_BROWSER ? $ITEST2_BROWSER.downcase.to_sym : :ie	
+				browser_type = $TESTWISE_BROWSER ? $TESTWISE_BROWSER.downcase.to_sym : :ie	
 	      WebBrowser.close_all_browsers(browser_type)				
 			end
     end
@@ -185,7 +185,7 @@ module RWebSpec
         if url && url =~ /^http/
             http_response = client.get(url).body
         else
-            base_url = $TESTWISE_PROJECT_BASE_URL || $ITEST2_PROJECT_BASE_URL || $BASE_URL
+            base_url = $TESTWISE_PROJECT_BASE_URL || $TESTWISE_PROJECT_BASE_URL || $BASE_URL
             http_response = client.get("#{base_url}#{url}").body
         end
 				
@@ -281,14 +281,14 @@ module RWebSpec
     alias go_back back
     alias go_forward forward
 
-    [:images, :links, :buttons, :select_lists, :checkboxes, :radios, :text_fields, :divs, :dls, :dds, :dts, :ems, :lis, :maps, :spans, :strongs, :ps, :pres, :labels, :cells, :rows].each do |method|
+    [:images, :links, :buttons, :select_lists, :checkboxes, :radios, :text_fields, :divs, :dls, :dds, :dts, :ems, :lis, :maps, :spans, :strongs, :ps, :pres, :labels, :tds, :trs].each do |method|
       define_method method do
         perform_operation { @web_browser.send(method) if @web_browser }
       end
     end
 		alias as links
-		alias trs rows
-		alias tds cells
+		alias rows trs
+		alias cells tds 
 		alias imgs images
 
 	
@@ -386,12 +386,12 @@ module RWebSpec
     end
 
     def default_dump_dir
-      if ($TESTWISE_RUNNING_SPEC_ID && $TESTWISE_WORKING_DIR) || ($ITEST2_RUNNING_SPEC_ID && $ITEST2_WORKING_DIR)
+      if ($TESTWISE_RUNNING_SPEC_ID && $TESTWISE_WORKING_DIR) || ($TESTWISE_RUNNING_SPEC_ID && $TESTWISE_WORKING_DIR)
 
-        $TESTWISE_DUMP_DIR = $ITEST2_DUMP_DIR = File.join($ITEST2_WORKING_DIR, "dump")
-        FileUtils.mkdir($ITEST2_DUMP_DIR) unless File.exists?($ITEST2_DUMP_DIR)
+        $TESTWISE_DUMP_DIR = $TESTWISE_DUMP_DIR = File.join($TESTWISE_WORKING_DIR, "dump")
+        FileUtils.mkdir($TESTWISE_DUMP_DIR) unless File.exists?($TESTWISE_DUMP_DIR)
 
-        spec_run_id = $TESTWISE_RUNNING_SPEC_ID || $ITEST2_RUNNING_SPEC_ID
+        spec_run_id = $TESTWISE_RUNNING_SPEC_ID || $TESTWISE_RUNNING_SPEC_ID
         spec_run_dir_name = spec_run_id.to_s.rjust(4, "0") unless spec_run_id == "unknown"
         to_dir = File.join($TESTWISE_DUMP_DIR, spec_run_dir_name)
       else

data/lib/rwebspec/rspec_helper.rb

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

data/lib/rwebspec/test_utils.rb

@@ -388,5 +388,43 @@ module RWebSpec
       array.inject(0.0) { |sum, e| sum + e }
     end
 
+		## Data Driven Tests
+		#
+		#  Processing each row in a CSV file, must have heading rows
+		# 
+		#  Usage:
+		# 
+		#   process_each_row_in_csv_file(@csv_file) { |row| 
+		#     goto_page("/")
+		#     enter_text("username", row[1])
+		#     enter_text("password", row[2])
+		#     click_button("Sign in")
+		#     page_text.should contain(row[3])
+		#     failsafe{ click_link("Sign off") }
+		#   }
+	  #
+		def process_each_row_in_csv_file(csv_file, &block)
+	    require 'faster_csv'
+	    connect_to_testwise("CSV_START",  csv_file) if $testwise_support
+	    has_error = false
+	    idx = 0
+	    FasterCSV.foreach(csv_file, :headers => :first_row, :encoding => 'u') do |row|
+				connect_to_testwise("CSV_ON_ROW",  idx.to_s)  if $testwise_support 
+				begin
+	        yield row
+					connect_to_testwise("CSV_ROW_PASS",  idx.to_s)  if $testwise_support
+				rescue => e
+					connect_to_testwise("CSV_ROW_FAIL",  idx.to_s)  if $testwise_support
+	        has_error = true
+	      ensure
+	        idx += 1
+				end
+	    end
+
+			connect_to_testwise("CSV_END",  "")  if $testwise_support
+			raise "Test failed on data" if has_error
+	  end
+
+
   end
 end

data/lib/rwebspec/web_browser.rb

@@ -68,7 +68,7 @@ module RWebSpec
     end
 
     def self.reuse(base_url, options)
-      if self.is_windows? && ($TESTWISE_BROWSER != "Firefox" && $ITEST2_BROWSER != "Firefox")
+      if self.is_windows? && ($TESTWISE_BROWSER != "Firefox" && $TESTWISE_BROWSER != "Firefox")
 				require 'watir-classic/ie' 
 				# try to avoid 
 				#  lib/ruby/1.8/dl/win32.rb:11:in `sym': unknown type specifier 'v'
@@ -205,14 +205,14 @@ module RWebSpec
       end
     end
 
-    [:images, :links, :buttons, :select_lists, :checkboxes, :radios, :text_fields, :divs, :dls, :dds, :dts, :ems, :lis, :maps, :spans, :strongs, :ps, :pres, :labels, :cells, :rows].each do |method|
+    [:images, :links, :buttons, :select_lists, :checkboxes, :radios, :text_fields, :divs, :dls, :dds, :dts, :ems, :lis, :maps, :spans, :strongs, :ps, :pres, :labels, :tds, :trs].each do |method|
       define_method method do
         @browser.send(method)
       end
     end
 		alias as links
-		alias trs rows
-		alias tds cells
+		alias rows trs
+		alias cells tds
 		alias imgs images
 		
     # current url

data/lib/rwebspec/web_page.rb

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

data/lib/rwebspec.rb

@@ -16,7 +16,7 @@ end
 require 'rspec'
 
 unless defined? RWEBSPEC_VERSION
-  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "3.1.0"
+  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "3.1.2"
 end
 
 $testwise_polling_interval = 1 # seconds

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 1
-  - 0
-  version: 3.1.0
+  - 3
+  version: 3.1.3
 platform: ruby
 authors: 
 - Zhimin Zhan
@@ -14,7 +14,7 @@ autorequire: rwebspec
 bindir: bin
 cert_chain: []
 
-date: 2012-05-28 00:00:00 +10:00
+date: 2012-06-20 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency