zena 1.1.3 → 1.2.0

data/test/integration/zafu_compiler/ajax.yml

@@ -11,7 +11,7 @@ block:
 
 add:
   src: "<ul id='children' do='nodes'><li do='each' do='link'/><li do='add'/></ul>"
-  tem: "/\[\"children_add\", \"children_form\"\].each\(Element.toggle\)/"
+  tem: "/\[\"children_add\", \"children_0\"\].each\(Element.toggle\)/"
   'ajax/add/en/children_form.erb': "/class='form' id='<%= ndom_id\(@node\) %>'/"
   'ajax/add/en/children.erb': "<li id='<%= ndom_id(@node) %>'><a href='<%= zen_path(@node) %>'><%= @node.prop['title'] %></a></li>"
 
@@ -55,11 +55,11 @@ form_update:
 add_each_no_form:
   src: "<ul do='children' id='things'><li do='each'>I <p do='title'>blah</p></li><li do='add'/></ul>"
   tem: "!/</ul><ul></ul>/" # bug in closing group with [add].
-  res: "/<ul><li.*id='things_add'.*li.*class='form' id='things_form'.*form.*I <p><input id=.things_title. name=.node\[title\]. .*type=.text..*hidden/"
+  res: "/<ul><li.*id='things_add'.*li.*class='form' id='things_0'.*form.*I <p><input id=.things_title. name=.node\[title\]. .*type=.text..*hidden/"
 
 add_each_no_form_date:
   src: "<ul do='children' id='things'><li do='each'>I <p do='show' attr='event_at' tformat='short_date'>blah</p></li><li do='add'/></ul>"
-  res: "/<ul><li.*id='things_add'.*li.*id='things_form'.*form.*I <p>.*date_box.*name='node\[event_at\]' type='text' value.*hidden/"
+  res: "/<ul><li.*id='things_add'.*li.*id='things_0'.*form.*I <p>.*date_box.*name='node\[event_at\]' type='text' value.*hidden/"
 
 add_each_no_form_focus:
   src: "<ul do='children' id='test'><li do='each'>I <p do='title'>blah</p></li><li do='add' focus='title'/></ul>"
@@ -74,7 +74,7 @@ each_add_with_form:
       <li do='add'>add new</li>
       <li do='form'><input name='title'/> this is the form</li>
     </ol>
-  res: "/<li id='list1_30'>bird.*<li id='list1_31'>flower.*<li.*list1_add.*list1_form.*toggle.*<li style.*none.*list1_form.*Ajax.Request.*input type='hidden' name='t_url' value=.ajax/each/add/with/form/list1.*input type='hidden' name='node\[parent_id\]' value=.29./"
+  res: "/<li id='list1_30'>bird.*<li id='list1_31'>flower.*<li.*list1_add.*list1_0.*toggle.*<li style.*none.*list1_0.*Ajax.Request.*input type='hidden' name='t_url' value=.ajax/each/add/with/form/list1.*input type='hidden' name='node\[parent_id\]' value=.29./"
 
 each_add_with_form_in_sub_block:
   context:
@@ -126,7 +126,7 @@ block_dictionary:
 
 make_form:
   src: "<ul do='children'><li do='each' do='title'/><li do='add'/></ul>"
-  tem: "/<li style='display:none;' class='form' id='list1_form'>.*remote_form_for\(:node, var2_new"
+  tem: "/<li style='display:none;' class='form' id='list1_0'>.*remote_form_for\(:node, var2_new"
   'ajax/make/form/en/list1.erb': "<li id='<%= ndom_id(@node) %>'><%= @node.prop['title'] %></li>"
   'ajax/make/form/en/list1_form.erb': "/<li class='form' id='<%= ndom_id\(@node\) %>'>/"
 
@@ -165,7 +165,7 @@ each_in_each_form:
 each_in_each_dom_id:
   # should render correct form
   src: "<r:pages do='each'><r:title/><r:edit/><r:pages do='each'><r:title/><r:edit/></r:pages></r:pages>"
