rwebspec 4.3.1 → 4.3.2

data/CHANGELOG

@@ -1,5 +1,9 @@
 CHANGELOG
 =========
+4.3.2
+[Fixes] typo on attaching browser for webdriver
+[Update] Change gemspec work with latest RSpec 2.14
+
 4.3
 [TODO] RWebSpec.framework = "Auto", Watir for IE, Selenium for others.
 

data/Rakefile

@@ -78,7 +78,7 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec"
-  s.version = "4.3.1"
+  s.version = "4.3.2"
   s.summary = "Web application functional specification in Ruby"
   s.description = "Executable functional specification for web applications in RSpec syntax with Watir or Selenium"
 
@@ -97,10 +97,10 @@ spec = Gem::Specification.new do |s|
   s.files = s.files + Dir.glob( "test/**/*" )
   s.files = s.files + Dir.glob( "sample/**/*")
   s.files = s.files + Dir.glob( "docs/**/*" )
-  s.add_dependency(%q<rspec>, ["~> 2.13"])
-  s.add_dependency(%q<rspec-core>, ["~> 2.13.0"])
-  s.add_dependency(%q<rspec-mocks>, ["~> 2.13.0"])
-  s.add_dependency(%q<rspec-expectations>, ["~> 2.13"])
+  s.add_dependency(%q<rspec>, [">= 2.13"])
+  s.add_dependency(%q<rspec-core>, [">= 2.13.0"])
+  s.add_dependency(%q<rspec-mocks>, [">= 2.13.0"])
+  s.add_dependency(%q<rspec-expectations>, [">= 2.13"])
   s.add_dependency("commonwatir", ">= 4.0.0")
   unless RUBY_PLATFORM =~ /mingw/
     s.add_dependency("selenium-webdriver")

data/lib/rwebspec-common/core.rb

@@ -46,6 +46,7 @@ module RWebSpec
             puts "[INFO] based on browser, set to Watir"
             RWebSpec.framework = "Watir"
             self.class.send(:include, RWebSpec::Driver)
+            # Reload abstract web page to load driver
             load(File.dirname(__FILE__) + "/web_page.rb")
             return open_browser_by_watir(opts)   
           end
@@ -87,7 +88,7 @@ module RWebSpec
         use_current_watir_browser(how, what)
       elsif RWebSpec.framework =~ /selenium/i
         self.class.send(:include, RWebSpec::Driver)        
-        use_current_selenium_browser(show, what)
+        use_current_selenium_browser(how, what)
       else
         # not specified, guess
         if RUBY_PLATFORM =~ /mingw/i
@@ -99,7 +100,7 @@ module RWebSpec
           RWebSpec.framework = "Selenium"                    
           self.class.send(:include, RWebSpec::Driver)  
           load(File.dirname(__FILE__) + "/web_page.rb")                
-          use_current_selenium_browser(show, what)   
+          use_current_selenium_browser(how, what)   
         end
           
       end

data/lib/rwebspec-common/web_page.rb

@@ -25,7 +25,8 @@ module RWebSpec
     begin
       include RWebSpec::Driver
     rescue =>  e
-      puts "[WARN] Failed to load Driver, it will be reloaded. #{e.backtrace}"
+      # Ignorable error, driver not set, but will get loaded after calling open_browser or use_current_browser
+      # puts "[WARN] Failed to load Driver, it will be reloaded. #{e.backtrace}"
     end
     include RWebSpec::Core
 

data/lib/rwebspec-webdriver/web_browser.rb

@@ -113,11 +113,7 @@ module RWebSpec
 
       # TODO resuse not working yet
       def self.reuse(base_url, options)
-        if self.is_windows? && $TESTWISE_BROWSER != "Firefox"
-          Watir::IE.each do |browser_window|
-            return WebBrowser.new(base_url, browser_window, options)
-          end
-          #puts "no browser instance found"
+        if self.is_windows?
           WebBrowser.new(base_url, nil, options)
         else
           WebBrowser.new(base_url, nil, options)
@@ -152,13 +148,9 @@ module RWebSpec
       alias check_box checkbox # seems watir doc is wrong, checkbox not check_box
       alias tr row
 
-      # Wrapp of Watir's area to support Firefox and Watir
+      # Wrapp of area to support Firefox and Watir
       def area(* args)
-        if is_firefox?
-          text_field(* args)
-        else
-          @browser.send("area", * args)
-        end
+        raise "not implemented for Selenium"
       end
 
       def modal_dialog(how=nil, what=nil)
@@ -684,32 +676,15 @@ module RWebSpec
       #    WebBrowser.attach_browser(:url, "http://www.itest2.com", {:browser => "Firefox", :base_url => "http://www.itest2.com"})
       #    WebBrowser.attach_browser(:title, /agileway\.com\.au\/attachment/)  # regular expression
       def self.attach_browser(how, what, options={})
-        default_options = {:browser => "IE"}
-        options = default_options.merge(options)
-        site_context = Context.new(options[:base_url]) if options[:base_url]
-        if (options[:browser].to_s == "firefox")
-          return WebBrowser.new_from_existing(ff, site_context)
-        else
-          return WebBrowser.new_from_existing(Watir::IE.attach(how, what), site_context)
-        end
+        raise "Attach browser not implemented for Selenium, If you debug in TestWise, make sure running a test first to start browser, then you can attach."
       end
 
-      # Attach a Watir::IE instance to a popup window.
+      # Attach to a popup window, to be removed
       #
       # Typical usage
       #   new_popup_window(:url => "http://www.google.com/a.pdf")
       def new_popup_window(options, browser = "ie")
-        if is_firefox?
-          raise "not implemented"
-        else
-          if options[:url]
-            Watir::IE.attach(:url, options[:url])
-          elsif options[:title]
-            Watir::IE.attach(:title, options[:title])
-          else
-            raise 'Please specify title or url of new pop up window'
-          end
-        end
+        raise "not implemented"
       end
 
       # ---

data/lib/rwebspec.rb

@@ -16,7 +16,7 @@ end
 require 'rspec'
 
 unless defined? RWEBSPEC_VERSION
-  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "4.3.1"
+  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "4.3.2"
 end
 
 $testwise_polling_interval = 1 # seconds
@@ -102,9 +102,9 @@ module RWebSpec
   end
 end
 
-# Watir 3 API Changes, no Watir/Container
 require File.dirname(__FILE__) + "/plugins/testwise_plugin.rb"
 
+# Changed in v4.3, the framework is loaded when initliating or reuse browser
 #RWebSpec.load_framework
 
 # Extra full path to load libraries

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rwebspec
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: rwebspec
 bindir: bin
 cert_chain: []
-date: 2013-07-07 00:00:00.000000000 Z
+date: 2013-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :runtime
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
@@ -32,7 +32,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :runtime
@@ -40,7 +40,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.0
 - !ruby/object:Gem::Dependency
@@ -48,7 +48,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :runtime
@@ -56,7 +56,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.0
 - !ruby/object:Gem::Dependency
@@ -64,7 +64,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :runtime
@@ -72,7 +72,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency