rwebspec 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 243d65b66503ee097eabcb5bdd0406d02465ffa9
-  data.tar.gz: da2288b12f703955fd454021db39ae63bd116342
+  metadata.gz: 2041946ebad32da51c5a1d38287e5d7d163f42cf
+  data.tar.gz: d990a25e840ff641f77468ca5190add30f289486
 SHA512:
-  metadata.gz: 47a592a6142b92fa68fe450e2a3c747ebb46528cef8f46dcaa18605c572bd53c07b628eab3c303f6fcacfe38ddc5db8002a81e1ee609e6c4fa6db86d72d9913d
-  data.tar.gz: c26663c841e53f7a54f3deaa7ebf7d2062dae86207819e37f6a19b0827033daaaad68813ffeca8bda447185d3bc6e89e40402a7a73579e7db47b212bd80ae0e9
+  metadata.gz: b46b84544367e452b5c6f62c1fb51370e9def09f17612734ed3dee7514dd9e541d3a58e79ff12c6cbcd842afcf48a104e4d66e29d53912693f5586347e27592c
+  data.tar.gz: 75ba170f172248dfd53ef5424b457e3c5b30dcfc9b855df68f4ffb82a7ce7b98702a3c2d29e88273d88a79a738dd66cd0c1e1686d71a5b923695e1a8e82f1948

data/CHANGELOG

@@ -1,6 +1,9 @@
 CHANGELOG
 =========
 
+5.0.2
+[Fixes] inconsistency enter_text_with_id() between Watir and Selenium
+
 5.0.1
 [New] browser.execute_script
 

data/Rakefile

@@ -77,7 +77,7 @@ end
 spec = Gem::Specification.new do |s|
   s.platform= Gem::Platform::RUBY
   s.name = "rwebspec"
-  s.version = "5.0.1"
+  s.version = "5.0.2"
   s.summary = "Web application functional specification in Ruby"
   s.description = "Executable functional specification for web applications in RSpec syntax with Watir or Selenium"
 

data/lib/rwebspec-common/core.rb

@@ -20,7 +20,7 @@ module RWebSpec
       #
       #
       # New Options:
-      #    :browser => :ie | :firefox | :chrome
+      #    :browser => :ie | :firefox | :chrome | :safari
     def open_browser(opts = {})
       puts "[INFO] RWebSpec.Framework currently set to => #{RWebSpec.framework }"
 =begin      

data/lib/rwebspec-watir/driver.rb

@@ -320,6 +320,11 @@ module RWebSpec
       # For IE10, it seems unable to identify HTML5 elements
       #
       # However for IE10, the '.' is omitted.
+      if opts.nil? || opts.empty?
+        # for Watir, default is clear 
+        opts[:appending] = false
+      end
+      
       perform_operation {
         
         begin

data/lib/rwebspec-webdriver/driver.rb

@@ -321,14 +321,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)
+      # params opts takes :appending => true or false, if true, won't clear the text field.
+      def enter_text_with_id(textfield_id, value, opts = {})
+        
+        if opts.nil? || opts.empty? 
+          opts[:appending] = true
+        end
+        
         perform_operation {
           elements = find_elements(:id, textfield_id)
           if elements.size == 1 then
-            elements[0].send_keys(value)
+            the_element = elements[0]
+            the_element.clear unless opts[:appending]
+            the_element.send_keys(value)            
           else
             smaller_set = elements.select {|x| x.tag_name == "textarea" || (x.tag_name == "input" &&  x.attribute("text")) }
-            smaller_set[0].send_keys(value)
+            the_element = smaller_set[0]
+            the_element.clear unless opts[:appending]
+            the_element.send_keys(value)
           end
         }
       end

data/lib/rwebspec-webdriver/web_browser.rb

@@ -34,6 +34,8 @@ module RWebSpec
             initialize_firefox_browser(existing_browser, base_url, options)
           when "chrome"
             initialize_chrome_browser(existing_browser, base_url, options)
+          when "safari"
+            initialize_safari_browser(existing_browser, base_url, options)
           when "ie"
             initialize_ie_browser(existing_browser, options)
           when  "htmlunit"
@@ -68,9 +70,18 @@ module RWebSpec
         @browser = Selenium::WebDriver.for :chrome
         @browser.navigate.to base_url
       end
+      
+      def initialize_safari_browser(existing_browser, base_url, options)
+        if existing_browser then
+          @browser = existing_browser
+          return
+        end
+
+        @browser = Selenium::WebDriver.for :safari
+        @browser.navigate.to base_url
+      end
 
       def initialize_htmlunit_browser(base_url, options)
-        puts "XXXXX start HtmlUnit..."
         require 'json'
         caps = Selenium::WebDriver::Remote::Capabilities.htmlunit(:javascript_enabled => false)        
         client = Selenium::WebDriver::Remote::Http::Default.new

data/lib/rwebspec.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rwebspec
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Zhimin Zhan
 autorequire: rwebspec
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: rwebspec
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Web application functional specification in Ruby