zena 1.0.0.beta3 → 1.0.0.rc1

data/lib/zena/use/zazen.rb

@@ -120,7 +120,7 @@ module Zena
             if %w{true [id] [zip]}.include?(anchor)
               anchor_value = "node#{node.zip}"
             elsif anchor =~ /\[(.+)\]/
-              anchor_value = $1 == 'node_name' ? node.node_name : node.prop[$1]
+              anchor_value = node.prop[$1].url_name
             else
               anchor_value = anchor
             end
@@ -208,11 +208,12 @@ module Zena
 
         # Create a gallery from a list of images. See ApplicationHelper#zazen for details.
         def make_gallery(ids=[], opts={})
+          node = opts[:node] || @node
           if ids == []
-            images = secure(Image) { Image.find(:all, :conditions => ["parent_id = ?", (opts[:node] || @node)[:id]], :order => "position ASC, node_name ASC")}
+            images = node.find(:all, 'images')
           else
             ids = ids.map{|i| i.to_i}
-            images = ids == [] ? nil : secure(Document) { Document.find(:all, :conditions=>"zip IN (#{ids.join(',')})") }
+            images = secure(Document) { Document.find(:all, :conditions=>"zip IN (#{ids.join(',')})") }
             # order like ids :
             images.sort! {|a,b| ids.index(a[:zip].to_i) <=> ids.index(b[:zip].to_i) } if images
           end
@@ -244,7 +245,7 @@ module Zena
             docs = node.find(:all, 'images')
           else
             ids = ids.map{|i| i.to_i}
-            docs = ids == [] ? nil : secure!(Document) { Document.find(:all, :order=>'node_name ASC', :conditions=>"zip IN (#{ids.join(',')})") }
+            docs = ids == [] ? nil : secure!(Document) { Document.find(:all, :conditions=>"zip IN (#{ids.join(',')})") }
             # order like ids :
             docs.sort! {|a,b| ids.index(a[:zip].to_i) <=> ids.index(b[:zip].to_i) } if docs
           end

data/lib/zena/zafu_compiler.rb

@@ -19,6 +19,7 @@ module Zena
     Zena::Use::Dates::ZafuMethods,
     Zena::Use::Forms::ZafuMethods,
     Zena::Use::Recursion::ZafuMethods,
+    Zena::Use::Rendering::ZafuMethods,
     Zena::Use::Search::ZafuMethods,
     Zena::Use::Ajax::ZafuMethods,
     Zena::Use::ZafuSafeDefinitions::ZafuMethods,

data/locale/en/zena.po

@@ -1391,7 +1391,6 @@ msgid "rebuild_btn"
 msgstr "<img src='/images/arrow_refresh.png' alt='rebuild template'/>"
 
 #: lib/gettext_strings.rb:163
-#, fuzzy
 msgid "turn_dev_off_btn"
 msgstr "<img src='/images/bug.png' title='turn dev off'/>"
 

data/locale/fr/zena.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: version 0.0.1\n"
 "POT-Creation-Date: 2010-06-02 16:42+0200\n"
-"PO-Revision-Date: 2010-06-02 16:43+0100\n"
+"PO-Revision-Date: 2010-09-28 17:41+0100\n"
 "Last-Translator: Gaspard Bucher <gaspard@teti.ch>\n"
 "Language-Team: fr <gaspard@teti.ch>\n"
 "MIME-Version: 1.0\n"
@@ -311,7 +311,7 @@ msgstr "modifier la relation"
 #: app/views/relations/index.erb:1
 #: lib/zena/use/display.rb:267
 msgid "manage relations"
-msgstr "gestion des rôles"
+msgstr "gestion des relations"
 
 #: app/views/relations/new.erb:1
 #, fuzzy
@@ -1039,7 +1039,7 @@ msgstr "ouvert"
 
 #: lib/gettext_strings.rb:63
 msgid "closed"
-msgstr "vermé"
+msgstr "fermé"
 
 #: lib/gettext_strings.rb:65
 #: lib/zena/use/i18n.rb:144
@@ -1512,7 +1512,7 @@ msgstr ""
 
 #: lib/zena/use/display.rb:166
 msgid "%{ext} node"
-msgstr "objet %{type}"
+msgstr "objet %{ext}"
 
 #: lib/zena/use/display.rb:252
 msgid "my home"

data/misc/zena

@@ -0,0 +1,35 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          zena
+# Required-Start:    $remote_fs
+# Required-Stop:     $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: init.d script to launch /usr/loca/bin/zena_init
+### END INIT INFO
+
+# Author: Gaspard Bucher <gaspard@teti.ch>
+#
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
+DESC="Zena server"
+
+case "$1" in
+  start)
+        # launch ruby script
+        /usr/local/bin/zena_init start
+        ;;
+  stop)
+        # launch ruby script
+        /usr/local/bin/zena_init start
+        ;;
+  restart)
+        # launch ruby script
+        /usr/local/bin/zena_init restart
+        ;;
+  *)
+        echo "Usage: $SCRIPTNAME {start|stop|restart}" >&2
+        exit 3
+        ;;
+esac

data/misc/zena_init

@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby
+#
+# Zena Startup script
+#
+# chkconfig: - 85 15
+# description: zena manages Zena
+#
+apps = Dir['/var/*/app/current']
+
+cmd = ARGV.first
+
+operations = [
+  'ruby lib/upload_progress_server.rb ',
+  'rake worker:',
+  'mongrel_rails cluster::',
+]
+
+if %w{stop restart}.include?(cmd)
+  apps.each do |app|
+    puts "Stopping #{app}..."
+    operations.each do |op|
+      `cd #{app} && #{op}stop`
+    end
+  end
+end
+
+if %w{start restart}.include?(cmd)
+  apps.each do |app|
+    puts "Starting #{app}..."
+    operations.each do |op|
+      `cd #{app} && #{op}start`
+    end
+  end
+end
+
+unless %w{start stop restart}.include?(cmd)
+  puts "Usage: zena {start|stop|restart}"
+  exit
+end
+
+

data/public/javascripts/zena.js

@@ -601,14 +601,14 @@ Zena.Div_editor.prototype = {
 }
 
 Zena.draggable = function(dom_id, drag_handle, revert) {
-  revert = revert == undefined ? true : revert
-  new Draggable(dom_id, {ghosting:true, revert:revert, handle:drag_handle});
+  revert = revert == undefined ? true : revert;
   if (drag_handle) {
-    if ($(dom_id).select('.' + drag_handle) != []) {
+    if ($(dom_id).select('.' + drag_handle) == []) {
       // insert span
       $(dom_id).insert({top: "<span class='" + drag_handle + "'>&nbsp;</span>"});
     }
   }
+  new Draggable(dom_id, {ghosting:true, revert:revert, handle:drag_handle});
 }
 
 Zena.select_tab = function(name) {
@@ -800,10 +800,7 @@ Zena.put = function(tag) {
   f.appendChild(m);
   f.submit();
 }
-function test()
-{
-	alert("test!");
-}
+
 Zena.set_toggle = function(dom_id, definition) {
   var elem = $(dom_id);
   var id = dom_id.replace(/^.*_/,'') * 1;
@@ -861,4 +858,35 @@ Zena.toggle = function(elem, definition, id) {
       }
     });
   }
+}
+
+Zena.m_toggle = function(id) {
+  var txt_id = 'txt_' + id;
+  $('off_'+id, 'on_'+id, txt_id).invoke('toggle');
+  if ($(txt_id).style.display != 'none') {
+    $$('#' + txt_id + ' iframe').each(function(s) {
+      s.src = s.src;
+    });
+  }
+  fleXenv.updateScrollBars();
+}
+
+var pm_counter = 1;
+Zena.plus_minus = function(elem, start, plus, minus) {
+  plus  = plus  == undefined ? '[+]' : plus;
+  minus = minus == undefined ? '[-]' : minus;
+
+  var tag = elem.tagName;
+  pm_counter = pm_counter + 1;
+  var id = "m_" + pm_counter;
+  var show = start == 'on' ? 'display:none;' : '';
+  var hide = start == 'on' ? '' : 'display:none;';
+  var trigger_tag = " <a id='off_"+id+"' style='"+show+"' onclick='Zena.m_toggle(\"" + id +"\")' class='plus_btn'>"+plus+"</a><a id='on_"+id+"' style='"+hide+"' onclick='Zena.m_toggle(\"" + id +"\")' class='minus_btn'>"+minus+"</a>";
+  var new_tag = "<"+tag+" style='"+hide+"' id='txt_"+id+"' class='txt'>" + elem.innerHTML + "</"+tag+">";
+  if (tag.toUpperCase() == 'SPAN' || !elem.previous()) {
+    Element.replace(elem, trigger_tag + ' ' + new_tag);
+  } else {
+    Element.insert(elem.previous(), {bottom:trigger_tag});
+    Element.replace(elem, new_tag);
+  }
 }

data/public/stylesheets/admin.css

@@ -8,8 +8,8 @@
 /* ADMIN USERS, GROUPS */
 .admin_links { margin:18px; border:1px solid #35462B; background:#ccc; padding:0;}
 .admin_links li { padding:0;}
-#context .admin_links li a { margin:0; border-top:1px solid #35462B; padding:3px; font-size:90%; color:black;  display:block;}
-#context .admin_links li:first-child a { border:0; }
+.admin_links li a { margin:0; border-top:1px solid #35462B; padding:3px; font-size:90%; color:black;  display:block;}
+.admin_links li:first-child a { border:0; }
 .admin_links li a:hover { background:#999; }
 .admin_links li a.on {background:#eee;}
 .disabled img { opacity:0.4;}
@@ -82,3 +82,6 @@ ul.actions select { width:186px; }
 #preferences .errors ul { margin:0 -5px 5px;}
 .actions .errors ul { background:#DDC8C8; margin:0 0 5px; padding:4px 0; border-bottom:1px solid #5A3231;}
 .actions .errors li { margin-left:0.4em; background:inherit; line-height:1.2em;}
+
+/* forms */
+label { font-size:0.9em; font-weight:bold; display:block; color:#5C1515; margin:10px 0 5px; clear:both;}

data/public/stylesheets/default.css

@@ -22,12 +22,13 @@ input { padding:3px 4px;}
 #header a { color: inherit; }
 
 #title { margin:60px 42px 15px 200px; color:black;}
-#content #title {margin-left:0;}
 #title h1 { font-size:35px; margin:0;}
 .summary p { margin:0; font-style:italic; font-family:Georgia,Times,serif;}
 #context { width:180px; float:left; border-right:1px solid grey;}
 #context a { color:#aaa; }
+#context .admin_links a { color:inherit; }
 #context a:hover { color:#04a; }
+#context .admin_links a:hover { color:inherit; }
 ol { padding-left:14px;}
 
 #content { margin-left: 200px; }

data/public/stylesheets/popup.css

@@ -121,7 +121,7 @@ ul.infos li { padding:0.4em 0.4em; list-style:none; display:block; }
 .drive ul { list-style:none; padding:5px;}
 .drive li p { font-weight:normal;}
 .drive li select { width: 100%;}
-.drive li #node_name  { width: 95%;}
+.drive li #title  { width: 95%;}
 .drive li.submit { text-align:right; padding-top:1em;}
 .select_id span { margin-left:0.2em;}
 

data/public/stylesheets/zena.css

@@ -58,8 +58,8 @@ table.errors td { padding:2px 5px; background:inherit; border:none;}
 .clear { clear:both;}
 
 /* dev */
-#dev { background:#CABFA6; font-size:10px; position:fixed; bottom:5px; right:5px;
-padding:5px; border:1px solid #714D3D; text-align:left; color:#444; z-index:9999;}
+#dev { background:#eee; font-size:10px; position:fixed; bottom:0px; right:0px;
+padding:5px; border:2px solid #222; text-align:left; color:#444; z-index:9999; border-width:2px 0 0 2px;}
 #dev a { color:inherit; }
 #dev ul, #dev li { margin:0; padding:0; list-style:none; background:none; list-style-image:none;}
 #dev a.group { font-weight:bold; color:#222; display:block;}

data/test/custom_queries/complex.host.yml

@@ -77,6 +77,7 @@ Node:
         # all formations are created inside the course = project. This is why
         # form.project_id == course_id.
         - LEFT JOIN (SELECT nodes.project_id AS course_id, flink.target_id AS emp_id, MAX(nodes.event_at) AS last_date FROM nodes INNER JOIN links AS flink ON nodes.id = flink.source_id AND flink.relation_id = RELATION_ID(assigned_formation) AND (flink.status IS NULL OR flink.status = 100) GROUP BY flink.target_id, nodes.project_id) AS form ON courses.id = form.course_id AND form.emp_id = NODE_ID
+        - INNER JOIN idx_nodes_ml_strings AS _ml1 ON courses.id = _ml1.node_id AND _ml1.key = 'title' AND _ml1.lang = VISITOR_LANG
     where:
       # get all assigned jobs (links)
       - links.source_id = NODE_ID
@@ -88,13 +89,12 @@ Node:
       - li1.relation_id = RELATION_ID(assigned_course)
       - courses.id = li1.source_id
     group: courses.id
-    order: priority DESC, last_date ASC, courses.node_name ASC
+    order: priority DESC, last_date ASC, _ml1.value ASC
 
   course_emp_date:
     main_table: employees
     select:
       - employees.id
-      - employees.node_name
       - employees.publish_from
       - employees.zip
       - employees.vclass_id
@@ -118,11 +118,12 @@ Node:
     join_tables:
       employees:
         - LEFT JOIN (SELECT nodes.project_id AS project_id, flink.target_id AS emp_id, MAX(nodes.event_at) AS last_date FROM nodes INNER JOIN links AS flink ON nodes.id = flink.source_id AND flink.relation_id = RELATION_ID(assigned_formation) AND (flink.status IS NULL OR flink.status = 100) GROUP BY flink.target_id, nodes.project_id) AS form ON form.emp_id = employees.id AND form.project_id = NODE_ID
+        - INNER JOIN idx_nodes_ml_strings AS _ml1 ON employees.id = _ml1.node_id AND _ml1.key = 'title' AND _ml1.lang = VISITOR_LANG
     where:
       - employees.id = li1.source_id AND li1.relation_id = RELATION_ID(assigned_employee) AND li1.target_id = assigned_pages.project_id
       - assigned_pages.id = links.target_id AND links.relation_id = RELATION_ID(assigned_page) AND links.source_id = NODE_ID
     group: employees.id
-    order: employees.node_name ASC, IF(form.last_date,form.last_date,0) ASC
+    order: _ml1.value ASC, IF(form.last_date,form.last_date,0) ASC
 
 
   all_course_emp_date:
@@ -131,7 +132,6 @@ Node:
     main_table: courses
     select:
       - courses.id
-      - courses.node_name
       - courses.publish_from
       - courses.zip
       - courses.vclass_id
@@ -170,4 +170,11 @@ Node:
         - "INNER JOIN links ON formations.id = links.source_id AND links.relation_id = RELATION_ID(assigned_formation) AND (links.status IS NULL OR links.status = 50)"
     where:
       - formations.kpath like 'NNF%'
-    group: formations.id
+    group: formations.id
+
+  alias_query:
+    main_table: nodes
+    select:
+      - "(log_at + INTERVAL 6 months) AS event_at"
+    tables:
+      - nodes

data/test/fixtures/files/Node-test.zafu

@@ -120,7 +120,7 @@ This filter updates the "distant filter block test"
 
 <div id='upfi' do='block'>
   <h2>distant filter block test</h2>
-    <ol do='pages where node_name like "[param:f]%" limit 5'><li do='each' do='node_name'/></ol>
+    <ol do='pages where title like "[param:f]%" limit 5'><li do='each' do='title'/></ol>
 </div>
 
 <hr/>
@@ -128,8 +128,8 @@ This filter updates the "distant filter block test"
 <div id='filter'>
   <h2>filter block test</h2>
   <r:filter live='true'/>
-  <r:block do='pages where node_name like "[param:f]%" limit 5'>
-    <ol><li do='each' do='node_name'/></ol>
+  <r:block do='pages where title like "[param:f]%" limit 5'>
+    <ol><li do='each' do='title'/></ol>
   </r:block>
 </div>
 

data/test/fixtures/files/translations_fr.yml

@@ -3,5 +3,7 @@ translations:
   words: les mots
   date_format: '[%d.%m]'
   # used to translate dynamic key
-  status: statut
-  lang_en: anglais
+  'status title': statut
+  lang_en: anglais
+  mean: "<%= 5 + 8 %>"
+  mean_m: "<"

data/test/functional/documents_controller_test.rb

@@ -45,6 +45,37 @@ class DocumentsControllerTest < Zena::Controller::TestCase
       end
     end # uploading a document
 
+    context 'adding a document' do
+      subject do
+        { :action => 'new', :controller => 'documents',
+          :parent_id => nodes_zip(:zena)
+        }
+      end
+
+      should 'show popup form' do
+        get_subject
+        assert_response :success
+      end
+      
+      should 'show tab for new templates' do
+        get_subject
+        assert_match %r{node_target_klass}, @response.body
+      end
+
+      context 'with errors' do
+        subject do
+          { :action => 'create', :controller => 'documents',
+            :node   => {:parent_id => 0, :file => uploaded_jpg('bird.jpg')}
+          }
+        end
+
+        should 'render new form' do
+          post_subject
+          assert_template 'documents/new'
+        end
+      end
+    end # creating a document
+    
     context 'creating a document' do
       subject do
         { :action => 'create', :controller => 'documents',

data/test/functional/nodes_controller_commit_test.rb

@@ -29,7 +29,7 @@ class NodesControllerCommitTest < ActionController::TestCase
         node_list = assigns(:nodes)
         nodes = {}
         node_list.each do |n|
-          nodes[n.node_name] = n
+          nodes[n.title] = n
         end
         assert skin = nodes['jet30']
         assert_kind_of Skin, skin
@@ -63,9 +63,5 @@ class NodesControllerCommitTest < ActionController::TestCase
         assert_match %r{posuere eleifend arcu</p>\s*<img [^>]*src\s*=\s*./en/image#{topIcon.zip}.gif}, @response.body
       end
     end
-
-  rescue => err
-    puts err
-    puts err.backtrace
   end
 end

data/test/functional/nodes_controller_test.rb

@@ -209,6 +209,64 @@ class NodesControllerTest < Zena::Controller::TestCase
       end
     end # creating a node
 
+    context 'updating a node' do
+
+      context 'that she owns' do
+        setup do
+          @node = secure(Page) { Page.create(:parent_id => nodes_id(:zena), :title => 'hop', :v_status => Zena::Status[:pub]) }
+        end
+
+        context 'in redit time' do
+          subject do
+            {:action => 'update', :controller => 'nodes', :id => @node.zip, :node => {:title => 'hip'}}
+          end
+
+          should 'create a new version' do
+            assert_difference('Version.count', 1) do
+              put_subject
+              assert_redirected_to "/oo/page#{subject[:id]}.html"
+            end
+          end
+        end # in redit time
+      end # that she owns
+
+      context 'with a redir param' do
+        subject do
+          {:action => 'update', :controller => 'nodes', :id => nodes_zip(:people), :node => {:title => 'friends'}, :redir => '/foo/bar/baz'}
+        end
+
+        should 'redirect to "redir" param' do
+          put_subject
+          assert_redirected_to '/foo/bar/baz'
+        end
+      end # with a redir param
+
+      context 'by changing skin' do
+        subject do
+          {:action => 'update', :controller => 'nodes', :id => nodes_zip(:people), :node => {:skin_zip => nodes_zip(:wikiSkin), :inherit => 0}}
+        end
+
+        should 'update skin_id' do
+          put_subject
+          assert_equal nodes_id(:wikiSkin), nodes(:people).skin_id
+        end
+
+        context 'with a bad value' do
+          subject do
+            {:action => 'update', :controller => 'nodes', :id => nodes_zip(:people), :node => {:skin_zip => nodes_zip(:status), :inherit => 0}}
+          end
+
+          should 'set error message on skin_id' do
+            put_subject
+            assert_response :success
+            assert_equal 'type mismatch (Page is not a Skin)', assigns(:node).errors[:skin_id]
+          end
+        end # with a bad value
+
+      end # by changing skin
+
+    end # updating a node
+
     context 'using xml' do
       context 'without being in the api_group' do
         setup do
@@ -288,6 +346,28 @@ class NodesControllerTest < Zena::Controller::TestCase
           zip = assigns(:node).zip
           assert_match %r{<id[^>]*>#{zip}</id>}, @response.body
         end
+
+        context 'with a redir param' do
+          subject do
+            {:action => 'create', :controller => 'nodes', :node => {:parent_id => nodes_zip(:zena), :title => 'hello'}, :redir => '/foo/bar/baz'}
+          end
+
+          should 'redirect to "redir" param' do
+            post_subject
+            assert_redirected_to '/foo/bar/baz'
+          end
+        end # with a redir param
+
+        context 'with a mode param' do
+          subject do
+            {:action => 'create', :controller => 'nodes', :node => {:parent_id => nodes_zip(:zena), :title => 'hello'}, :mode => 'info'}
+          end
+
+          should 'redirect to node with mode' do
+            post_subject
+            assert_redirected_to "/oo/page#{assigns(:node).zip}_info.html"
+          end
+        end # with a redir param
       end # creating a node
 
       context 'deleting a node' do
@@ -445,7 +525,7 @@ class NodesControllerTest < Zena::Controller::TestCase
       with_caching do
         assert !File.exist?("#{SITES_ROOT}/test.host/public/fr/#{name}")
         login(:lion)
-        doc = secure!(Template) { Template.create('node_name'=>'Node', 'format'=>'xml', 'text' => '<?xml version="1.0" encoding="utf-8"?><node><title do="title"/></node>', 'parent_id'=>nodes_id(:default))}
+        doc = secure!(Template) { Template.create('title'=>'Node', 'format'=>'xml', 'text' => '<?xml version="1.0" encoding="utf-8"?><node><title do="title"/></node>', 'parent_id'=>nodes_id(:default))}
         assert !doc.new_record?, "Not a new record"
         assert doc.publish
         login(:anon)
@@ -474,7 +554,7 @@ class NodesControllerTest < Zena::Controller::TestCase
   def test_ics_format_not_anon
     preserving_files('test.host/zafu') do
       login(:lion)
-      doc = secure!(Template) { Template.create("node_name"=>"Project", "format"=>"ics", "summary"=>"", 'text' => "<r:notes in='site' order='event_at asc'>
+      doc = secure!(Template) { Template.create("title"=>"Project", "format"=>"ics", "summary"=>"", 'text' => "<r:notes in='site' order='event_at asc'>
 BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//hacksw/handcal//NONSGML v1.0//EN
@@ -526,7 +606,7 @@ END:VCALENDAR
   def test_create_nodes_from_folder
     login(:tiger)
     preserving_files('/test.host/data') do
-      parent = secure!(Project) { Project.create(:node_name => 'import', :parent_id => nodes_id(:zena)) }
+      parent = secure!(Project) { Project.create(:title => 'import', :parent_id => nodes_id(:zena)) }
       assert !parent.new_record?, "Not a new record"
 
       nodes = secure!(Node) { Node.create_nodes_from_folder(:folder => File.join(Zena::ROOT, 'test', 'fixtures', 'import'), :parent_id => parent[:id] )}.values
@@ -537,14 +617,14 @@ END:VCALENDAR
       assert_equal 4, nodes.size
       bird, doc   = nil, nil
       nodes.each do |n|
-        bird = n if n.node_name == 'bird'
-        doc  = n if n.node_name == 'document'
+        bird = n if n.title == 'bird'
+        doc  = n if n.title == 'document'
       end
-      simple = secure!(Node) { Node.find_by_node_name_and_parent_id('simple', parent[:id]) }
-      photos = secure!(Node) { Node.find_by_node_name_and_parent_id('photos', parent[:id]) }
+      simple = secure!(Node) { Node.find_by_parent_title_and_kpath(parent.id, 'simple') }
+      photos = secure!(Node) { Node.find_by_parent_title_and_kpath(parent.id, 'Photos !') }
 
-      assert_equal 'bird', bird.node_name
-      assert_equal 'simple', simple.node_name
+      assert_equal 'bird', bird.title
+      assert_equal 'simple', simple.title
       assert_equal 'jpg', bird.ext
       assert_equal 'Le septième ciel', bird.text
       versions = secure!(Node) { Node.find(bird[:id]) }.versions
@@ -607,7 +687,7 @@ END:VCALENDAR
     get 'edit', :id => nodes_zip(:zena)
     assert_response :success
     assert_template 'nodes/edit'
-    assert_match %r{/default/Node-\+popupLayout/en/_main$}, @response.layout
+    assert_match %r{/Default skin/Node-%2BpopupLayout/en/_main$}, @response.layout
   end
 
   def test_crop_image
@@ -666,7 +746,7 @@ END:VCALENDAR
 
   def test_search_klass
     login(:anon)
-    get 'search', 'class' => 'Project', 'title' => 'a wiki with zena'
+    get 'search', 'class' => 'Blog', 'title' => 'a wiki with Zena'
     assert nodes = assigns(:nodes)
     assert_equal [nodes_id(:wiki)], nodes.map {|r| r.id}
   end
@@ -789,7 +869,7 @@ end
       ['2006','page18.html'],
       ['2006.xml','page18.xml'],
       ['p12','page12.html'],
-      ['25-10-2006','project29.html'],
+      ['25-10-2006','blog29.html'],
       ['archive-1','image30.html'],
       ['archive', 404],
     ].each do |name, result|