Changeset 484

Timestamp:

2007-05-06 13:32:14 (2 years ago)

Author:

gaspard

Message:

[tests] units and helpers ok : 699 tests 2140 assertions !

Files:

• trunk/app/controllers/comment_controller.rb (deleted)
• trunk/app/controllers/comments_controller.rb (added)
• trunk/app/helpers/application_helper.rb (modified) (4 diffs)
• trunk/app/models/skin.rb (modified) (1 diff)
• trunk/app/models/tag.rb (modified) (3 diffs)
• trunk/app/models/template_version.rb (modified) (2 diffs)
• trunk/app/models/version.rb (modified) (2 diffs)
• trunk/app/views/comment (deleted)
• trunk/app/views/comments (added)
• trunk/app/views/comments/_add.rhtml (added)
• trunk/app/views/comments/_bin.rhtml (added)
• trunk/app/views/comments/_form.rhtml (added)
• trunk/app/views/comments/_li.rhtml (added)
• trunk/app/views/comments/_li_simple.rhtml (added)
• trunk/app/views/comments/_list.rhtml (added)
• trunk/app/views/comments/create.rjs (added)
• trunk/app/views/comments/edit.rjs (added)
• trunk/app/views/comments/empty_bin.rjs (added)
• trunk/app/views/comments/list.rhtml (added)
• trunk/app/views/comments/publish.rjs (added)
• trunk/app/views/comments/remove.rjs (added)
• trunk/app/views/comments/reply_to.rjs (added)
• trunk/app/views/comments/update.rjs (added)
• trunk/config/routes.rb (modified) (2 diffs)
• trunk/lib/parser/test/testhelp.rb (modified) (1 diff)
• trunk/lib/tasks/zena.rake (modified) (1 diff)
• trunk/test/helpers/application_helper_test.rb (added)
• trunk/test/helpers/basic.yml (modified) (5 diffs)
• trunk/test/helpers/test_all.rb (deleted)
• trunk/test/helpers/zazen_test.rb (added)
• trunk/test/helpers/zena_parser_test.rb (added)
• trunk/test/unit/h_application_test.rb (deleted)
• trunk/test/unit/h_zazen_test.rb (deleted)
• trunk/test/unit/page_test.rb (modified) (1 diff)
• trunk/test/unit/skin_test.rb (modified) (1 diff)
• trunk/test/unit/tag_test.rb (modified) (4 diffs)
• trunk/test/unit/template_version_test.rb (modified) (1 diff)
• trunk/test/unit/text_document_content_test.rb (modified) (1 diff)
• trunk/test/unit/trans_key_test.rb (modified) (1 diff)
• trunk/test/unit/trans_value_test.rb (modified) (1 diff)
• trunk/test/unit/user_test.rb (modified) (1 diff)
• trunk/test/unit/version_test.rb (modified) (1 diff)
• trunk/vendor/bricks/20070122-172926.txt (modified) (1 diff)

trunk/app/helpers/application_helper.rb

@@ -356 +356 @@
-  # the format is used as the image class. Example :
-  #   img_tag(@node, :mode=>'pv')  => <img src='/sites/test.host/data/jpg/20/bird_pv.jpg' height='80' width='80' alt='bird' class='pv'/>
-
+ion
-    return "" unless obj.kind_of?(Document)
-
+
+
+
+
+
+
+
-    content = obj.v_content
-[:ext]
+.ext
-    opts    = opts.merge(:format => ext)
-    
-    alt       = opts[:alt]
-    img_id    = opts[:id]
-    
-    src = width = height = img_class = nil
@@ -373 +376 @@
-      src       = zen_path(obj, opts.merge(:mode => (mode == 'full' ? nil : mode)))
-      
-opts[:class]
+klass
-      if mode == 'full'
-        # full size (format = nil)
@@ -387 +390 @@
-      alt   ||= "#{content.ext} document"
-      
-opts[:class]
+klass
-      unless File.exist?("#{RAILS_ROOT}/public/images/ext/#{ext}.png")
-        ext = 'other'
@@ -452 +455 @@
-  def show_comments(opts={})
-    node = opts[:node] || @node
-
+s
-  end
-  

trunk/app/models/skin.rb

@@ -4 +4 @@
-  before_save :need_skin_name_update
-  after_save  :update_skin_name
-  
-  def template_url_for_name(template_name, helper)
-    raise Exception.new('helper should not be nil!') unless (helper || ENV["RAILS_ENV"] == "test")
-    if template_name == 'any'
-      template = self
-      zafu_url = "/#{self[:name]}/any"
-    else
-      template = secure(Template) { Template.find(:first, :conditions=>["parent_id = ? AND name = ?", self[:id], template_name])}
-      zafu_url = "/#{self[:name]}/#{template_name}"
-    end
-    tmpl_name = "#{template_name}_#{visitor.lang}"
-    tmpl_dir = "/templates/compiled/#{self[:name]}"
-    FileUtils::mkpath("#{RAILS_ROOT}/app/views#{tmpl_dir}")
-    # render for the current lang
-    res = ZafuParser.new_with_url(zafu_url, :helper=>helper).render
-    File.open("#{RAILS_ROOT}/app/views#{tmpl_dir}/#{tmpl_name}.rhtml", "wb") { |f| f.syswrite(res) }
-    return "#{tmpl_dir}/#{tmpl_name}"
-  rescue ActiveRecord::RecordNotFound
-    nil
-  end
-  
-  def template_for_path(path)
-    asset_for_path(path, Template)
-  end
-  
-  
-  def asset_for_path(path, klass=Node)
-    current = self
-    if path == 'any'
-      return current
-    else  
-      path = path.split('/')
-      while path != []
-        template_name = path.shift
-        current = secure(klass) { klass.find(:first, :conditions=>["parent_id = ? AND name = ?", current[:id], template_name])}
-      end
-      current
-    end
-  rescue ActiveRecord::RecordNotFound
-    nil
-  end
-  
-  private

trunk/app/models/tag.rb

@@ -8 +8 @@
-  def pages(opts={})
-    return super if opts[:in]
-
-@pages ||= 
+LIKE 'NP%' AND kpath 
+
-  end
-  
-  def documents(opts={})
-    return super if opts[:in]
-
-@documents ||= 
+%' AND kpath LIKE 'NP
+
-  end
-  
@@ -23 +23 @@
-    return super if opts[:in]
-    options = opts.merge(:conditions=>"kpath LIKE 'NPD%' AND NOT LIKE 'NPDI%'", :or=>["parent_id = ?", self[:id]])
-@doconly ||= 
+
-  end
-  
@@ -31 +31 @@
-    return super if opts[:in]
-    options = opts.merge(:conditions=>"kpath LIKE 'NPDI%'", :or=>["parent_id = ?", self[:id]])
-@images ||= 
+
-  end
-end

trunk/app/models/template_version.rb

@@ -9 +9 @@
-  validates_presence_of       :content
-  
-Return the content for the version. Can it's 'own' content or the same as the version this one was copied from.
+TODO: test
-  def content
-    return @content if @content
@@ -24 +24 @@
-  end
-  
+  # TODO: test
-  def redaction_content
-    content
-  end
-  
+  # TODO: test
-  def content_class
-    TemplateContent

trunk/app/models/version.rb

@@ -26 +26 @@
-class Version < ActiveRecord::Base
-  belongs_to            :node
-, :foreign_key=>'user_id' # FIXME: can we remove this
+
-  before_validation     :version_before_validation
-  validates_presence_of :node
@@ -129 +129 @@
-    # Set version number and site_id before validation tests.
-    def version_before_validation
-
+
+
+
+
-      self[:site_id] = node[:site_id]
-    

trunk/config/routes.rb

@@ -30 +30 @@
-                                 :link    => :any }
-                                 
-
+
+
+
+
+
-  end
-  
-  map.resources :documents, :member => { :crop_form => :get, :file_form => :get }
-  
-  # map.resources :trans_phrases do |phrases|
-  #   phrases.resources :trans_values
@@ -78 +81 @@
-  
-  # temporary routes...
+  map.connect 'comments/:action/:id', :controller => 'comments'
-  map.connect 'z/trans/:action', :controller => 'trans'
-  map.connect 'z/calendar/:action', :controller => 'calendar'

trunk/lib/parser/test/testhelp.rb

@@ -14 +14 @@
-        strings = {}
-        test_methods = []
-"#{file}.yml"
+File.join(File.dirname(__FILE__), "#{file}.yml")
-          doc.each do |elem|
-            test_methods << elem[0]

trunk/lib/tasks/zena.rake

@@ -175 +175 @@
-       rdoc.options << '--line-numbers' << '--inline-source'
-  end
+  Rake::Task['zena:rdoc'].comment = "Create the rdoc documentation"
+  
+  Rake::TestTask.new(:test => "db:test:prepare") do |t|
+    t.libs << "test"
+    t.pattern = ['test/helpers/**/*_test.rb','test/unit/**/*_test.rb', 'lib/parser/test/*_test.rb']
+    t.verbose = true
+  end
+  Rake::Task['zena:test'].comment = "Run the tests in test/helpers and test/unit"
-end
-
+namespace :test do
+  
+  Rake::TestTask.new(:helpers => "db:test:prepare") do |t|
+    t.libs << "test"
+    t.pattern = 'test/helpers/**/*_test.rb'
+    t.verbose = true
+  end
+  Rake::Task['test:helpers'].comment = "Run the tests in test/helpers"
+end
+

trunk/test/helpers/basic.yml

@@ -166 +166 @@
-  src: "<h1 class='title' do='title' status='true' actions='all'>dummy</h1>"
-  tem: "<h1 class='title'><div class='s<%= @node.version.status %>'><%= show_title(:node=>@node) + node_actions(:node=>@node, :actions=>\"all\")%></div></h1>"
-\/nodes\/22\/versions\/1\/edit.*\/images\/page_edit.png'.*/><\/a>.*<\/span><\/div><\
+/nodes/22/versions/1/edit.*/images/page_edit.png'.*/></a>.*</span></div><
-
-show_c_width:
@@ -190 +190 @@
-  src: "<div id='path' do='show_path'><ul><li><a href='#'>first</a></li> / <li><a href='#'>second</a></li> / <li><a href='#' class='current'>here</a></li></ul></div>"
-  tem: "<div id='path'><%= show_path(:node=>@node) %></div>"
-\/page18.html.*<li><.*\/projects\/cleanWater.*cleanWater<\/a>.*\/oo\/projects\/cleanWater\/page22.html.*class='current'>status<\
+/page18.html.*<li><.*/projects/cleanWater.*cleanWater</a>.*/oo/projects/cleanWater/page22.html.*class='current'>status<
-
-uses_calendar:
@@ -268 +268 @@
-edit_not_each:
-  src: "<li class='blah'>this is a post <z:edit>edit post</z:edit></li>"
-\
+
-
-edit_each_no_form:
@@ -278 +278 @@
-    node: 'wiki'
-  src: "<z:children><z:each><li do='show' attr='name'>blah</li>\n</z:each><z:add><li>add new</li></z:add><z:form><li><form>this is the form</form></li></z:form></z:children>"
-toggle.*Node_add.*Node_form.*<li .*Node_form.*style.*none.*Ajax.Request.*input type='hidden' name='template_url' value='/each/add/with/root_Node
+list_add.*list_form.*toggle.*<li .*list_form.*style.*none.*Ajax.Request.*input type='hidden' name='template_url' value='/each/add/with/form/list
-  
-each_edit_with_form:
@@ -284 +284 @@
-    node: 'wiki'
-  src: "<z:children><z:each><li><z:show attr='name'>blah</z:show> <z:edit>edit</z:edit></li>\n</z:each><z:form><li><form>this is the form</form></li></z:form></z:children>"
-_each_edit_with_root_Node20'>bird <a href='#' onclick=\"new Ajax.Request\('\/z\/zafu\/ajax_edit\/20\?template_url=%2Feach%2Fedit%2Fwith%2Froot_Node'.*flower <a href=\"#\" onclick=\"new Ajax.Request\('\/z\/zafu\/ajax_edit\/21\?template_url=%2Feach%2Fedit%2Fwith%2Froot_Node.*edit</a></li>\n
+/each/edit/with/form/list30'>bird <a href=\"#\" onclick=\"new Ajax.Request\('/nodes/30/edit\?template_url=%2Feach%2Fedit%2Fwith%2Fform%2Flist
-
-set_attribute:
-  src: "<div class='machin' do='void' set_class='node[id]'/><z:void set_class='s[v_status]i[id]'/>"
-/
+></div
-
-set_attribute_with_inner:

trunk/test/unit/page_test.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require 'document' # this is needed to load the document model.
-require 'tag'
-require 'project'
-require 'tracker'
-require 'contact'
-
-class PageTest < ZenaTestUnit
-  
-  def test_select_classes
-
+
+
+
+
+
+
-  end
-  

trunk/test/unit/skin_test.rb

@@ -3 +3 @@
-class SkinTest < ZenaTestUnit
-
-  def test_template_url_for_name
-    without_files('app/views/templates/compiled') do
-      skin = secure(Skin) { Skin.find_by_name('wiki')}
-      assert_kind_of Skin, skin
-      path = File.join(RAILS_ROOT, 'app', 'views', 'templates', 'compiled', 'wiki', 'any_en.rhtml')
-      assert !File.exist?(path), "File does not exist"
-      assert_equal "/templates/compiled/wiki/any_en", skin.template_url_for_name('any', nil)
-      assert File.exist?(path), "File exists"
-      path = File.join(RAILS_ROOT, 'app', 'views', 'templates', 'compiled', 'wiki', 'layout_en.rhtml')
-      assert !File.exist?(path), "File does not exist"
-      assert_equal "/templates/compiled/wiki/layout_en", skin.template_url_for_name('layout', nil)
-      assert File.exist?(path), "File exists"
-      assert_equal nil, skin.template_url_for_name('bad', nil)
-    end
-  end
-  
-  def test_template_for_path
-    skin = secure(Skin) { Skin.find_by_name('wiki')}
-    assert_kind_of Skin, skin
-    tmpl = skin.template_for_path('any')
-    assert_equal tmpl, skin
-    tmpl = skin.template_for_path('layout')
-    assert_equal nodes_id(:layout), tmpl[:id]
-    tmpl = skin.template_for_path('bad')
-    assert_nil tmpl
-  end
-  
-  def test_name_change
-    login(:lion)
-    skin = secure(Node) { nodes(:wiki_skin) }
-
+
+
-    assert_equal 'wiki', skin.name
-    assert_equal 'wiki', tmpt.c_skin_name
-    skin.name = 'fun'
-    assert skin.save, "Can save skin."
-layout)   
+wiki_node)
-    assert_equal 'fun', tmpt.c_skin_name
-    assert_equal 'fun', secure(Node) { nodes(:wiki_page_changes) }.c_skin_name

trunk/test/unit/tag_test.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-Collector
+Tag
-  
-  def test_pages
@@ -7 +7 @@
-    tag = secure(Node) { nodes(:art) }
-    pages = tag.pages
-2
+1
-    assert_equal 'cleanWater', pages[0].name
-    child = secure(Page) { Page.create(:parent_id=>tag[:id], :name=>'a_child') }
@@ -13 +13 @@
-    tag = secure(Node) { nodes(:art) }
-    pages = tag.pages
-3
-0
+2
+1
-  end
-  
@@ -23 +23 @@
-    assert doc.save, "Can save"
-    tag = secure(Node) { nodes(:art) }
-2
+1
-    assert_equal 1, tag.documents.size
-    assert_equal 'water', tag.documents[0].name

trunk/test/unit/template_version_test.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-
-
-
-
+
-  def test_truth
-    assert true

trunk/test/unit/text_document_content_test.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-
-
+
-
-  # Replace this with your real tests.
-  def test_truth
-    assert true

trunk/test/unit/trans_key_test.rb

@@ -9 +9 @@
-    assert_equal 'lundi', key['fr']
-    assert_equal 'lundi', TransPhrase['Monday']['fr']
-  end
-  
-  def test_create_new_key
-    assert_nil TransPhrase.find_by_key('yoba')
-    key = TransPhrase['yoba']
-    assert_not_nil TransPhrase.find_by_key('yoba')
-  end
-  

trunk/test/unit/trans_value_test.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-
-
+
-  def test_nothing
-    assert true, 'nothing to test'

trunk/test/unit/user_test.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
+
-class UserTest < ZenaTestUnit
-

trunk/test/unit/version_test.rb

@@ -96 +96 @@
-    node = secure(Node) { Node.new(:parent_id=>1, :name=>'bob') }
-    assert node.save
-Version.new
+secure(Version) { Version.new }
-    assert !vers.save
-
-
+
-  end
-  

trunk/vendor/bricks/20070122-172926.txt

@@ -71 +71 @@
-copy;app/views/comment/_li.rhtml;app/views/comment/_li.rhtml
-copy;app/views/comment/_li_simple.rhtml;app/views/comment/_li_simple.rhtml
-/_list.rhtml;app/views/comment
+s/_list.rhtml;app/views/comments
-copy;app/views/comment/create.rjs;app/views/comment/create.rjs
-copy;app/views/comment/edit.rjs;app/views/comment/edit.rjs