rwebspec 1.9.3 → 2.0.0

data/CHANGELOG

@@ -1,5 +1,11 @@
 CHANGELOG
 =========
+
+ 2.0 
+  [Update] Deprecate support for FireWatir, speed up loading
+  [Update] Drop constant naming RWebUnit
+  [Refactoring] internal folder structure like extensions and plugins
+
  1.9.3
   [Enhacement] take_screenshot with to_dir arguments
 

data/Rakefile

@@ -45,6 +45,7 @@ Rake::RDocTask.new do |rdoc|
   rdoc.title = 'RWebSpec'
   rdoc.rdoc_files.include('lib/rwebspec.rb')
   rdoc.rdoc_files.include('lib/rwebspec/*.rb')  
+  rdoc.rdoc_files.include('lib/extensions/*.rb')  
   rdoc.rdoc_files.delete("lib/rwebspec/web_testcase.rb")
   rdoc.rdoc_files.delete("lib/rwebspec/checkJSDialog.rb")
   rdoc.options += [
@@ -70,8 +71,8 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec"
-  s.version = "1.9.3"
-  s.summary = "Executable functional specification for web applications in RSpec syntax and Watir"
+  s.version = "2.0.0"
+  s.summary = "Web application functional specification in Ruby"
   s.description = "Executable functional specification for web applications in RSpec syntax and Watir"
 
   s.author  = "Zhimin Zhan"
@@ -90,7 +91,6 @@ 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")
 end
 

data/lib/{watir_extensions.rb → extensions/firewatir_extensions.rb}

@@ -1,4 +1,3 @@
-
 module FireWatir
   class Firefox
 

data/lib/extensions/watir_extensions.rb

@@ -0,0 +1,85 @@
+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

data/lib/{rwebspec → plugins}/testwise_plugin.rb

@@ -12,11 +12,6 @@ module RWebSpec
     # 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

data/lib/rwebspec/driver.rb

@@ -6,7 +6,7 @@
 # You can just use
 #    click_button("submit")
 #
-require File.join(File.dirname(__FILE__), 'testwise_plugin')
+require File.join(File.dirname(__FILE__), '../plugins/testwise_plugin')
 require File.join(File.dirname(__FILE__), 'popup')
 require File.join(File.dirname(__FILE__), 'matchers', "contains_text.rb")
 

data/lib/rwebspec.rb

@@ -1,30 +1,36 @@
 #***********************************************************
-#* Copyright (c) 2006 - 2010, Zhimin Zhan.
+#* Copyright (c) 2006 - 2011, Zhimin Zhan.
 #* Distributed open-source, see full license in MIT-LICENSE
 #***********************************************************
-require "rubygems";
+require "rubygems"
 
-# Try load firewatir first, which depends on ActiveSupport 2.3.9 
-begin
-  require "firewatir";
-  $firewatir_loaded = true
-rescue LoadError => e
-  puts e
-  $firewatir_loaded = false
+# From 2.0, no default support for FireWatir. 
+#  
+if $ENABLE_FIREFOX 
+	# Try load firewatir first, which depends on ActiveSupport 
+	puts "Deprecated: Please use watir-webdriver or selenium-webdriver to run tests in Firefox"
+	begin
+	  require "firewatir";
+	  $firewatir_loaded = true
+	rescue LoadError => e
+	  puts e
+	  $firewatir_loaded = false
+	end
 end
 
 # Load active_support, so that we can use 1.days.ago
 begin
   require 'active_support/basic_object'
   require 'active_support/duration'
+	require 'active_support/core_ext'
 rescue LoadError => no_as1_err
   # active_support 2.0 loaded error
 end
-require 'active_support/core_ext'
+
 require 'spec'
 
 unless defined? RWEBSPEC_VERSION
-  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "1.9.3"
+  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "2.0.0"
 end
 
 if RUBY_PLATFORM =~ /mswin/ or RUBY_PLATFORM =~ /mingw/
@@ -47,12 +53,14 @@ require File.dirname(__FILE__) + "/rwebspec/test_script"
 require File.dirname(__FILE__) + "/rwebspec/context"
 require File.dirname(__FILE__) + "/rwebspec/rspec_helper"
 require File.dirname(__FILE__) + "/rwebspec/load_test_helper"
-require File.dirname(__FILE__) + "/rspec_extensions"
-require File.dirname(__FILE__) + "/watir_extensions"
-if  RUBY_PLATFORM =~ /mswin/ or RUBY_PLATFORM =~ /mingw/
-  require File.dirname(__FILE__) + "/window_script_extensions.rb"
-end
 
 require File.dirname(__FILE__) + "/rwebspec/matchers/contains_text"
-require File.dirname(__FILE__) + "/rwebspec/testwise_plugin"
+
+require File.dirname(__FILE__) + "/extensions/rspec_extensions"
+require File.dirname(__FILE__) + "/extensions/watir_extensions"
+require File.dirname(__FILE__) + "/extensions/firewatir_extensions" if $ENABLE_FIREFOX 
+if RUBY_PLATFORM =~ /mswin/ or RUBY_PLATFORM =~ /mingw/
+  require File.dirname(__FILE__) + "/extensions/window_script_extensions.rb"
+end
+require File.dirname(__FILE__) + "/plugins/testwise_plugin.rb"
 

metadata

@@ -3,10 +3,10 @@ name: rwebspec
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 1
-  - 9
-  - 3
-  version: 1.9.3
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Zhimin Zhan
@@ -14,7 +14,7 @@ autorequire: rwebspec
 bindir: bin
 cert_chain: []
 
-date: 2011-10-02 00:00:00 +10:00
+date: 2011-10-15 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,7 +57,11 @@ files:
 - README
 - CHANGELOG
 - MIT-LICENSE
-- lib/rspec_extensions.rb
+- lib/extensions/firewatir_extensions.rb
+- lib/extensions/rspec_extensions.rb
+- lib/extensions/watir_extensions.rb
+- lib/extensions/window_script_extensions.rb
+- lib/plugins/testwise_plugin.rb
 - lib/rwebspec/assert.rb
 - lib/rwebspec/clickJSDialog.rb
 - lib/rwebspec/context.rb
@@ -69,15 +73,11 @@ files:
 - lib/rwebspec/rspec_helper.rb
 - lib/rwebspec/test_script.rb
 - lib/rwebspec/test_utils.rb
-- lib/rwebspec/testwise_plugin.rb
 - lib/rwebspec/using_pages.rb
 - lib/rwebspec/web_browser.rb
 - lib/rwebspec/web_page.rb
 - lib/rwebspec/web_testcase.rb
 - lib/rwebspec.rb
-- lib/rwebunit.rb
-- lib/watir_extensions.rb
-- lib/window_script_extensions.rb
 has_rdoc: true
 homepage: http://github.com/zhimin/rwebspec/tree/master
 licenses: []
@@ -107,6 +107,6 @@ rubyforge_project: rwebspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Executable functional specification for web applications in RSpec syntax and Watir
+summary: Web application functional specification in Ruby
 test_files: []
 

data/lib/rwebunit.rb

@@ -1,3 +0,0 @@
-# legacy code to support old 'require rwebunit'
-require File.dirname(__FILE__) + "/rwebspec"
-RWebUnit = RWebSpec