RubyGems - honey-do - Versions diffs - 0.5.0 → 0.6.0 - Mend

honey-do 0.5.0 → 0.6.0

Files changed (13) hide show

data/Rakefile CHANGED Viewed

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

data/bin/init_selenium_proxy.bat ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ @echo off
2	+ java -jar C:\swa\trunk\commerce-project\libs\selenium-server\v1.0b1\selenium-server.jar -multiWindow -userExtensions ..\js\user-extensions.js

data/bin/killableprocess.exe ADDED Viewed

Binary file

data/demo/page/day_list.html ADDED Viewed

@@ -0,0 +1,16 @@
+<html>
+<head>
+  <title>HoneyDo Demo Form: Just give it a list!</title>
+  <script language="JavaScript" src="everything.js"></script>
+</head>
+<body onload="populate_number_list(day_list_form.elements['day_of_month'],1,31,true);">
+    <div>
+      <form name="day_list_form">
+        <table border="3" bgcolor="beige" cellspacing="1" cellpadding="4">
+          <tr><td>Day of Month:<br><select name="day_of_month"></select></td></tr>
+          <tr><td><input type="reset" value="Reset" name="resetButton"></td></tr>
+        </table>
+      </form>
+    </div>
+</body>
+</html>

data/demo/page/everything.html CHANGED Viewed

@@ -4,18 +4,20 @@
   <script language="JavaScript" src="everything.js"></script>
 </head>
 <body>
     <!-- A one-of-everything HTML form:
          after David Flanagan, Chapter 18 of "JavaScript: The Definitive Guide", O'Reilly, 5th edition
      -->
   <div align="center">
-  <form name="everything" method="POST" action="../display">
+  <form name="everything" method="POST" action="../display" >
     <table border="3" bgcolor="beige" cellspacing="1" cellpadding="4">
       <tr>
-        <td colspan="4"><h4>All Possible Form Elements</h4></td>
+        <td colspan="5"><h4>All Possible Form Elements</h4></td>
       </tr>
       <tr>
-        <td>Username:<br>[1]<input type="text" name="username" size="15"></td>
-        <td>Password:<br>[2]<input type="password" name="password" size="15"></td>
+        <td>Id Only:<br>[1]<input type="text" id="id_not_name" size="5"></td>
+        <td>Username:<br>[1]<input type="text" name="username" id="id_of_username_field" size="15"></td>
+        <td>Password:<br>[2]<input type="password" name="password" size="10"></td>
         <td rowspan="4">Input Events[3]<br>
           <textarea name="event_reports_area" rows="20" cols="40"></textarea></td>
         <td rowspan="4" align="center" valign="center">
@@ -25,7 +27,7 @@
           [13]<input type="hidden" value="you can't see this unless you're looking at the source" name="justHiding"><br></td>
       </tr>
       <tr>
-        <td colspan="2">
+        <td colspan="3">
           Filename: [4]<input type="file" name="file" size="15"> </td>
       </tr>
       <tr>
@@ -81,6 +83,7 @@
             <option value="gold">Gold
             <option value="zinc">Zinc
           </select></td>
       </tr>
     </table>
   </form>
@@ -110,3 +113,5 @@
   </form>
   </div>
 </body>
+</html>

data/demo/page/everything.js CHANGED Viewed

@@ -52,4 +52,15 @@ function removehandlers(f) {
     }
 }
-function selectable(type) { return (/^select/i).test(type);}
+function selectable(type) { return (/^select/i).test(type);}
+function populate_number_list(theObj,minVal,maxVal) {
+    var selIdx = 0;
+    if (theObj.options.length <= 2) {
+        var idx = theObj.options.length;
+        for (var i=minVal; i<=maxVal; i++) {
+            var label = i;
+            theObj.options[idx++] = new Option(label,i);
+        }
+    }
+}

data/js/user-extensions.js CHANGED Viewed

@@ -16,22 +16,25 @@
   Form_.FIELD_DELIMITER = '|'
   Form_.PAIR_DELIMITER = ':::'
-  Form_.prototype.set_values = function(big_string, ok_if_not_found){
+  Form_.prototype.set_values = function(big_string, ok_if_not_found, select_as_text){
       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);
+          error_values += this.set_value(pair[0], pair[1], ok_if_not_found, select_as_text);
       }
       return error_values;
   }
