rwebspec 4.3.5 → 5.0

data/CHANGELOG

@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+5.0
+[Change] Support Watir 5.0, watir-classic/ie no longer available
+
+4.4
+[Enhancement] add enter_text_with_id to support HTML5 elements on IE10 (which fail to identify email field as text field)
+
 4.3.5
 [Change] Add licence (MIT) into gemspec
 [Fixes] check_checkbox not working when there is hidden input with same name as checkbox

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.5"
+  s.version = "5.0"
   s.summary = "Web application functional specification in Ruby"
   s.description = "Executable functional specification for web applications in RSpec syntax with Watir or Selenium"
 
@@ -103,8 +103,11 @@ spec = Gem::Specification.new do |s|
   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")
+  else
+    s.add_dependency("watir-classic", ">= 4.0.0")
   end
 end
 

data/lib/rwebspec-watir/driver.rb

@@ -299,7 +299,7 @@ module RWebSpec
     # page.check_checkbox('bad_ones', 'Chicken Little')
     # page.check_checkbox('good_ones', ['Cars', 'Toy Story'])
     #
-    [:set_form_element, :click_link_with_text, :click_link_with_id, :submit, :click_button_with_id, :click_button_with_name, :click_button_with_caption, :click_button_with_value, :click_radio_option, :clear_radio_option, :check_checkbox, :uncheck_checkbox, :select_option].each do |method|
+    [:set_form_element, :click_link_with_text, :click_link_with_id, :submit, :click_button_with_id, :click_button_with_name, :click_button_with_caption, :click_button_with_value, :click_radio_option, :clear_radio_option, :check_checkbox, :uncheck_checkbox, :select_option, :element].each do |method|
       define_method method do |* args|
         perform_operation { @web_browser.send(method, * args) if @web_browser }
       end
@@ -314,8 +314,24 @@ module RWebSpec
     alias clear_radio_button clear_radio_option
 
     # for text field can be easier to be identified by attribute "id" instead of "name", not recommended though
-    def enter_text_with_id(textfield_id, value)
-      perform_operation { text_field(:id, textfield_id).set(value) }
+    #
+    # params opts takes :appending => true or false, if true, won't clear the text field.
+    def enter_text_with_id(textfield_id, value, opts = {})
+      # For IE10, it seems unable to identify HTML5 elements
+      #
+      # However for IE10, the '.' is omitted.
+      perform_operation {
+        
+        begin
+          text_field(:id, textfield_id).set(value)
+        rescue => e
+          # However, this approach is not reliable with Watir (IE)
+          # for example, for entering email, the dot cannot be entered, try ["a@b", :decimal, "com"]
+          the_elem = element(:xpath, "//input[@id='#{textfield_id}']")        
+          the_elem.send_keys(:clear) unless opts[:appending]        
+          the_elem.send_keys(value)        
+        end
+      }
     end
 
     def perform_operation(& block)

data/lib/rwebspec-watir/web_browser.rb

@@ -3,27 +3,6 @@
 #* Distributed open-source, see full license in MIT-LICENSE
 #***********************************************************
 
-=begin
-
-begin
-  require 'watir'
-  # require 'watir/contrib/enabled_popup'
-  # require 'watir/close_all'
-  # require 'watir/screen_capture' 
-  # NO need any more
-  require 'watir-classic/ie'
-  # require 'watir/contrib/visible'
-  $watir_loaded = true
-rescue LoadError => e
-  puts "!!!Error on loading watir: #{e}"
-  $watir_loaded = false
-end
-
-if RUBY_PLATFORM =~ /mingw/
-	raise "You have must at least Watir installed" unless $watir_loaded
-end
-
-=end
 
 module RWebSpec
 
@@ -73,7 +52,7 @@ module RWebSpec
 
     def self.reuse(base_url, options)
       if self.is_windows? && ($TESTWISE_BROWSER != "Firefox" && $TESTWISE_BROWSER != "Firefox")
-				require 'watir-classic/ie' 
+				require 'watir-classic' 
 				# try to avoid 
 				#  lib/ruby/1.8/dl/win32.rb:11:in `sym': unknown type specifier 'v'
         Watir::IE.each do |browser_window|

data/lib/rwebspec.rb

@@ -16,7 +16,7 @@ end
 require 'rspec'
 
 unless defined? RWEBSPEC_VERSION
-  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "4.3.5"
+  RWEBSPEC_VERSION = RWEBUNIT_VERSION = "5.0"
 end
 
 $testwise_polling_interval = 1 # seconds
@@ -66,7 +66,11 @@ module RWebSpec
     def load_watir
       # puts "Loading Watir"
       require 'watir'
-      require 'watir-classic/ie'
+      
+      if RUBY_PLATFORM =~ /mingw/i
+        require 'watir-classic'
+      end
+    
       load(File.dirname(__FILE__) + "/rwebspec-watir/web_browser.rb")
       load(File.dirname(__FILE__) + "/rwebspec-watir/driver.rb")
       require File.dirname(__FILE__) + "/extensions/watir_extensions"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rwebspec
 version: !ruby/object:Gem::Version
-  version: 4.3.5
+  version: '5.0'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: rwebspec
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec