rwebspec 4.1.0 → 4.1.3

data/CHANGELOG

@@ -6,6 +6,11 @@ CHANGELOG
 [Refactored] - unit tests
 [Feature] - Save screenshot for Selenium
 [CHANGE] - open_browser(base_url, options) => open_browser(:base_url => "http://")
+	
+upgrade to watir-classic 3.4
+close_others
+close_all_browsers to instance methods
+no set highlight color
 
 4.0
 - Merge rwebspec-webdriver with rwebspec!

data/Rakefile

@@ -78,7 +78,7 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec"
-  s.version = "4.1.0"
+  s.version = "4.1.3"
   s.summary = "Web application functional specification in Ruby"
   s.description = "Executable functional specification for web applications in RSpec syntax with Watir or Selenium"
 
@@ -99,6 +99,8 @@ spec = Gem::Specification.new do |s|
   s.files = s.files + Dir.glob( "docs/**/*" )
   s.add_dependency(%q<rspec>, [">= 2.10"])
   s.add_dependency(%q<rspec-core>, ["= 2.10.1"])
+  s.add_dependency(%q<rspec-mocks>, ["= 2.10.1"])
+  s.add_dependency(%q<rspec-expectations>, ["= 2.10.0"])
   s.add_dependency("commonwatir", ">= 3.0")
   unless RUBY_PLATFORM =~ /mingw/
     s.add_dependency("selenium-webdriver")

data/lib/rwebspec-watir/driver.rb

@@ -37,14 +37,18 @@ module RWebSpec
         puts "Unicode may not work in IE, #{e}"
       end
 
-      base_url ||= $TESTWISE_PROJECT_BASE_URL
 			if options && options.class == String
-      	base_url ||= options
-			elsif options && options.class == Hash && options[:base_url]
+			  options = {:base_url => options.to_s }
+			end
+			      
+			if options && options.class == Hash && options[:base_url]
       	base_url ||= options[:base_url]
 			end
 			
+			base_url = options[:base_url] rescue nil  
+			base_url ||= $TESTWISE_PROJECT_BASE_URL			
       base_url ||= $BASE_URL
+      
       raise "base_url must be set" if base_url.nil?
 
       default_options = {:speed => "fast",
@@ -105,12 +109,7 @@ module RWebSpec
     # Close all opening browser windows
     #
     def close_all_browsers
-			if @web_browser
-	      Watir::IE.close_all
-			else
-				browser_type = $TESTWISE_BROWSER ? $TESTWISE_BROWSER.downcase.to_sym : :ie	
-	      WebBrowser.close_all_browsers(browser_type)				
-			end
+			@web_browser.close_all_browsers
     end
 
     # Verify the next page following an operation.

data/lib/rwebspec-watir/web_browser.rb

@@ -53,18 +53,17 @@ module RWebSpec
 			
 			return if existing_browser
 
-      @browser.activeObjectHighLightColor = options[:highlight_colour]
+			# Watir-classic 3.4 drop the support			
+      # @browser.activeObjectHighLightColor = options[:highlight_colour]
       @browser.visible = options[:visible] unless $HIDE_IE
       #NOTE: close_others fails
-      if RUBY_VERSION =~ /^1\.8/ && options[:close_others] then
-				begin
-        	@browser.close_others
-				rescue => e1
-					puts "Failed to close others"
-				end
-      else
-        puts "close other browser instances not working yet in Ruby 1.9.1 version of Watir"
-      end
+			begin
+	      if options[:close_others] then
+					@browser.windows.reject(&:current?).each(&:close)
+	      end
+			rescue => e1
+				puts "Failed to close others"
+			end
     end
 
     def self.reuse(base_url, options)
@@ -240,10 +239,8 @@ module RWebSpec
     end
     alias close close_browser
 
-    def self.close_all_browsers(browser_type = :ie)      
-			if browser_type == :ie
-        Watir::IE.close_all
-      end
+    def close_all_browsers(browser_type = :ie)      
+			@browser.windows.each(&:close)
     end
 
     def full_url(relative_url)

data/lib/rwebspec-webdriver/driver.rb

@@ -38,13 +38,18 @@ module RWebSpec
           puts "Unicode may not work in IE, #{e}"
         end
 
-        base_url ||= $TESTWISE_PROJECT_BASE_URL
-				if options && options.class == String
-	      	base_url ||= options
-				elsif options && options.class == Hash && options[:base_url]
-	      	base_url ||= options[:base_url]
-				end
+  			if options && options.class == String
+  			  options = {:base_url => options.to_s }
+  			end
+
+  			if options && options.class == Hash && options[:base_url]
+        	base_url ||= options[:base_url]
+  			end
+
+  			base_url = options[:base_url] rescue nil  
+  			base_url ||= $TESTWISE_PROJECT_BASE_URL			
         base_url ||= $BASE_URL
+        
         raise "base_url must be set" if base_url.nil?
 
         default_options = {:speed => "fast",

data/lib/rwebspec-webdriver/web_browser.rb

@@ -101,7 +101,6 @@ module RWebSpec
         #      else
         #        @browser.speed = :zippy
         #      end
-        #      @browser.activeObjectHighLightColor = options[:highlight_colour]
         #      @browser.visible = options[:visible] unless $HIDE_IE
         #      #NOTE: close_others fails
         #      if RUBY_VERSION =~ /^1\.8/ && options[:close_others] then
@@ -343,7 +342,7 @@ module RWebSpec
       alias close close_browser
 
       #TODO determine browser type, check FireWatir support or not
-      def self.close_all_browsers
+      def close_all_browsers
         raise "not implemented"
       end
 

data/lib/rwebspec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rwebspec
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: rwebspec
 bindir: bin
 cert_chain: []
-date: 2013-01-01 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -43,6 +43,38 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.10.1
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.10.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.10.1
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: commonwatir
   requirement: !ruby/object:Gem::Requirement