-  Form_.prototype.set_value = function(name, value, ok_if_not_found){
+  Form_.prototype.set_value = function(name, value, ok_if_not_found, select_as_text){
       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;
       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];
@@ -94,7 +97,7 @@
   }
   Form_.option_index = function(e, in_value){
-      if (isNaN(parseInt(in_value))) {
+      if (isNaN(parseInt(in_value)) || Form_.SELECT_AS_TEXT) {
           return Form_.index_of_text(e, in_value);
       }
       return in_value;    // Todo: 'range' error if index too high
@@ -146,10 +149,7 @@
       var e = this.form.elements;
       for(var i = 0; i < e.length; i++){
           if (e[i].type != 'hidden') {
-              if (e[i].name)
-                 element_list.push(e[i].name);
-              else
-                 element_list.push(e[i].value);
+              element_list.push(prop_value(e[i], 'name', 'id', 'value'));
           }
       }
       return element_list;
@@ -160,10 +160,7 @@
       var e = this.form.elements;
       for(var i = 0; i < e.length; i++){
           if (!e[i].disabled && e[i].type != 'hidden') {
-              if (e[i].name)
-                 element_list.push(e[i].name);
-              else
-                 element_list.push(e[i].value);
+              element_list.push(prop_value(e[i], 'name', 'id', 'value'));
           }
       }
       return element_list;
@@ -173,7 +170,7 @@
       var element_list = [];
       var e = this.form.elements;
       for(var i = 0; i < e.length; i++){
-          element_list.push(e[i].name + '|' + i);
+          element_list.push(prop_value(e[i], 'name', 'id') + '|' + i);
       }
       return element_list;
   }
@@ -189,7 +186,7 @@
       for(var i = 0;i < e.length; i++){
          if (target_types.test(e[i].type)) {
-             element_name = e[i].name;
+             element_name = prop_value(e[i], 'name', 'id');
              element_text = e[i].value.custom_trim();
              if ('selectedIndex' in e[i] && e[i].selectedIndex > -1) {
                  if (e[i].type == 'select-multiple') {
@@ -239,10 +236,7 @@
       var a = [];
       var buttons = this.buttons();
       for(var i = 0; i < buttons.length; i++){
-          if (buttons[i].name)
-              a.push(buttons[i].name);
-          else
-              a.push(buttons[i].value);
+          a.push(prop_value(buttons[i], 'name', 'id', 'value'));
       }
       return a;
   }
@@ -333,6 +327,7 @@
       return this.replace(special_characters, '\\$1');
   }
 /*   Stand-alone Functions    */
   function all_form_names(page)  {
       var names = [];
@@ -356,4 +351,11 @@
     return text_value;
   }
+  // return value of first property found: e.g., prop_value(element, 'name', 'id')
+  function prop_value() {
+    var args = prop_value.arguments;
+    var obj = args[0];
+    for(i=1; i < args.length; i++) { if (obj[args[i]]) return obj[args[i]]}
+  }

data/lib/honey_do.rb CHANGED Viewed

@@ -27,7 +27,7 @@ module HoneyDo
   # ====HTML +form+ element identifiers
   # <b><tt>name</tt> attribute</b>:: YES
   # <b><tt>form.elements</tt> index</b>:: YES
-  # <b><tt>id</tt> attribute</b>:: NO
+  # <b><tt>id</tt> attribute</b>:: YES
   # <b><tt>value</tt> attribute</b>:: NO
   #
   # <b>element names (or indexes) without values get <i>clicked </i></b> if they are
@@ -74,6 +74,7 @@ module HoneyDo
   # <b>These aren't usually necessary</b>.
   # <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>: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+
@@ -88,7 +89,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]}' )"
+    js_close = ", '#{processing_params[:ok_if_not_found]}', '#{processing_params[:select_as_text]}' )"
     errors   = ""
     # when input is a single symbol or int

data/test/general_form_test.rb CHANGED Viewed

@@ -178,6 +178,39 @@ class TestGeneralInputOptions < Test::Unit::TestCase
     assert_nil(browser.get_form_values[:event_reports_area], "no longer firing events")
   end
+  def test_id_works_for_input_if_no_name_present
+    input_string = "boy look at the size of that"
+    assert_nothing_raised(RuntimeError, "id attribute should be sufficient identifier for HTMLElementCollection") do
+      browser.set_form_values(:id_not_name => input_string)
+    end
+    assert_equal(input_string, browser.get_form_values[:id_not_name])
+  end
+  def test_id_or_name_equivalent_for_input_on_field_with_both
+    id_text = "id text"
+    name_text = "name is used here"
+    assert_nothing_raised(RuntimeError, "id attribute is ok even when there's a name") do
+      browser.set_form_values(:id_of_username_field => id_text)
+    end
+    assert_equal(id_text, browser.get_form_values[:username])
+    browser.set_form_values(:username => name_text)
+    assert_equal(name_text, browser.get_form_values[:username])
+  end
+  def test_name_attribute_trumps_id_attribute
+    input_text = "That song with an apostrophe in it by Spirit"
+    browser.set_form_values(:id_of_username_field => input_text, :id_not_name => input_text)
+    values_read_back = browser.get_form_values
+    assert_equal(input_text, values_read_back[:username], "name attribute trumps id attribute")
+    assert_equal(input_text, values_read_back[:id_not_name], "id works because name is not present")
+    assert_nil(values_read_back[:id_of_username_field], "id doesn't work because name is present")
+  end
   protected
   def setup

data/test/select_as_text_test.rb ADDED Viewed

@@ -0,0 +1,28 @@
+require 'test_master'
+class TestSelectFeatures < Test::Unit::TestCase
+  def test_select_digit_label_as_text
+    browser.open("day_list.html")
+    browser.set_form_values(:day_of_month => 11 )
+    assert_equal("12",  browser.get_form_values[:day_of_month], "option selected by index")
+    reset
+    browser.set_form_values({:day_of_month => 11}, :select_as_text => true )
+    assert_equal("11", browser.get_form_values[:day_of_month], "option selected by option value")
+    reset
+    browser.set_form_values({:day_of_month => :last})
+    assert_equal("31", browser.get_form_values[:day_of_month], "last option selected, safely by index")
+    reset
+    browser.set_form_values({:day_of_month => 31}, :select_as_text => true )
+    assert_equal("31", browser.get_form_values[:day_of_month], "option selected by index")
+    reset
+    assert_raise(RuntimeError, "index out of bounds: 'e.options[i] has no properties'")  do
+      browser.set_form_values({:day_of_month => 31}, :retry_max => 0 )
+    end
+  end
+end

data/test/select_list_test.rb CHANGED Viewed

@@ -29,7 +29,7 @@ class TestSelectFeatures < Test::Unit::TestCase
     reset_then_set(:color => option_value_property.upcase)
     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)
   def test_select_from_droplist_by_substring_match_on_visible_text
     default_selection = browser.get_form_values[:color]