-  tem: "/list2_#\{var.\.zip\}_#\{var.\.zip\}/"
+  tem: "/list1_#\{var.\.zip\}_#\{var.\.zip\}/"
 
 default_focus_field:
   src: "<ol do='comments'><li do='each'/><li do='form'><input name='author_name'/> ... <input name='text'/></li><li do='add'/></ol>"
@@ -191,8 +191,8 @@ live_filter_single_element:
 live_filter_select_options:
   context:
     node: cleanWater
-  src: "<r:filter live='true' do='select' param='f' values='1,2'/><r:block><ol do='pages where title like \"#{params[:f]}%\"'><li do='each' do='title'/></ol></r:block>"
-  tem: "/select name=.f.><%= options_for_select\(\[.1., .2.\], params\[:f\].to_s/"
+  src: "<r:filter live='true' do='select' param='f' tprefix='foo' values='1,2'/><r:block><ol do='pages where title like \"#{params[:f]}%\"'><li do='each' do='title'/></ol></r:block>"
+  tem: "/select name=.f.><%= options_for_select.*.foo_1., .1..*, param_value\(.f.\).to_s/"
   'ajax/live/filter/select/options/en/list1.erb': "/<div id='<%= ndom_id\(@node\) %>'.*params\[:f\]/"
   res: "/<select name='f'.*<div id='list1'><ol><li>crocodiles</li><li>status title</li></ol></div>/"
 
@@ -220,7 +220,7 @@ drag_with_form:
         <td class='edit'> <r:edit class='edit'>éditer</r:edit></td>
       </tr>
     </table>"
-  tem: "/<span class='drag' id='<%= %Q\{list2_#\{var2.zip\}\}.*<% add_drag_id\(%Q\{list2_#\{var2.zip\}\}/"
+  tem: "/<span class='drag' id='<%= %Q\{list3_#\{var2.zip\}\}.*<% add_drag_id\(%Q\{list3_#\{var2.zip\}\}/"
 
 drag_with_form_not_in_form:
   src: "<table do='pages in site'>

data/test/integration/zafu_compiler/basic.yml

@@ -32,30 +32,6 @@ each_traductions_only_list:
   src: "<r:traductions only='en,ru'><ul><li do='each'><r:show attr='title'/></li></ul></r:traductions>"
   res: "<ul><li>status title</li></ul>"
 
-each_alternate_class:
-  context:
-    node: 'cleanWater'
-  src: "<ol do='pages'><li do='each' alt_class='blue' do='title'/></ol>"
-  res: "<ol><li class=''>crocodiles</li><li class='blue'>status title</li><li class=''>Kill the bugs</li></ol>"
-
-each_alternate_class_reverse:
-  context:
-    node: 'cleanWater'
-  src: "<ol do='pages' limit='2'><li do='each' alt_class='blue' alt_reverse='true' do='title'/></ol>"
-  res: "<ol><li class='blue'>crocodiles</li><li class=''>status title</li></ol>"
-
-each_alternate_class_two:
-  context:
-    node: 'collections'
-  src: "<ol do='pages'><li class='post' do='each' alt_class='stripe' do='title'/></ol>"
-  res: "<ol><li class='post '>art</li><li class='post stripe'>menu</li><li class='post '>news</li><li class='post stripe'>wikiSkin</li></ol>"
-
-each_alternate_class_ajax:
-  context:
-    node: 'cleanWater'
-  src: "<ol do='pages' limit='2'><li do='each' alt_class='blue' do='title'/><li do='add'/></ol>"
-  res: "/<li>crocodiles<\/li><li class=\"blue\">status/"
-
 each_else:
   context:
     node: 'opening'

data/test/integration/zafu_compiler/dates.yml

@@ -17,18 +17,18 @@ date:
 
 select_date_attr:
   src: "<p do='void' set_date='log_at'><span do='show' eval='date.year'/></p>"
-  tem: "<p><% _zdate = @node.log_at %><span><%= (_zdate ? _zdate.year : nil) %></span></p>"
+  tem: "<p><% _zdate = @node.log_at %><span><%= (_zdate ? _zdate.year_tz : nil) %></span></p>"
   res: '<p><span>2006</span></p>'
 
 date_in_link:
   src: "<r:link y='log_at.year'/>"
-  tem: "<a href='<%= zen_path(@node, {:y => (@node.log_at ? @node.log_at.year : nil)}) %>'><%= @node.prop['title'] %></a>"
+  tem: "<a href='<%= zen_path(@node, {:y => (@node.log_at ? @node.log_at.year_tz : nil)}) %>'><%= @node.prop['title'] %></a>"
 
 log_at:
   context:
     node: 'status'
   eval: 'log_at.year'
-  tem: '<%= (@node.log_at ? @node.log_at.year : nil) %>'
+  tem: '<%= (@node.log_at ? @node.log_at.year_tz : nil) %>'
   res: '' # no errors
 
 # TypedString 'could_be_nil?' should propagate through 'date'
@@ -36,7 +36,7 @@ could_be_nil:
   context:
     node: 'status'
   src: "*<r:void set_date='log_at'><r:eval>date.year</r:eval></r:void>*"
-  tem: "*<% _zdate = @node.log_at %><%= (_zdate ? _zdate.year : nil) %>*"
+  tem: "*<% _zdate = @node.log_at %><%= (_zdate ? _zdate.year_tz : nil) %>*"
   res: '**' # no errors
 
 uses_datebox:
@@ -49,9 +49,9 @@ uses_datebox_missing_lang:
   src: "<r:uses_datebox/>"
   tem: "/calendar/lang/calendar-en-utf8.js/"
 
-show_date_foo:
+show_current_date:
   context:
-    date: '2010-05-16'
+    date: '16.5.2010'
     lang: fr
   src: "<r:show eval='date' format='%A %d.%m.%Y'/>"
   tem: "/main_date/"
@@ -167,4 +167,21 @@ test_date:
 
 format_date_empty_string:
   tem: "<%= format_date('') %>"
-  res: ""
+  res: ""
+
+date_empty_value:
+  src: "<r:input name='created_at' value=''/>"
+  tem: "<input type='text' name='node[created_at]' value=''/>"
+
+time_to_date:
+  context:
+    tz: 'US/Pacific'
+  src: "<b do='created_at.to_date'/> <b do='created_at.to_date(\"UTC\")'/>"
+  res: "<b>2006-03-09</b> <b>2006-03-10</b>"
+
+time_year:
+  context:
+    node: opening
+    tz: 'US/Pacific'
+  src: "<r:Post?><b do='this.date.year'/> <b do='this.date.year(\"UTC\")'/></r:Post?>"
+  res: "<b>2011</b> <b>2012</b>"

data/test/integration/zafu_compiler/display.yml

@@ -186,6 +186,11 @@ cannot_add_document:
   src: "<r:add_document/>"
   res: ''
 
+add_document_redir:
+  src: "<r:add_document redir='#{url}'/>"
+  tem: "/redir=<%= CGI.escape\(\"#\{zen_url\(@node\)\}\"\) %>/"
+  res: "/Zena.open_window.*%2Fpage22.html/"
+
 img_no_image:
   src: "<r:img/>"
   tem: "<%= img_tag(@node, :mode=>\"std\") %>"
@@ -262,7 +267,7 @@ admin_links_for_admin:
 admin_links_for_admin_with_list:
   context:
     visitor: lion
-  src: "<ul do='admin_links' list='comments,sites'><li do='each' do='show'><a href='#'>do this</a></li></ul>"
+  src: "<ul do='admin_links' list='comments,sites'><li do='each' do='show'><a href='javascript:void(0)'>do this</a></li></ul>"
   tem: '/if var1 = admin_links\(\{:list => "comments,sites"\}/'
   res: '<ul><li><a href="/comments">comments</a></li><li><a href="/sites">sites</a></li></ul>'
 
@@ -394,4 +399,42 @@ array_literal:
 
 style_tag:
   src: "<r:style>.foo <r:title/></r:style>"
-  res: "<style>.foo status title</style>"
+  res: "<style type='text/css'>.foo status title</style>"
+
+each_alternate_class:
+  context:
+    node: 'cleanWater'
+  src: "<ol do='pages'><li do='each' alt_class='blue' do='title'/></ol>"
+  res: "<ol><li class=''>crocodiles</li><li class='blue'>status title</li></ol>"
+
+each_alternate_class_reverse:
+  context:
+    node: 'cleanWater'
+  src: "<ol do='pages' limit='2'><li do='each' alt_class='blue' alt_reverse='true' do='title'/></ol>"
+  res: "<ol><li class='blue'>crocodiles</li><li class=''>status title</li></ol>"
+
+each_alternate_class_two:
+  context:
+    node: 'collections'
+  src: "<ol do='pages'><li class='post' do='each' alt_class='stripe' do='title'/></ol>"
+  res: "<ol><li class='post '>Art</li><li class='post stripe'>News list</li><li class='post '>Top menu</li><li class='post stripe'>wiki skin</li></ol>"
+
+each_alternate_class_ajax:
+  context:
+    node: 'cleanWater'
+  src: "<ol do='pages' limit='2'><li do='each' alt_class='blue' do='title'/><li do='add'/></ol>"
+  res: "/<li class='' id='list1_26'>crocodiles<\/li><li class='blue' id='list1_22'>status title<\/li>/"
+
+each_alternate_class_with_conditional:
+  context:
+    node: 'cleanWater'
+  src: "<ol do='pages'><li do='each' alt_class='blue' on_if='title' do='title'/></ol>"
+  res: "<ol><li class=' on'>crocodiles</li><li class='blue on'>status title</li></ol>"
+
+each_alternate_by_hand:
+  context:
+    node: 'cleanWater'
+  # This is useful when we need to have more then one table row per item for example.
+  src: "<ol do='pages'><r:each alt_class='blue'><li class='#{alt_class}' do='title'/></r:each></ol>"
+  tem: "/class='<%= _zaltclass %>'/"
+  res: "<ol><li class=''>crocodiles</li><li class='blue'>status title</li></ol>"

data/test/integration/zafu_compiler/errors.yml

@@ -84,12 +84,6 @@ map_join:
   src: "<r:children do='map(:flobo).join(\",\")'/>"
   tem: "/unknown method .*map\(:flobo\)/"
 
-query_on_vclass:
-  # typical syntax error (should be Contact?)
-  src: "<r:Contact><div do='pages in site'>...</div></r:Contact>"
-  # should not crash
-  tem: "/parser_error.*method.*pages in site.*No query builder for class VirtualClass/"
-
 datebox_on_vclass:
   src: "<r:Contact><r:input type='date' name='log_at'/></r:Contact>"
   tem: "/unknown method 'log_at\(\)' for .* VirtualClass./"

data/test/integration/zafu_compiler/forms.yml

@@ -12,7 +12,7 @@ add_btn:
   <tr do='each'><td do='title'/></tr>
   <tr do='add'><td><b><r:add_btn/></b></td></tr>
   </table>"
-  res: "/<tr class='btn_add' id='list1_add'><td><b><a href='#' onclick/"
+  res: "/<tr class='btn_add' id='list1_add'><td><b><a href='javascript:void\(0\)' onclick/"
 
 form_put:
   # default should be a put method
@@ -60,6 +60,10 @@ select_nodes:
   src: "<r:form><r:select nodes='images in site' name='foo'></select></r:form>"
   res: "/name='node\[foo\]'><option value=\"\" selected=\"selected\"></option>\n<option value=\"40\">Autumn Tree</option>\n<option value=\"30\">bird</option>/"
 
+select_nodes_show_rubyless:
+  src: "<r:form><r:select nodes='images in site' name='foo' show='title.limit(3)'></select></r:form>"
+  res: "/name='node\[foo\]'><option value=\"\" selected=\"selected\"></option>\n<option value=\"40\">Aut…</option>\n<option value=\"30\">bir…</option>/"
+
 do_not_set_parent_id_if_form_contains_parent_id:
   src: "<r:children><r:each do='title'/><r:add/><r:form><r:select name='parent_id' nodes='projects in site'/><input name='title'/></r:form></r:children>"
   res: "!/node\[parent_id\].\s+value/"
@@ -171,6 +175,22 @@ input_param_value:
   tem: "<input type='text' name='foo[bar.baz]' value='<%= fquote param_value(\"foo[bar.baz]\") %>'/>"
   res: "<input type='text' name='foo[bar.baz]' value='xyz'/>"
 
+input_checkbox_param_value:
+  context:
+    foo:
+      "bar.baz": 'null'
+  src: "<r:input type='checkbox' value='null' param='foo[bar.baz]'/>"
+  tem: "<input type='hidden' name='foo[bar.baz]' value=''/><input type='checkbox' name='foo[bar.baz]' value='null'<%= param_value(\"foo[bar.baz]\") == \"null\" ? \" checked='checked'\" : '' %>/>"
+  res: "<input type='hidden' name='foo[bar.baz]' value=''/><input type='checkbox' name='foo[bar.baz]' value='null' checked='checked'/>"
+
+select_param_value:
+  context:
+    foo:
+      "bar.baz": '1'
+  src: "<r:select param='foo[bar.baz]' values='1,3' show='one,three'/>"
+  tem: '/param_value\("foo\[bar.baz\]"\).to_s/'
+  res: '/<option value="1" selected="selected">one<\/option>/'
+
 input_style:
   src: "<r:input style='display:none;' type='submit'/>"
   res: "<input type='submit' style='display:none;'/>"
@@ -192,7 +212,7 @@ input_new:
   context:
     node: 'ant'
   src: "<r:contacts><r:each/><r:form><r:input name='first_name'/></r:form><r:add/></r:contacts>"
-  res: "/name='node\[first_name\]' [^>]*id='list1_first_name'/"
+  res: "/name='node\[first_name\]' [^>]*id='list2_first_name'/"
 
 show_in_form:
   src: "<r:form><b do='title'/></r:form>"
@@ -260,4 +280,22 @@ hidden_fields_in_form_tag:
 
 hidden_fields_in_form_tag_dynamic:
   src: "<r:form  node[log]='title'></r:form>"
-  tem: "/<input type='hidden' name='node\[log\]' value='<%= @node.prop\['title'\] %>/"
+  tem: "/<input type='hidden' name='node\[log\]' value='<%= @node.prop\['title'\] %>/"
+
+should_show_column:
+  src: "<r:Document do='column(\"size\")' do='name'/>"
+  res: "size"
+
+should_show_fields_for_columns:
+  context:
+    node: 'forest_pdf'
+  src: "<r:form><r:Document do='column(\"size\")' do='input'/></r:form>"
+  tem: "/input type='text' name='node\\[<%= var2.name %>\\]/"
+  res: "/<input type='text' name='node\\[size\\]' value='63569'/>/"
+
+should_show_fields_for_columns:
+  context:
+    lang: 'fr'
+  src: "<r:load dictionary='/Default skin/translations'><r:form><r:select name='assigned' values=',1,2,3'/></r:form></r:load>"
+  tem: "/foo.*bar/"
+  res: "/value=\"1\">foo<\/option>\n<option value=\"2\">bar/"

data/test/integration/zafu_compiler/query.yml

@@ -156,7 +156,7 @@ query:
     node: cleanWater
     qb: "nodes where updated_at.year = 2007 in project"
   src: "<r:query default='nodes in project' do='each' join=', ' do='title'/>"
-  tem: "/if var1 = query\('Node', \"@node\", params\[:qb\] \|\| \"nodes in project\"\)/"
+  tem: "/if var1 = query\('Node', \"@node\", params\[:qb\] \|\| \"nodes in project\", :find => :all, :binding => binding\)/"
   res: 'crocodiles'
 
 query_with_default:
@@ -191,7 +191,7 @@ query_with_parse:
     filter:
       title: 'status title'
   src: "<r:query default='pages in site' select='pages where #{query_parse(params[:filter])} in site' do='each' join=', ' do='title'/>"
-  tem: '/query.*pages where #\{query_parse\(params\[:filter\]\)\} in site\"\)/'
+  tem: '/query.*pages where #\{query_parse\(params\[:filter\]\)\} in site\"/'
   res: 'status title'
 
 query_with_parse_paginate:
@@ -208,6 +208,25 @@ query_can_be_nil_bad_argument_type:
   tem: '/params\[:filter\] \|\| \"pages in site\"/'
   res: ''
 
+query_eval_in_sub_context:
+  # Live compile and query from params
+  context:
+    visitor: lion
+    node: cleanWater
+    scope: 'self'
+  # Should pass binding so that local var3 is recognized
+  src: "<r:parent do='main'><r:query select='pages' default='pages' do='each' join=', ' do='title'/></r:parent>"
+  res: 'crocodiles, Nice Bananas, status title'
+
+query_eval_find_one:
+  # Live compile and query from params
+  context:
+    visitor: lion
+    node: cleanWater
+  src: "<r:query select='page' default='page' do='link'/>"
+  tem: "/<%= zen_path\(var1\) %>/"
+  res: "/<a href='.*26.html'>crocodiles</a>/"
+
 query_count:
   tem: '<%= query("Page", "@node", "pages in site", :type => :count) %>'
   res: '19'
@@ -246,4 +265,11 @@ find_with_rubyless:
 
 find_loads_class:
   src: "<div do='find(11)'><r:origin/></div>"
-  tem: "<% if var1 = find_node_by_zip(11) %><div><%= var1.prop['origin'] %></div><% end %>"
+  tem: "<% if var1 = find_node_by_zip(11) %><div><%= var1.prop['origin'] %></div><% end %>"
+
+query_on_vclass:
+  # typical syntax error (should be Contact?)
+  src: "<r:Contact><div do='pages in site order by zip asc limit 2' do='each' join=',' do='title'/></r:Contact>"
+  # does the query on last @node
+  tem: "/Node.do_find/"
+  res: '<div>Zena the wild CMS,people</div>'

data/test/integration/zafu_compiler/roles.yml

@@ -113,10 +113,6 @@ grid_manual:
     </table>
   res: "/<th colspan='3'>Node.*<th colspan='3'>Original.*<th>exif</th><th>height</th><th>width</th>.*<td>image/jpeg</td><td>jpg</td>/"
 
-grid:
-  src: "<r:images in='site' do='grid'/>"
-  res: "/<table class='grid'>.*<th class='role' colspan='3'>Node.*<th class='role' colspan='3'>Original.*<th>exif</th><th>height</th><th>width</th>.*<td>image/jpeg</td><td>jpg</td>/"
-
 list_relations:
   src: "<r:Contact do='relations' do='each' join=', ' do='name'/>"
   res: "collaborator_for, favorite, favorite_for, home_for, hot_for, icon, reference, reference_for, set_tag"

data/test/integration/zafu_compiler/safe_definitions.yml

@@ -140,4 +140,4 @@ hash_to_params:
       two: '2'
   src: "<b do='{:q =&gt; params[:q]}' do='to_param'/>"
   tem: "<% var1 = {:q => params[:q]} %><b><%= var1.to_param %></b>"
-  res: '<b>q%5Bone%5D=1&q%5Btwo%5D=2</b>'
+  res: '<b>q%5Bone%5D=1&q%5Btwo%5D=2</b>'

data/test/integration/zafu_compiler_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class ZafuCompilerTest < Zena::Controller::TestCase
   include Zena::Use::Urls::Common
- OK = [
+  OK = [
     'action',
     'asset',
     'conditional',
@@ -20,8 +20,9 @@ class ZafuCompilerTest < Zena::Controller::TestCase
     'safe_definitions',
     'search',
     'site',
-    'tags',      # bricks/tags/zena/test/zafu
-    'worker',    # bricks/worker/zena/test/zafu
+    'tags',        # bricks/tags/zena/test/zafu
+    'spreadsheet', # bricks/spreadsheet/zena/test/spreadsheet
+    'worker',      # bricks/worker/zena/test/zafu
     'urls',
     'user',
     'version',
@@ -355,5 +356,12 @@ class ZafuCompilerTest < Zena::Controller::TestCase
     yt_do_test('relations', 'same_name_as_class')
   end
 
+  def test_dates_time_year
+    login(:lion)
+    node = secure(Node) { nodes(:opening) }
+    node.update_attributes!(:date => Time.utc(2012,1,1,0,0))
+    yt_do_test('dates', 'time_year')
+  end
+
   yt_make
 end

data/test/selenium/Add/add3.rsel

@@ -1,22 +1,22 @@
 # Add first element
 open '/oo/testnode37.html?test=add3'
-assert_not_visible 'add31_title'
+assert_not_visible 'add33_title'
 click 'css=img[alt=add]'
-assert_visible 'add31_title'
-type 'add31_title', 'add3'
+assert_visible 'add33_title'
+type 'add33_title', 'add3'
 click 'css=input[type=submit]'
-wait_for_not_visible 'add31_title'
+wait_for_not_visible 'add33_title'
 verify_text 'css=.add3 a', 'add3'
 # should have correct parent
 verify_text 'css=.add3 span', 'Kill the bugs'
 
 # Add a second element
-assert_not_visible 'add31_title'
+assert_not_visible 'add33_title'
 click 'css=img[alt=add]'
-assert_visible 'add31_title'
-type 'add31_title', 'add3_2'
+assert_visible 'add33_title'
+type 'add33_title', 'add3_2'
 click 'css=input[type=submit]'
-wait_for_not_visible 'add31_title'
+wait_for_not_visible 'add33_title'
 verify_text 'css=.add3_2 a', 'add3_2'
 # should have correct parent
 verify_text 'css=.add3_2 span', 'Kill the bugs'

data/test/selenium/Drop/drop1.rsel

@@ -1,25 +1,25 @@
-open "/oo/testnode37.html?test=drop1"
+open '/oo/testnode37.html?test=drop1'
 assert_element_not_present 'drop13_33'
 
 # Drag & Drop
 set_timeout 4000
-drag_and_drop_to_object "css=#drop11_33 > span.drag_handle", "drop12"
-wait_for_element_present "drop13_33"
-verify_text "drop13_33", "Art"
+drag_and_drop_to_object 'css=#drop11_33 > span.drag_handle', 'drop12'
+wait_for_element_present 'drop13_33'
+verify_text 'drop13_33', 'Art'
 # Unlink
-click "css=img[alt=remove]"
-wait_for_element_not_present "drop13_33"
+click 'css=img[alt=remove]'
+wait_for_element_not_present 'drop13_33'
 
 # Restart
 
 # Drag & Drop
-drag_and_drop_to_object "css=#drop11_33 > span.drag_handle", "drop12"
-wait_for_element_present "drop13_33"
-verify_text "drop13_33", "Art"
+drag_and_drop_to_object 'css=#drop11_33 > span.drag_handle', 'drop12'
+wait_for_element_present 'drop13_33'
+verify_text 'drop13_33', 'Art'
 
 # Make sure the changes are commited to db
-open "/oo/testnode37.html?test=drop1"
+open '/oo/testnode37.html?test=drop1'
 assert_element_present 'drop13_33'
 # Unlink
-click "css=img[alt=remove]"
-wait_for_element_not_present "drop13_33"
+click 'css=img[alt=remove]'
+wait_for_element_not_present 'drop13_33'

data/test/selenium/Drop/drop2.rsel

@@ -1,30 +1,30 @@
-open "/oo/testnode37.html?test=drop2"
-assert_element_not_present 'drop22_29_33'
+open '/oo/testnode37.html?test=drop2'
+assert_element_not_present 'drop23_29_33'
 
 # Drag & Drop
 set_timeout 4000
 command 'setSpeed', 10
-drag_and_drop_to_object "css=#drop21_33 > span.drag_handle", "drop22_29"
-wait_for_element_present "drop22_29_33"
-verify_text "drop22_29_33", "Art"
+drag_and_drop_to_object 'css=#drop21_33 > span.drag_handle', 'drop23_29'
+wait_for_element_present 'drop23_29_33'
+verify_text 'drop23_29_33', 'Art'
 # Unlink
-click "css=#drop22_29_33 img[alt=remove]"
-wait_for_element_not_present "drop22_29_33"
+click 'css=#drop23_29_33 img[alt=remove]'
+wait_for_element_not_present 'drop23_29_33'
 
 # Drag in other target
 
 # Drag & Drop
-drag_and_drop_to_object "css=#drop21_33 > span.drag_handle", "drop22_21"
-wait_for_element_present "drop22_21_33"
-verify_text "drop22_21_33", "Art"
+drag_and_drop_to_object 'css=#drop21_33 > span.drag_handle', 'drop23_21'
+wait_for_element_present 'drop23_21_33'
+verify_text 'drop23_21_33', 'Art'
 
 # Make sure the changes are commited to db
-open "/oo/testnode37.html?test=drop2"
+open '/oo/testnode37.html?test=drop2'
 assert_element_present 'drop23_21_33'
 # Should be
-# assert_element_present 'drop22_21_33'
+# assert_element_present 'drop23_21_33'
 # Unlink
-click "css=#drop23_21_33 img[alt=remove]"
-wait_for_element_not_present "drop23_21_33"
+click 'css=#drop23_21_33 img[alt=remove]'
+wait_for_element_not_present 'drop23_21_33'
 
 command 'setSpeed', 0

data/test/selenium/Drop/drop3.rsel

@@ -1,36 +1,36 @@
 # Drag from list in each.
-open "/oo/testnode37.html?test=drop3"
-assert_element_not_present 'drop33_26'
+open '/oo/testnode37.html?test=drop3'
+assert_element_not_present 'drop34_26'
 
 # Drag & Drop
 set_timeout 4000
-drag_and_drop_to_object "css=#drop13_21_26 > span.drag_handle", "drop32"
-wait_for_element_present "drop33_26"
-verify_text "drop33_26", "crocodiles"
+drag_and_drop_to_object 'css=#drop31_21_26 > span.drag_handle', 'drop33'
+wait_for_element_present 'drop34_26'
+verify_text 'drop34_26', 'crocodiles'
 # Unlink
-click "css=img[alt=remove]"
-wait_for_element_not_present "drop33_26"
+click 'css=img[alt=remove]'
+wait_for_element_not_present 'drop34_26'
 
 # Restart
 
 # Drag & Drop
-drag_and_drop_to_object "css=#drop13_21_26 > span.drag_handle", "drop32"
-wait_for_element_present "drop33_26"
-verify_text "drop33_26", "crocodiles"
+drag_and_drop_to_object 'css=#drop31_21_26 > span.drag_handle', 'drop33'
+wait_for_element_present 'drop34_26'
+verify_text 'drop34_26', 'crocodiles'
 
 # Drag & Drop from other location
-command 'setSpeed', 500
-drag_and_drop_to_object "css=#drop13_11_12 > span.drag_handle", "drop32"
-wait_for_element_present "drop33_12"
-verify_text "drop33_12", "people"
+command 'setSpeed', 800
+drag_and_drop_to_object 'css=#drop31_11_12 > span.drag_handle', 'drop33'
+wait_for_element_present 'drop34_12'
+verify_text 'drop34_12', 'people'
 command 'setSpeed', 0
 
 # Make sure the changes are commited to db
-open "/oo/testnode37.html?test=drop3"
-assert_element_present 'drop33_26'
-assert_element_present 'drop33_12'
+open '/oo/testnode37.html?test=drop3'
+assert_element_present 'drop34_26'
+assert_element_present 'drop34_12'
 # Unlink
-click "css=#drop33_26 img[alt=remove]"
-wait_for_element_not_present "drop33_26"
-click "css=#drop33_12 img[alt=remove]"
-wait_for_element_not_present "drop33_12"
+click 'css=#drop34_26 img[alt=remove]'
+wait_for_element_not_present 'drop34_26'
+click 'css=#drop34_12 img[alt=remove]'
+wait_for_element_not_present 'drop34_12'

data/test/selenium/Drop/drop4.rsel

@@ -1,6 +1,6 @@
 # Drag from list in each.
 open "/oo/testnode37.html?test=drop4"
-assert_element_not_present 'drop43_26'
+assert_element_not_present 'drop44_26'
 
 # Drag & Drop
 set_timeout 4000