zena 1.2.1 → 1.2.2

data/test/selenium/Edit/edit2.rsel

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

data/test/selenium/Edit/edit5.rsel

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

data/test/selenium/Edit/edit6.rsel

@@ -3,7 +3,7 @@
 
 open '/oo/testnode37.html?test=edit6'
 set_timeout 4000
-assert_element_not_present 'edit63_title'
+assert_element_not_present 'edit61_title'
 verify_text "css=#edit61_32 .title", @old_title
 
 # swap block should work before edit
@@ -14,33 +14,33 @@ verify_text "css=#edit62_32 span", 'bob'
 
 # edit
 click 'link=edit'
-wait_for_element_present 'edit63_title'
-type 'edit63_title', @new_title
+wait_for_element_present 'edit61_title'
+type 'edit61_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'
+verify_text "swap_span", 'bob'
 
 # edit again
 click 'link=edit'
-wait_for_element_present 'edit63_title'
+wait_for_element_present 'edit61_title'
 
 # cancel
 click 'css=img[alt="cancel"]'
-wait_for_element_not_present 'edit63_title'
+wait_for_element_not_present 'edit61_title'
 
 # edit again
 click 'link=edit'
-wait_for_element_present 'edit63_title'
+wait_for_element_present 'edit61_title'
 # Ensure we do proper ajax replacements
 assert_element_not_present 'css=#edit6 form form'
-type 'edit63_title', @old_title
+type 'edit61_title', @old_title
 
 # submit
 click 'css=input[type=submit]'
-wait_for_element_not_present 'edit63_title'
+wait_for_element_not_present 'edit61_title'
 verify_text "css=#edit61_32 .title", @old_title
 
 # swap block should work after edit

data/test/selenium/Form/form4.rsel

@@ -0,0 +1,17 @@
+open "/oo/testnode37.html?test=form4"
+verify_text "form4_one", "un"
+verify_text "form4_two", "deux"
+type "form41_settings", "zwei"
+# submit
+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=form4"
+verify_text "form4_one", "un"
+verify_text "form4_two", "zwei"
+
+# clear
+type "form41_settings", "deux"
+# submit
+click_and_wait 'css=input[type=submit]'

data/test/selenium/Toggle/toggle1.rsel

@@ -1,6 +1,8 @@
 open "/oo/testnode37.html?test=toggle1"
 assert_element_not_present "css=ul.references > li"
 
+wait_for_element_present 'css=#toggle12_19.toggle.off > input.cb'
+
 # Add relation
 # Cannot test click on non-link in Safari and Chrome...
 click 'css=#toggle12_19.toggle.off > input.cb'

data/test/selenium/Toggle/toggle2.rsel

@@ -0,0 +1,18 @@
+open "/oo/testnode37.html?test=toggle2"
+assert_element_not_present "css=ul.references > li"
+verify_text "toggle2_count", 'toggle2_count=0'
+
+wait_for_element_present 'css=#toggle22_19.toggle.off > input.cb'
+# Add relation
+# Cannot test click on non-link in Safari and Chrome...
+click 'css=#toggle22_19.toggle.off > input.cb'
+wait_for_element_present 'css=#toggle22_19.toggle.on'
+verify_value "css=#toggle22_19 > input.cb", "on"
+# Make sure the js reload has been triggered
+wait_for_text_present "toggle2_count=1"
+
+# Remove relation
+click 'css=#toggle22_19.toggle.on > input.cb'
+wait_for_element_present 'css=#toggle22_19.toggle.off'
+verify_value "css=#toggle22_19 > input.cb", "off"
+wait_for_text_present "toggle2_count=0"

data/test/sites/zena/columns.yml

@@ -11,6 +11,9 @@ Original_origin:
 Original_weight:
   ptype:           integer
 
+Original_settings:
+  ptype:           hash
+  
 Original_tz:
 
 Letter_paper:

data/test/sites/zena/versions.yml

@@ -388,6 +388,11 @@ test_en:
     comment:       small presentation
     title:         Kill the bugs
     summary:       "<a href='?test=all'>View all ajax tests</a>."
+    settings:      
+      json_class:  "StringHash"
+      data:
+        one: un
+        two: deux
 
 strange_en_red:
   node:            strange
@@ -481,6 +486,7 @@ wiki_project_changes_xml_en:
   node:            wiki_Project_changes_xml_zafu
   user:            tiger
   prop:
+    title:         Project-changes-xml
     comment:       layout for wiki
     summary:       Layout for the wiki skin.
     text:          |
@@ -504,6 +510,7 @@ wiki_page_changes_en:
   prop:
     comment:       layout for wiki
     summary:       Layout for the wiki skin.
+    title:         Page-changes
     text:          |
       <r:include template='layout.html'>
         <r:with part='body/content/main'>

data/test/unit/cached_page_test.rb

@@ -28,7 +28,7 @@ class CachedPageTest < Zena::Unit::TestCase
           # test expire
           login(:tiger)
           node = secure!(Node) { nodes(:status) }
-          assert node.update_attributes(:title=>'hey'), "Can save"
+          assert node.update_attributes(:title=>'hey', :v_status => Zena::Status::Pub), "Can save"
           assert !File.exists?(path), "Cache file removed"
           assert_equal [], cache.node_ids
         end
@@ -53,7 +53,7 @@ class CachedPageTest < Zena::Unit::TestCase
           # test expire
           login(:tiger)
           node = secure!(Node) { nodes(:bird_jpg) }
-          assert node.update_attributes(:title=>'hey'), "Can save"
+          assert node.update_attributes(:title=>'hey', :v_status => Zena::Status::Pub), "Can save"
           assert !File.exists?(path), "Cache file removed"
           login(:anon)
           node = secure!(Node) { nodes(:bird_jpg) }
@@ -142,10 +142,10 @@ class CachedPageTest < Zena::Unit::TestCase
       preserving_files('/test.host/data') do
         login(:anon)
         template_ids = [nodes_id(:Node_index_zafu), nodes_id(:Project_zafu), nodes_id(:Node_zafu), nodes_id(:notes_zafu)]
-        path = SITES_ROOT + visitor.site.zafu_path + "/default/Node_index.html/en/main.erb"
+        path = SITES_ROOT + visitor.site.zafu_path + "/default/Node-foobar/en/main.erb"
         assert !File.exists?(path), "No cached file yet"
         cache = secure!(CachedPage) { CachedPage.create(
-          :path            => (visitor.site.zafu_path + "/default/Node_index.html/en/main.erb"),
+          :path            => (visitor.site.zafu_path + "/default/Node-foobar/en/main.erb"),
           :expire_after    => nil,
           :expire_with_ids => template_ids,
           :content_data    => "this is the cached content") }
@@ -156,7 +156,7 @@ class CachedPageTest < Zena::Unit::TestCase
         # test expire
         login(:tiger)
         node = secure!(Node) { nodes(:Node_zafu) }
-        assert node.update_attributes(:title=>'hey'), "Can save"
+        assert node.update_attributes(:title=>'hey', :v_status => Zena::Status::Pub), "Can save"
         assert !File.exists?(path), "Cache file removed"
         assert_equal [], cache.node_ids
       end
@@ -170,18 +170,18 @@ class CachedPageTest < Zena::Unit::TestCase
         visitor.dev_skin_id = nodes_id(:default)
         assert visitor.dev_mode?
         template_ids = [nodes_id(:Node_index_zafu), nodes_id(:Project_zafu), nodes_id(:Node_zafu), nodes_id(:notes_zafu)]
-        path = SITES_ROOT + visitor.site.zafu_path + "/default/Node_index.html/en/main.erb"
-        dev_path = SITES_ROOT + visitor.site.zafu_path + "/default/Node_index.html/dev_en/main.erb"
+        path = SITES_ROOT + visitor.site.zafu_path + "/default/Node-foobar/en/_main.erb"
+        dev_path = SITES_ROOT + visitor.site.zafu_path + "/default/Node-foobar/dev_en/_main.erb"
 
         assert !File.exists?(path), "No cached file yet"
         cache = secure!(CachedPage) { CachedPage.create(
-          :path            => (visitor.site.zafu_path + "/default/Node_index.html/en/main.erb"),
+          :path            => (visitor.site.zafu_path + "/default/Node-foobar/en/_main.erb"),
           :expire_after    => nil,
           :expire_with_ids => template_ids,
           :content_data    => "public cache") }
 
         cache = secure!(CachedPage) { CachedPage.create(
-          :path            => (visitor.site.zafu_path + "/default/Node_index.html/dev_en/main.erb"),
+          :path            => (visitor.site.zafu_path + "/default/Node-foobar/dev_en/_main.erb"),
           :expire_after    => nil,
           :expire_with_ids => template_ids,
           :content_data    => "dev cache") }
@@ -190,14 +190,14 @@ class CachedPageTest < Zena::Unit::TestCase
         
         # test expire
         node = secure!(Node) { nodes(:Node_zafu) }
-        assert node.update_attributes(:title=>'hey'), "Can save"
-        assert File.exists?(path), "Public cache not removed"
-        assert !File.exists?(dev_path), "Dev cache removed"
+        assert node.update_attributes(:title => 'hey', :v_status => Zena::Status::Pub), "Can save"
+        assert File.exists?(path), "Public cache not removed (#{path})"
+        assert !File.exists?(dev_path), "Dev cache removed (#{dev_path})"
         
         # expire all
         assert current_site.update_attributes(:expire_in_dev => true)
         node = secure!(Node) { nodes(:Node_zafu) }
-        assert node.update_attributes(:title=>'hey boy'), "Can save"
+        assert node.update_attributes(:title=>'hey boy', :v_status => Zena::Status::Pub), "Can save"
         assert !File.exists?(path), "Public cache removed"
       end
     end

data/test/unit/column_test.rb

@@ -51,6 +51,32 @@ class ColumnTest < Zena::Unit::TestCase
     end
   end
 
+  context 'A hash column' do
+    setup do
+      login(:lion)
+    end
+
+    subject do
+      Column.create(:role_id => roles_id(:Task), :ptype => 'hash', :name => 'foo')
+    end
+
+    should 'type_cast json as StringHash' do
+      assert_equal StringHash['one'=>'two', 'five'=>'six'], subject.type_cast('{"one":"two","five":"six"}')
+    end
+    
+    should 'type_cast hash as StringHash' do
+      assert_equal StringHash['one'=>'two', 'five'=>'six'], subject.type_cast(:one => :two, 'five' => 'six')
+    end
+
+    should 'type_cast nil as nil' do
+      assert_nil subject.type_cast(nil)
+    end
+
+    should 'type_cast empty as nil' do
+      assert_nil subject.type_cast('')
+    end
+  end
+
   context 'Creating a column' do
     subject do
       Column.create(:role_id => roles_id(:Task), :ptype => 'string', :name => 'foo')

data/test/unit/node_test.rb

@@ -1216,6 +1216,21 @@ done: \"I am done\""
     assert_equal nodes_id(:bird_jpg), node.find(:first, 'icon')[:id]
   end
 
+  def test_copy_no_id
+    login(:lion)
+    node = secure!(Node) { nodes(:status) }
+    attributes = {
+      'copy_id' => '',
+      'text' => 'Changed icon to "#{title}"',
+    }
+
+    new_attributes = secure(Node) { Node.transform_attributes(attributes) }
+    assert_equal Hash['copy_zip' => '', 'text'  => 'Changed icon to ""',], new_attributes
+
+    assert node.update_attributes_with_transformation(attributes)
+    assert_equal 'Changed icon to ""', node.text
+  end
+
   def test_export
     without_files('/test.host/tmp') do
       login(:tiger)
@@ -1399,7 +1414,7 @@ done: \"I am done\""
       end
 
       should 'parse pseudo ids' do
-        assert_transforms "Hi, this is just a simple \"test\":49 or \"\":43_life.rss. OK ?\n\n!24_pv!",
+        assert_transforms "Hi, this is just a simple \"test\":43 or \"\":31_life.rss. OK ?\n\n!24_pv!",
                           "Hi, this is just a simple \"test\"::w or \"\"::w++_life.rss. OK ?\n\n!:lake_pv!"
       end
 

data/test/unit/project_test.rb

@@ -19,7 +19,12 @@ class ProjectTest < Zena::Unit::TestCase
     node = secure!(Project) { Project.find(nodes_id(:cleanWater))}
     assert_equal nodes_id(:cleanWater), node.get_project_id
     node[:parent_id] = nodes_id(:zena)
-    assert node.save, 'Can save node'
+    if !node.save
+      # Cannot cast string to string hash ?
+      assert false, "Can save node (#{err(node)})"
+    else
+      assert true
+    end
     node.reload
     assert_equal nodes_id(:cleanWater), node.get_project_id
     assert_equal nodes_id(:zena), node[:project_id]

data/test/unit/relation_test.rb

@@ -207,7 +207,7 @@ class RelationTest < Zena::Unit::TestCase
       assert_equal({
         'rel_group'    => 'doc.tags',
         'source_role'  => 'tagged',
-        'target_kpath' => 'NPT',
+        'target_name'  => 'Tag',
         'target_icon'  => "<img src='/images/tag_blue.png' alt='tag'/>",
       }, subject.export)
     end

data/test/unit/role_test.rb

@@ -125,7 +125,7 @@ class RoleTest < Zena::Unit::TestCase
     end
 
     should 'return all defined safe columns' do
-      assert_equal %w{origin tz weight}, subject.defined_safe_columns.map(&:name)
+      assert_equal %w{origin settings tz weight}, subject.defined_safe_columns.map(&:name)
     end
   end # with a Role
 

data/test/unit/string_hash_test.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+require 'test_helper'
+
+class StringHashTest < Test::Unit::TestCase
+  context 'A StringHash' do
+    subject do
+      StringHash[:a => 1, 'b' => '2']
+    end
+
+    should 'transform all keys to string' do
+      assert_equal Hash['a' => '1', 'b' => '2'], subject
+    end
+    
+    should 'convert to json' do
+      assert_match %r{\{"data":\{"b":"2","a":"1"|"a":"1","b":"2"\},"json_class":"StringHash"\}}, subject.to_json
+    end
+    
+    should 'create from json' do
+      obj = JSON.parse(subject.to_json)
+      assert_equal StringHash, obj.class
+      assert_equal obj, subject
+    end
+    
+    should 'merge' do
+      subject.merge!(:a => 4, 'c' => '3')
+      assert_equal StringHash, subject.class
+      assert_equal Hash['a' => '4', 'b' => '2', 'c' => '3'], subject
+    end
+  end # A string with accents
+end

data/test/unit/virtual_class_test.rb

@@ -2,7 +2,9 @@
 require 'test_helper'
 
 class VirtualClassTest < Zena::Unit::TestCase
-
+  POST_PROPERTIES = %w{assigned cached_role_ids date origin settings summary text title tz weight}
+  NOTE_PROPERTIES = %w{assigned cached_role_ids origin settings summary text title tz weight}
+  
   def test_virtual_subclasse
     # add a sub class
     login(:lion)
@@ -185,6 +187,10 @@ class VirtualClassTest < Zena::Unit::TestCase
     assert !vclass.new_record?
     assert_not_equal Section.kpath, vclass.kpath
     assert_equal 'NPU', vclass.kpath
+    # New class without any free key
+    vclass = VirtualClass.create(:superclass => 'Page', :name => 'U', :create_group_id =>  groups_id(:public))
+    assert !vclass.new_record?
+    assert_equal 'NPA', vclass.kpath
   end
 
   context 'Updating a VirtualClass' do
@@ -204,6 +210,14 @@ class VirtualClassTest < Zena::Unit::TestCase
       assert_equal 'NPO', n.kpath
     end
 
+    should 'update kpaths in relations' do
+      # kpath NNP => NO
+      assert subject.update_attributes(:name => 'Frost')
+      assert_equal 'NNF', subject.kpath
+      rel = relations(:post_has_blogs)
+      assert_equal 'NNF', rel.source_kpath
+    end
+
     context 'with a related template' do
       setup do
         @template = secure(Template) { Template.create(:parent_id => nodes_id(:default), :title => 'Post-foobar.zafu') }
@@ -306,7 +320,7 @@ class VirtualClassTest < Zena::Unit::TestCase
       end
 
       should 'return a loaded virtual class' do
-        assert_equal %w{assigned cached_role_ids date origin summary text title tz weight}, subject.column_names.sort
+        assert_equal POST_PROPERTIES, subject.column_names.sort
       end
 
       context 'related to a real class' do
@@ -320,7 +334,7 @@ class VirtualClassTest < Zena::Unit::TestCase
         end
 
         should 'return a loaded virtual class' do
-          assert_equal %w{assigned cached_role_ids origin summary text title tz weight}, subject.column_names.sort
+          assert_equal NOTE_PROPERTIES, subject.column_names.sort
         end
       end # related to a real class
 
@@ -342,7 +356,7 @@ class VirtualClassTest < Zena::Unit::TestCase
       end
 
       should 'return a loaded virtual class' do
-        assert_equal %w{assigned cached_role_ids date origin summary text title tz weight}, subject.column_names.sort
+        assert_equal POST_PROPERTIES, subject.column_names.sort
       end
     end # with an id
 
@@ -363,7 +377,7 @@ class VirtualClassTest < Zena::Unit::TestCase
       end
 
       should 'return a loaded virtual class' do
-        assert_equal %w{assigned cached_role_ids date origin summary text title tz weight}, subject.column_names.sort
+        assert_equal POST_PROPERTIES, subject.column_names.sort
       end
 
       context 'related to a real class' do
@@ -377,7 +391,7 @@ class VirtualClassTest < Zena::Unit::TestCase
         end
 
         should 'return a loaded virtual class' do
-          assert_equal %w{assigned cached_role_ids origin summary text title tz weight}, subject.column_names.sort
+          assert_equal NOTE_PROPERTIES, subject.column_names.sort
         end
       end # related to a real class
     end # with a name
@@ -484,7 +498,7 @@ class VirtualClassTest < Zena::Unit::TestCase
     should 'load new role from cache' do
       subject
       # no more linked to assigned
-      assert_equal %w{assigned cached_role_ids date foo origin summary text title tz weight}, VirtualClass['Post'].column_names.sort
+      assert_equal %w{assigned cached_role_ids date foo origin settings summary text title tz weight}, VirtualClass['Post'].column_names.sort
     end
 
   end # Creating a Column
@@ -522,7 +536,7 @@ class VirtualClassTest < Zena::Unit::TestCase
     should 'load new role from cache' do
       subject
       # change name
-      assert_equal %w{assigned cached_role_ids date origin summary text title toz weight}, VirtualClass['Post'].column_names.sort
+      assert_equal POST_PROPERTIES.map{|p| p == 'tz' ? 'toz' : p}, VirtualClass['Post'].column_names.sort
     end
 
   end # Updating a Column
@@ -560,7 +574,7 @@ class VirtualClassTest < Zena::Unit::TestCase
     should 'load new role from cache' do
       subject
       # no more linked to assigned
-      assert_equal %w{assigned cached_role_ids date origin summary text title weight}, VirtualClass['Post'].column_names.sort
+      assert_equal %w{assigned cached_role_ids date origin settings summary text title weight}, VirtualClass['Post'].column_names.sort
     end
 
   end # Deleting a Column
@@ -629,7 +643,7 @@ class VirtualClassTest < Zena::Unit::TestCase
       end
 
       should 'return safe column types' do
-        assert_equal %w{assigned origin summary text title tz weight}, subject.safe_column_types.keys.sort
+        assert_equal %w{assigned origin settings summary text title tz weight}, subject.safe_column_types.keys.sort
       end
 
       should 'return nil on unsafe method type' do
@@ -664,7 +678,7 @@ class VirtualClassTest < Zena::Unit::TestCase
         end
 
         should 'return safe columns' do
-          assert_equal %w{summary text title assigned origin tz weight}, subject.safe_columns.map(&:name)
+          assert_equal %w{summary text title assigned origin settings tz weight}, subject.safe_columns.map(&:name)
         end
 
         should 'return defined safe columns' do
@@ -672,7 +686,7 @@ class VirtualClassTest < Zena::Unit::TestCase
         end
 
         should 'return safe column types' do
-          assert_equal %w{assigned origin summary text title tz weight}, subject.safe_column_types.keys.sort
+          assert_equal %w{assigned origin settings summary text title tz weight}, subject.safe_column_types.keys.sort
         end
 
         should 'not include unsafe properties in safe column types' do
@@ -698,7 +712,7 @@ class VirtualClassTest < Zena::Unit::TestCase
       end
 
       should 'return safe columns' do
-        assert_equal %w{summary text title assigned origin tz weight date}, subject.safe_columns.map(&:name)
+        assert_equal %w{summary text title assigned origin settings tz weight date}, subject.safe_columns.map(&:name)
       end
 
       should 'return defined safe columns' do
@@ -706,7 +720,7 @@ class VirtualClassTest < Zena::Unit::TestCase
       end
 
       should 'return safe column types' do
-        assert_equal %w{assigned date origin summary text title tz weight}, subject.safe_column_types.keys.sort
+        assert_equal %w{assigned date origin settings summary text title tz weight}, subject.safe_column_types.keys.sort
       end
 
       should 'return type on safe method type' do
@@ -898,7 +912,7 @@ class VirtualClassTest < Zena::Unit::TestCase
 
       should 'export relations' do
         assert_equal({
-          'blogs' => {'target_kpath'=>'NPP', 'source_role'=>'added_note'}
+          'blogs' => {'target_name'=>'Project', 'source_role'=>'added_note'}
         }, subject['relations'])
       end
 
@@ -979,7 +993,7 @@ class VirtualClassTest < Zena::Unit::TestCase
             'type' => 'VirtualClass',
             'relations' => {
               'babar' => {
-                'target_kpath'  => 'NNB',
+                'target_name'   => 'Post',
                 'target_unique' => true,
                 'source_role'   => 'fool',
                 'rel_group'     => 'foo.bar',
@@ -1003,7 +1017,7 @@ class VirtualClassTest < Zena::Unit::TestCase
           assert bar = VirtualClass['Bar']
           rel = Relation.first(
             :conditions => ['source_kpath = ? AND target_role = ?', 'NNF', 'babar'])
-          assert_equal 'NNB',   rel.target_kpath
+          assert_equal 'NNP',   rel.target_kpath
           assert_equal 'fools', rel.source_role
           assert_equal 'babar', rel.target_role
           assert_equal 'foo.bar', rel.rel_group