@@ -152,4 +152,5 @@ class TestSelectFeatures < Test::Unit::TestCase
   def reset_then_set_without_retry(input_hash)
     browser.set_form_values(input_hash.to_a.unshift(:resetButton), :retry_max => 0 )
   end
 end

data/test/submit_test.rb CHANGED Viewed

@@ -54,6 +54,12 @@ class TestSubmitForm < Test::Unit::TestCase
     verify_all_values_persist_on_display_page(submitted_values)
   end
+  def test_fields_with_no_name_not_submitted
+    browser.set_form_values([[:id_not_name, "snooky!"], :submitButton])
+    verify_page_loaded
+    assert_nil( browser.get_cell_ids_and_text[:id_not_name])
+  end
   protected
   def setup

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honey-do
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Tim Camper
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2008-11-26 00:00:00 -06:00
+date: 2008-12-18 00:00:00 -06:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -41,6 +41,7 @@ extra_rdoc_files:
 - test/general_form_test.rb
 - test/hidden_and_disabled_field_test.rb
 - test/radio_button_test.rb
+- test/select_as_text_test.rb
 - test/select_list_test.rb
 - test/submit_test.rb
 - test/test_master.rb
@@ -61,6 +62,7 @@ files:
 - test/general_form_test.rb
 - test/hidden_and_disabled_field_test.rb
 - test/radio_button_test.rb
+- test/select_as_text_test.rb
 - test/select_list_test.rb
 - test/submit_test.rb
 - test/test_master.rb
@@ -68,10 +70,13 @@ files:
 - demo/display
 - demo/display/webrick_servlet_needs_this_folder.txt
 - demo/page
+- demo/page/day_list.html
 - demo/page/everything.html
 - demo/page/everything.js
 - demo/webrick-servlet.rb
 - functional_testcase/functional_testcase.rb
+- bin/init_selenium_proxy.bat
+- bin/killableprocess.exe
 - bin/start_selenium_proxy.bat
 - bin/start_selenium_proxy.sh
 - js/user-extensions.js