zena 1.1.3 → 1.2.0

data/test/selenium/Edit/edit2.rsel

@@ -3,36 +3,36 @@
 
 open '/oo/testnode37.html?test=edit2'
 set_timeout 4000
-assert_element_not_present 'edit21_title'
+assert_element_not_present 'edit22_title'
 verify_text "css=#edit21 li.title", @old_title
 
 # edit (does not click on 'v_status' checkbox)
 click 'link=edit'
-wait_for_element_present 'edit21_title'
-type 'edit21_title', @new_title
+wait_for_element_present 'edit22_title'
+type 'edit22_title', @new_title
 
 # submit
 click 'css=input[type=submit]'
-wait_for_element_not_present 'edit21_title'
+wait_for_element_not_present 'edit22_title'
 verify_text "css=#edit21 li.title", @new_title
 
 # edit again (click on 'v_status' checkbox)
 click 'link=edit'
-wait_for_element_present 'edit21_title'
+wait_for_element_present 'edit22_title'
 
 # cancel
 click 'css=img[alt="cancel"]'
-wait_for_element_not_present 'edit21_title'
+wait_for_element_not_present 'edit22_title'
 
 # edit again
 click 'link=edit'
-wait_for_element_present 'edit21_title'
-type 'edit21_title', @old_title
+wait_for_element_present 'edit22_title'
+type 'edit22_title', @old_title
 click 'css=#edit2 input[type=checkbox]'
 
 # submit
 click 'css=input[type=submit]'
-wait_for_element_not_present 'edit21_title'
+wait_for_element_not_present 'edit22_title'
 verify_text "css=#edit21 li.title", @old_title
 
 # ensure page is published

data/test/selenium/Edit/edit4.rsel

@@ -0,0 +1,55 @@
+@old_title = 'Collections'
+@new_title = 'New Collections'
+
+open '/oo/testnode37.html?test=edit4'
+set_timeout 4000
+assert_element_not_present 'edit41_title'
+verify_text "css=#edit41_32 .title", @old_title
+
+# edit
+click 'link=edit'
+wait_for_element_present 'edit41_title'
+type 'edit41_title', @new_title
+
+# submit
+click 'css=input[type=submit]'
+wait_for_element_not_present 'edit41_title'
+verify_text "css=#edit41_32 .title", @new_title
+
+# edit again
+click 'link=edit'
+wait_for_element_present 'edit41_title'
+
+# cancel
+click 'css=img[alt="cancel"]'
+wait_for_element_not_present 'edit41_title'
+
+# edit again
+click 'link=edit'
+wait_for_element_present 'edit41_title'
+# Ensure we do proper ajax replacements
+assert_element_not_present 'css=#edit4 form form'
+type 'edit41_title', @old_title
+
+# submit
+click 'css=input[type=submit]'
+wait_for_element_not_present 'edit41_title'
+verify_text "css=#edit41_32 .title", @old_title
+
+# ensure changes are recorded
+open '/oo/testnode37.html?test=edit4'
+verify_text "css=#edit41_32 .title", @old_title
+
+# TODO: Test ADD and Edit: but to do this, we need a way to use
+#       variables (get the created object's DOM id).
+# click 'css=img[alt=add]'
+# assert_visible 'add41_title'
+# type 'add31_title', 'edit4add'
+# click 'css=input[type=submit]'
+# wait_for_not_visible 'add31_title'
+# verify_text 'css=.edit4add a', 'edit4add'
+# # edit newly created object
+# click '.edit4add link=edit'
+# We do not know the DOM id here: how do we do this ?
+# We have two edit41_title elements...
+#wait_for_element_present 'edit41_title'

data/test/selenium/Edit/edit5.rsel

@@ -0,0 +1,41 @@
+@old_title = 'Collections'
+@new_title = 'New Collections'
+
+open '/oo/testnode37.html?test=edit5'
+set_timeout 4000
+assert_element_not_present 'edit52_title'
+verify_text "css=#edit51_32 .title", @old_title
+
+# edit
+click 'link=edit'
+wait_for_element_present 'edit52_title'
+type 'edit52_title', @new_title
+
+# submit
+click 'css=input[type=submit]'
+wait_for_element_not_present 'edit52_title'
+verify_text "css=#edit51_32 .title", @new_title
+
+# edit again
+click 'link=edit'
+wait_for_element_present 'edit52_title'
+
+# cancel
+click 'css=img[alt="cancel"]'
+wait_for_element_not_present 'edit52_title'
+
+# edit again
+click 'link=edit'
+wait_for_element_present 'edit52_title'
+# Ensure we do proper ajax replacements
+assert_element_not_present 'css=#edit5 form form'
+type 'edit52_title', @old_title
+
+# submit
+click 'css=input[type=submit]'
+wait_for_element_not_present 'edit52_title'
+verify_text "css=#edit51_32 .title", @old_title
+
+# ensure changes are recorded
+open '/oo/testnode37.html?test=edit5'
+verify_text "css=#edit51_32 .title", @old_title

data/test/selenium/Edit/edit6.rsel

@@ -0,0 +1,53 @@
+@old_title = 'Collections'
+@new_title = 'New Collections'
+
+open '/oo/testnode37.html?test=edit6'
+set_timeout 4000
+assert_element_not_present 'edit63_title'
+verify_text "css=#edit61_32 .title", @old_title
+
+# swap block should work before edit
+# swap
+click 'css=#edit62_32 a'
+wait_for_element_present 'swap_span'
+verify_text "css=#edit62_32 span", 'bob'
+
+# edit
+click 'link=edit'
+wait_for_element_present 'edit63_title'
+type 'edit63_title', @new_title
+
+# submit
+click 'css=input[type=submit]'
+wait_for_element_present 'swap_span'
+verify_text "css=#edit61_32 .title", @new_title
+verify_text "css=#edit62_32 span", 'bob'
+
+# edit again
+click 'link=edit'
+wait_for_element_present 'edit63_title'
+
+# cancel
+click 'css=img[alt="cancel"]'
+wait_for_element_not_present 'edit63_title'
+
+# edit again
+click 'link=edit'
+wait_for_element_present 'edit63_title'
+# Ensure we do proper ajax replacements
+assert_element_not_present 'css=#edit6 form form'
+type 'edit63_title', @old_title
+
+# submit
+click 'css=input[type=submit]'
+wait_for_element_not_present 'edit63_title'
+verify_text "css=#edit61_32 .title", @old_title
+
+# swap block should work after edit
+click 'css=#edit62_32 a'
+wait_for_element_not_present 'swap_span'
+verify_text "css=#edit61_32 .title", @old_title
+
+# ensure changes are recorded
+open '/oo/testnode37.html?test=edit6'
+verify_text "css=#edit61_32 .title", @old_title

data/test/selenium/Filter/0setup.rsel

@@ -0,0 +1,12 @@
+# See also the RDoc for SeleniumOnRails::TestBuilder.
+# View result in browser: http://test.host:3000/selenium
+
+setup :fixtures => :all
+
+# Setup code
+open '/login'
+type 'user_login', 'lion'
+type 'password', 'lion'
+click_and_wait 'commit'
+click_and_wait 'link=Kill the bugs'
+verify_text '_title37', 'Kill the bugs'

data/test/selenium/Filter/filter1.rsel

@@ -0,0 +1,9 @@
+open '/oo/testnode37.html?test=filter1'
+# We are on the first page
+verify_element_not_present 'css=#filter1_list #fil555'
+type 'filter1_in', 'ird'
+wait_for_element_present 'fil1_30'
+verify_text 'fil1_30', 'bird'
+type 'filter1_in', 'flo'
+wait_for_element_present 'fil1_31'
+verify_text 'fil1_31', 'flower'

data/test/selenium/Filter/filter2.rsel

@@ -0,0 +1,9 @@
+open '/oo/testnode37.html?test=filter2'
+# We are on the first page
+verify_element_not_present 'css=#filter2_list #fil555'
+type 'filter2_in', 'ird'
+wait_for_element_present 'fil2_30'
+verify_text 'fil2_30', 'bird'
+type 'filter2_in', 'flo'
+wait_for_element_present 'fil2_31'
+verify_text 'fil2_31', 'flower'

data/test/selenium/Form/form1.rsel

@@ -1,6 +1,6 @@
 @test_page = "/oo/testnode37.html?test=form1"
 open @test_page
-type "paginate1_tbl_title", "Hello World!"
+type "form11_title", "Hello World!"
 # submit
 click_and_wait 'css=input[type=submit]'
 # Redirected to new page

data/test/selenium/Form/form2.rsel

@@ -1,5 +1,5 @@
 open "/oo/testnode37.html?test=form2"
-type "paginate1_tbl_title", "Heal the bugs!"
+type "form21_title", "Heal the bugs!"
 # submit
 click_and_wait 'css=input[type=submit]'
 

data/test/selenium/Form/form3.rsel

@@ -0,0 +1,15 @@
+open "/oo/testnode37.html?test=form3"
+type "form31_title", "Heal the bugs!"
+# submit
+assert_not_checked 'css=input[value=34]'
+click 'css=input[value=34]'
+click_and_wait 'css=input[type=submit]'
+
+# Redirected to same page
+assert_location "http://test.host:3000/oo/testnode37.html"
+open "/oo/testnode37.html?test=form3"
+assert_checked 'css=input[value=34]'
+click 'css=input[value=34]'
+click_and_wait 'css=input[type=submit]'
+open "/oo/testnode37.html?test=form3"
+assert_not_checked 'css=input[value=34]'

data/test/selenium/Grid/0setup.rsel

@@ -0,0 +1,13 @@
+# See also the RDoc for SeleniumOnRails::TestBuilder.
+# View result in browser: http://test.host:3000/selenium
+
+setup :fixtures => :all
+
+# Setup code
+open '/login'
+type 'user_login', 'lion'
+type 'password', 'lion'
+click_and_wait 'commit'
+click_and_wait 'link=Kill the bugs'
+verify_text '_title37', 'Kill the bugs'
+

data/test/selenium/Grid/grid1.rsel

@@ -0,0 +1,11 @@
+# Add first element
+open '/oo/testnode37.html?test=grid1'
+# THIS DOES NOT WORK. FIND ANOTHER WAY TO TEST THIS GRID.
+# verify_text 'css=.grid tr:nth-child(2) td:nth-child(1)', '[title]'
+# verify_text 'css=.grid tr:nth-child(3) td:nth-child(1)', 'value'
+# # Change title
+# click 'css=.grid td:nth-child(3)'
+# type 'css=.grid input', 'my title'
+# click 'css=#grid1 input[type="submit"]'
+# verify_text 'css=.grid tr:nth-child(2) td:nth-child(1)', 'my title'
+

data/test/selenium/Swap/0setup.rsel

@@ -0,0 +1,12 @@
+# See also the RDoc for SeleniumOnRails::TestBuilder.
+# View result in browser: http://test.host:3000/selenium
+
+setup :fixtures => :all
+
+# Setup code
+open '/login'
+type 'user_login', 'lion'
+type 'password', 'lion'
+click_and_wait 'commit'
+click_and_wait 'link=Kill the bugs'
+verify_text '_title37', 'Kill the bugs'

data/test/selenium/Swap/swap1.rsel

@@ -0,0 +1,13 @@
+open '/oo/testnode37.html?test=swap1'
+
+assert_element_not_present 'swap1_span'
+
+# swap
+click 'css=#swap1_s a'
+wait_for_element_present 'swap1_span'
+verify_text "css=#swap1_span", "bob"
+assert_element_present 'css=#swap1_s.bob'
+
+# swap back
+click 'css=#swap1_s a'
+wait_for_element_not_present 'swap1_span'

data/test/selenium/Swap/swap2.rsel

@@ -0,0 +1,11 @@
+open '/oo/testnode37.html?test=swap2'
+
+assert_element_not_present 'swap2_span'
+
+# edit
+click 'css=#swap2_s a'
+wait_for_element_present 'swap2_span'
+verify_text "css=#swap2_span", "bob"
+
+
+assert_element_present 'css=#swap2_s.bob'

data/test/selenium/Toggle/toggle1.rsel

@@ -3,18 +3,18 @@ assert_element_not_present "css=ul.references > li"
 
 # Add relation
 # Cannot test click on non-link in Safari and Chrome...
-click 'css=#toggle11_19.toggle.off > input.cb'
-wait_for_element_present 'css=#toggle11_19.toggle.on'
-verify_value "css=#toggle11_19 > input.cb", "on"
+click 'css=#toggle12_19.toggle.off > input.cb'
+wait_for_element_present 'css=#toggle12_19.toggle.on'
+verify_value "css=#toggle12_19 > input.cb", "on"
 
 # Reload page
 open "/oo/testnode37.html?test=toggle1"
 verify_text "css=ul.references > li", "Secret"
 
 # Remove relation
-click 'css=#toggle11_19.toggle.on > input.cb'
-wait_for_element_present 'css=#toggle11_19.toggle.off'
-verify_value "css=#toggle11_19 > input.cb", "off"
+click 'css=#toggle12_19.toggle.on > input.cb'
+wait_for_element_present 'css=#toggle12_19.toggle.off'
+verify_value "css=#toggle12_19 > input.cb", "off"
 
 # Reload page
 open "/oo/testnode37.html?test=toggle1"

data/test/sites/zena/versions.yml

@@ -720,4 +720,4 @@ translations_fr:
     title:         translations
     content_type:  text/yaml
     ext:           yml
-    size:          50
+    size:          50

data/test/unit/relation_proxy_test.rb

@@ -83,6 +83,42 @@ class RelationProxyTest < Zena::Unit::TestCase
     assert_equal [nodes_id(:art)], node.set_tag_ids
     assert_equal [nodes_zip(:art)], node.set_tag_zips
   end
+  
+  def test_set_tag_ids_with_blank
+    login(:tiger)
+    node = secure!(Node) { nodes(:status) }
+    assert node.update_attributes( 'set_tag_ids' => ['', nodes_id(:art).to_s] )
+    assert_equal [nodes_id(:art)], node.rel['set_tag'].other_ids
+
+    node = secure!(Node) { nodes(:status) } # reload
+    assert_equal nodes_id(:art), node.find(:all,'set_tags')[0][:id]
+    assert_equal [nodes_id(:art)], node.set_tag_ids
+    assert_equal [nodes_zip(:art)], node.set_tag_zips
+  end
+
+  def test_set_tag_zips
+    login(:tiger)
+    node = secure!(Node) { nodes(:status) }
+    assert node.update_attributes( 'set_tag_zips' => [nodes_zip(:art).to_s] )
+    assert_equal [nodes_id(:art)], node.rel['set_tag'].other_ids
+
+    node = secure!(Node) { nodes(:status) } # reload
+    assert_equal nodes_id(:art), node.find(:all,'set_tags')[0][:id]
+    assert_equal [nodes_id(:art)], node.set_tag_ids
+    assert_equal [nodes_zip(:art)], node.set_tag_zips
+  end
+  
+  def test_set_tag_zips_with_blank
+    login(:tiger)
+    node = secure!(Node) { nodes(:status) }
+    assert node.update_attributes( 'set_tag_zips' => ['', nodes_zip(:art).to_s] )
+    assert_equal [nodes_id(:art)], node.rel['set_tag'].other_ids
+
+    node = secure!(Node) { nodes(:status) } # reload
+    assert_equal nodes_id(:art), node.find(:all,'set_tags')[0][:id]
+    assert_equal [nodes_id(:art)], node.set_tag_ids
+    assert_equal [nodes_zip(:art)], node.set_tag_zips
+  end
 
   context 'On a new node' do
     subject do

data/test/unit/site_test.rb

@@ -172,10 +172,18 @@ class SiteTest < Zena::Unit::TestCase
       assert_kind_of User, subject.any_admin
       assert_equal users(:lion), subject.any_admin
     end
-    
+
     should 'respond to expire_in_dev' do
       assert !subject.expire_in_dev?
     end
+
+    should 'remove_from_site' do
+      assert_nothing_raised do
+        assert_difference('Node.count', -Node.count(:conditions => ['site_id = ?', subject.id])) do
+          subject.remove_from_db
+        end
+      end
+    end
   end # A site
 
 
@@ -354,7 +362,7 @@ class SiteTest < Zena::Unit::TestCase
     end
   end
 
-  
+
   private
     def fullpath(*args)
       args.map {|sym| nodes_zip(sym).to_s}.join('/')

data/test/unit/zena/use/rendering_test.rb

@@ -54,7 +54,7 @@ class RenderingInControllerTest < Zena::Controller::TestCase
       class << @controller
         attr_reader :custom_rendering
         def render_to_xml(opts)
-          @custom_rendering = true
+          @custom_rendering = opts
           {
             :type => 'text/html',
             :data => render_to_string(:inline => %Q{<%= zazen(%q{Hello !30! "a link":30}) %>}),
@@ -69,7 +69,8 @@ class RenderingInControllerTest < Zena::Controller::TestCase
 
     should 'call render_to_format' do
       get_subject
-      assert @controller.custom_rendering
+      assert !@controller.custom_rendering[:debug]
+      assert_equal 'xml', @controller.custom_rendering[:format]
     end
 
     context 'with debug' do
@@ -77,9 +78,9 @@ class RenderingInControllerTest < Zena::Controller::TestCase
         {:action => 'show', :controller => 'nodes', :path => ["page#{nodes_zip(:projects)}.xml"], :prefix => 'en', :debug => 'true'}
       end
 
-      should 'not call render_to_format on debug' do
+      should 'pass debug to render_to_format on debug' do
         get_subject
-        assert_nil @controller.custom_rendering
+        assert @controller.custom_rendering[:debug]
       end
     end # with debug
 
@@ -126,7 +127,7 @@ class RenderingInControllerTest < Zena::Controller::TestCase
         assert_raise(ActionView::TemplateError) { get_subject }
       end # Not found rendering
     end # to raise not found
-    
+
     # Not working yet...
     # context 'to redirect' do
     #   setup do
@@ -134,7 +135,7 @@ class RenderingInControllerTest < Zena::Controller::TestCase
     #     make_template "<r:redirect url='http://feature-space.com'/>", @mode
     #     login(:anon)
     #   end
-    # 
+    #
     #   should 'redirect' do
     #     get_subject
     #     assert_redirected_to 'http://feature-space.com'

data/test/unit/zena/use/zazen_test.rb

@@ -243,8 +243,7 @@ class ZazenTest < Zena::View::TestCase
 
   def test_table_asset
     login(:tiger)
-    assert_match %r{<table.*<tr.*<th>title</th.*<tr.*value}m, zazen("This is a table test:\n\n|shopping_list|")
-    assert_match %r{<table.*<th>problem</th>.*<th>solution</th>.*<th>cost</th>.*<tr>.*<td>dead hard drive</td>}m, zazen("This is a table test:\n\n|problems|")
+    assert_match %r{<table data-a='node\[shopping_list\]'.*class='grid'}m, zazen("This is a table test:\n\n|shopping_list|")
   end
 
   # only works if recaptcha plugin is installed

data/vendor/TextMate/Ruby Shoulda.tmbundle/Commands/Run 2.tmCommand

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>beforeRunningCommand</key>
+	<string>nop</string>
+	<key>command</key>
+	<string>#!/bin/sh
+
+export RUBYLIB="$TM_BUNDLE_SUPPORT/RubyMate${RUBYLIB:+:$RUBYLIB}"
+"${TM_RUBY:-ruby}" -- "$TM_BUNDLE_SUPPORT/RubyMate/run_script.rb"
+</string>
+	<key>input</key>
+	<string>document</string>
+	<key>keyEquivalent</key>
+	<string>@r</string>
+	<key>name</key>
+	<string>Run</string>
+	<key>output</key>
+	<string>showAsHTML</string>
+	<key>uuid</key>
+	<string>156042A4-5813-46D2-BA06-901C91D1A0B9</string>
+</dict>
+</plist>

data/vendor/TextMate/Ruby Shoulda.tmbundle/Commands/Run Context.tmCommand

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>beforeRunningCommand</key>
+	<string>saveActiveFile</string>
+	<key>command</key>
+	<string># Assumes the current file is a unittest file
+# Runs with the currently-focused method as the test name
+
+args=$(${TM_RUBY:=ruby} &lt;&lt;"EOF"
+
+def parse_from_quotes(name)
+  name.to_s.gsub(/^(?:.*"(.*)"|.*'(.*)').*$/) { $1 || $2 }
+end
+
+n = ENV['TM_LINE_NUMBER'].to_i
+
+should, context = nil, nil
+
+File.open(ENV['TM_FILEPATH']) do |f|
+  lines     = f.read.split("\n")[0...n].reverse
+  context   = lines.find { |line| line =~ /^\s*context\b/ }
+  should    = parse_from_quotes(lines.find { |line| line =~ /^\s*should\b/ })
+end
+
+if !context.empty? &amp;&amp; !should.empty?
+  puts "shoulda"
+  context = parse_from_quotes( context )
+  name = "#{context}".gsub(/[\+\.\s\'\"\(\)]/,'.')
+  print "--name=/#{name}/ -v v"  
+end
+
+EOF)
+
+if [[ -z "$args" ]]; then
+  echo -e "This doesn't appear to be a TestCase class."
+  exit_show_tool_tip
+  fi
+
+  export RUBYLIB="$TM_BUNDLE_SUPPORT/RubyMate${RUBYLIB:+:$RUBYLIB}"
+  "${TM_RUBY:-ruby}" -- "$TM_BUNDLE_SUPPORT/RubyMate/run_script.rb" $args</string>
+	<key>fallbackInput</key>
+	<string>scope</string>
+	<key>input</key>
+	<string>document</string>
+	<key>keyEquivalent</key>
+	<string>~@r</string>
+	<key>name</key>
+	<string>Run Context</string>
+	<key>output</key>
+	<string>showAsHTML</string>
+	<key>scope</key>
+	<string>source.ruby.rails.shoulda</string>
+	<key>uuid</key>
+	<string>2989704F-8F6B-439F-83A7-368BB174A010</string>
+</dict>
+</plist>