honey-do 0.6.1 → 0.7.0

data/Rakefile

@@ -47,7 +47,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name = 'honey-do'
-  s.version = '0.6.1'
+  s.version = '0.7.0'
   s.rubyforge_project = s.name
 
   s.platform = Gem::Platform::RUBY

data/js/user-extensions.js

@@ -18,23 +18,24 @@
   Form_.PAIR_DELIMITER = ':::'
 
   
-  Form_.prototype.set_values = function(big_string, ok_if_not_found, select_as_text){
+  Form_.prototype.set_values = function(big_string, ok_if_not_found, select_as_text, select_exact_match){
       var pairs = big_string.split(Form_.FIELD_DELIMITER),  pair = [], error_values = '';
       
       for(var i = 0; i < pairs.length; i++){
           pair = pairs[i].split(Form_.PAIR_DELIMITER);
-          error_values += this.set_value(pair[0], pair[1], ok_if_not_found, select_as_text);
+          error_values += this.set_value(pair[0], pair[1], ok_if_not_found, select_as_text, select_exact_match);
       }
       return error_values;       
   }
   
-  Form_.prototype.set_value = function(name, value, ok_if_not_found, select_as_text){
+  Form_.prototype.set_value = function(name, value, ok_if_not_found, select_as_text, select_exact_match){
       var error_text = '', e = null;
       var selectable   = /(select-one|select-multiple)/i;
       var settable     = /(text|textarea|password)/i;
       var clickable    = /(button|submit|reset|radio|image)/i;
       Form_.SELECT_AS_TEXT = select_as_text;
-
+      Form_.SELECT_EXACT_MATCH = select_exact_match;
+      
       try {
           // if you wanted to do something to explicitly wait for Ajax, you would do it here, before the element lookup
           e = this.form.elements[name];
@@ -133,13 +134,18 @@
   
   Form_.index_of_match = function(e, text_value) {
       for ( var i = 0; i < e.options.length; i++)  {
-          if (Form_.match_to_beginning(e.options[i].text, text_value)) return i;
-          if (Form_.match_to_beginning(e.options[i].value, text_value)) return i;
+          if (Form_.SELECT_EXACT_MATCH) {
+              if (e.options[i].text == text_value) return i;
+              if (e.options[i].value == text_value) return i;
+              continue;
+          }
+          if (Form_.match_substring(e.options[i].text, text_value)) return i;
+          if (Form_.match_substring(e.options[i].value, text_value)) return i;
       }
   }
   
-  Form_.match_to_beginning = function(within_string, sought_text_value) {
-      return (within_string.search(new RegExp('^' + sought_text_value.custom_escape_special(),'i')) > -1);
+  Form_.match_substring = function(within_string, sought_text_value) {
+      return (within_string.search(new RegExp(sought_text_value.custom_escape_special(),'i')) > -1);
   }
   
   Form_.prototype.droplist_size = function(element_name) {return Form_.index_of_last( this.form.elements[element_name] )}
@@ -278,6 +284,16 @@
           if (e[i].type.toLowerCase() == 'checkbox') e[i].checked = true;
   }
   
+  Form_.prototype.radio_button_names = function() {
+      var a = [];
+      var e = this.form.elements;
+      for(var i = 0;i < e.length; i++){
+          if (e[i].type.toLowerCase() == 'radio')  a.push(e[i].name)
+      }
+      return a;
+  }
+
+
 /*    Table_ Class        */
   // Table_ class constructor: provides reference to aut document and a specified table
   // table can be identified by name or index

data/lib/honey_do.rb

@@ -75,6 +75,7 @@ module HoneyDo
   # <tt>:form_name_or_index</tt>:: Defaults to 0, because there is usually just one form per page.  +String+ or +Integer+
   # <tt>:ok_if_not_found</tt>:: +true+ to swallow the error, +nil+/+false+/+null+ if not present (the default).  Useful for testing multiple versions of your app when names have changed, or widgets have been added or removed.
   # <tt>:select_as_text</tt>:: +true+ to force droplist values to be treated as text, even if they are digits +nil+/+false+/+null+ if not present (the default).  Useful when the visible option text is a number (e.g., "day of month" lists).  Without it, the input is taken to an index.
+  # <tt>:select_exact_match</tt>:: +true+ to match entire droplist value (+text+ or +value+ attribute), overriding default substring match.
   # <tt>:one_field_at_a_time</tt>:: +true+ to use mulitple-call mode.  Makes Ruby loop on the list, instead JavaScript, forcing a separate <tt>get_eval</tt> call for each item.  Effectively slows it down as a means of handling _Ajax_ refreshes in _Firefox_.
   # <tt>:retry_max</tt>:: 0 or 1 to *_not_* retry at all.  Anything > 2 (the default, which means 1 try and 1 retry) is probably useless, but I don't know your app.   +Integer+ 
   # <tt>:retry_interval</tt>:: To change the default wait time (0.75 seconds) between retries.  +Float+ 
@@ -89,7 +90,7 @@ module HoneyDo
     retry_interval = processing_params[:retry_interval] ? processing_params[:retry_interval] : 0.75
 
     js_open  = "dom=new Form_( this, '#{which_form}' )." 
-    js_close = ", '#{processing_params[:ok_if_not_found]}', '#{processing_params[:select_as_text]}' )"
+    js_close = ", '#{processing_params[:ok_if_not_found]}', '#{processing_params[:select_as_text]}', '#{processing_params[:select_exact_match]}' )"
     errors   = ""
   
     # when input is a single symbol or int

data/test/file_upload_test.rb

@@ -2,14 +2,14 @@ require 'test_master'
 
 class TestFileUpload < Test::Unit::TestCase
 
-  # due to "same origin" policy, probably
-  def test_file_upload_by_selenium_not_permitted_by_firefox
-    return if ie?   
-    navigate
-    assert_raise(SeleniumCommandError) do
-      browser.type("dom=document.everything.file", "foo.txt")
-    end
-  end
+#  # this error no longer occurs as of Selenium 1.01b1, ff 2.0.0.20
+#  def test_file_upload_by_selenium_not_permitted_by_firefox
+#    return if ie?   
+#    navigate
+#    assert_raise(SeleniumCommandError) do
+#      browser.type("dom=document.everything.file", "foo.txt")
+#    end
+#  end
 
   def test_file_upload_not_implemented
     navigate

data/test/select_list_test.rb

@@ -30,18 +30,18 @@ class TestSelectFeatures < Test::Unit::TestCase
     assert_equal(option_text_property, browser.get_form_values[:color], "case insensitive")
   end
   
-  # substring match - anchored to ^ (beginning of string); *, ? and + are just text (not wildcards)
+  # *, ? and + are just text (not wildcards)
   def test_select_from_droplist_by_substring_match_on_visible_text
     default_selection = browser.get_form_values[:color]
 
-    test_intent = "substring: anchored to beginning of string '^'"
+    test_intent = "substring match"
     browser.set_form_values(:color => "ligh")
     assert_equal("Light Grey", browser.get_form_values[:color], test_intent)
 
-    assert_raise(RuntimeError, test_intent) do
+    assert_nothing_raised(RuntimeError, test_intent) do
       reset_then_set_without_retry(:color => "ight Grey")
     end
-    assert_equal(default_selection, browser.get_form_values[:color], test_intent)
+    assert_equal("Light Grey", browser.get_form_values[:color], test_intent)
     
     test_intent = "substring: no wildcards"
     assert_raise(RuntimeError, test_intent) do
@@ -56,14 +56,14 @@ class TestSelectFeatures < Test::Unit::TestCase
     option_value_property = "flat eggshell white"
     option_text_property = "Off White"
 
-    test_intent = "substring: anchored to beginning of string '^'"
+    test_intent = "substring match"
     browser.set_form_values(:color => "Flat Egg")
     assert_equal(option_text_property, browser.get_form_values[:color], test_intent)
 
-    assert_raise(RuntimeError, test_intent) do
+    assert_nothing_raised(RuntimeError, test_intent) do
       reset_then_set_without_retry(:color => "hell white")
     end
-    assert_equal(default_selection, browser.get_form_values[:color], test_intent)
+    assert_equal(option_text_property, browser.get_form_values[:color], test_intent)
     
     test_intent = "substring: no wildcards"
     assert_raise(RuntimeError, test_intent) do
@@ -86,6 +86,48 @@ class TestSelectFeatures < Test::Unit::TestCase
     assert_equal(default_selection, browser.get_form_values[:color], test_intent)
   end
   
+  def test_select_from_droplist_by_exact_match
+    browser.set_form_values({:color => "Light Grey"}, {:select_exact_match => true})
+    assert_equal("Light Grey", browser.get_form_values[:color], "selection of complete string in exact match mode" )
+    
+    browser.set_form_values(:resetButton)
+    
+    browser.set_form_values({:color => "light grey"}, {:select_exact_match => true})
+    assert_equal("Light Grey", browser.get_form_values[:color], "selection of complete string in exact match mode, using value property" )
+
+    assert_raise(RuntimeError, "substring in exact match mode fails") do
+      browser.set_form_values({:color => "Light"}, {:select_exact_match => true})
+    end
+
+    assert_raise(RuntimeError, "substring in exact match mode fails") do
+      browser.set_form_values({:color => "t Grey"}, {:select_exact_match => true})
+    end
+
+    assert_raise(RuntimeError, "substring of value property in exact match mode fails") do
+      browser.set_form_values({:color => "re"}, {:select_exact_match => true})
+    end
+
+  end
+  
+  def test_select_from_multi_select_by_exact_match
+    full_string = "Annoying my friends"
+    browser.set_form_values({:hobbies => full_string}, {:select_exact_match => true})
+    assert_equal(full_string, browser.get_form_values[:hobbies], "selection of complete string in exact match mode" )
+    
+    browser.set_form_values(:resetButton)
+    
+    browser.set_form_values({:hobbies => "annoying"}, {:select_exact_match => true})
+    assert_equal(full_string, browser.get_form_values[:hobbies], "selection of complete string in exact match mode, using value property" )
+
+    assert_raise(RuntimeError, "substring in exact match mode fails") do
+      browser.set_form_values({:hobbies => "Annoying"}, {:select_exact_match => true})
+    end
+
+    assert_raise(RuntimeError, "substring in exact match mode fails") do
+      browser.set_form_values({:hobbies => "my friends"}, {:select_exact_match => true})
+    end
+  end
+
   def test_select_from_multi_select_by_index
     assert_nil(browser.get_form_values[:hobbies], "this multi-select has no default")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: honey-do
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors: 
 - Tim Camper
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-18 00:00:00 -06:00
+date: 2009-02-10 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency