Changeset 1243

Timestamp:

2008-10-31 10:50:13 (2 months ago)

Author:

gaspard

Message:

commit 2659d858c575832309c21b2822a95a6704c040a0
Author: Gaspard Bucher <gaspard@teti.ch>

Fixed zazen links using sharp so that "link":34#id works like "link":34#zip or "link":34#. Same for "link":34#[parent/], "link":34#[parent/id] or "link":34#[parent/zip].

Files:

• trunk/app/helpers/application_helper.rb (modified) (1 diff)
• trunk/test/helpers/zazen_test.rb (modified) (3 diffs)

trunk/app/helpers/application_helper.rb

@@ -451 +451 @@
-        link_opts[:sharp_in] = sharp_in
-      end
-
+
+
+
+
+
-    end
-    if opts[:id] =~ /(\d+)(_\w+|)(\.\w+|)/

trunk/test/helpers/zazen_test.rb

@@ -29 +29 @@
-
-  end
-
+
-  def test_make_link
-    login(:tiger)
@@ -38 +38 @@
-    # * ["":034] if the node id starts with '0', creates a popup link.
-    assert_match %r{/oo/projects/cleanWater.*window.open.*hello}, zazen('"hello":021')
+  end
+  
+  def test_make_link_sharp
+    login(:tiger)
+    assert_equal '<p><a href="#node34">hello</a></p>', zazen('"hello":34#')
+    assert_equal '<p><a href="#node34">hello</a></p>', zazen('"hello":34#[id]')
+    assert_equal '<p><a href="#node34">hello</a></p>', zazen('"hello":34#[zip]')
+    assert_equal '<p><a href="#news">hello</a></p>', zazen('"hello":34#[name]')
+    # * ["":34#[parent/]] if the node id starts with '0', creates a popup link.
+    assert_equal '<p><a href="/oo/page32.html#node34">hello</a></p>', zazen('"hello":34#[parent/]')
+    assert_equal '<p><a href="/oo/page32.html#node34">hello</a></p>', zazen('"hello":34#[parent/id]')
+    assert_equal '<p><a href="/oo/page32.html#node34">hello</a></p>', zazen('"hello":34#[parent/zip]')
+    assert_equal '<p><a href="/oo/page32.html#news">hello</a></p>', zazen('"hello":34#[parent/name]')
-  end
-
@@ -158 +171 @@
-    @node = secure!(Node) { nodes(:wiki) }
-    assert_equal "<p>See <a href=\"/oo/projects/cleanWater\"><img src='/en/image30_med.jpg' width='220' height='200' alt='bird' class='med'/></a></p>", zazen('See !:(bird)_med!:(/projects/cleanWater)')
+  end
+  
+  def test_bad_pseudo_path
+    login(:lion)
+    lion = secure!(Node) { nodes(:lion) }
+    
+    @node = secure!(Node) { nodes(:cleanWater) }
+    assert_equal '<p>Read [(shmol) not found]</p>', zazen('Read "":(shmol)')
+    assert_equal 'Read "":(shmol)', zazen('Read "":(shmol)', :translate_ids => :zip, :node => lion)
-  end
-