Merged r1451 to r1454, r1458, r1460 to r1463 from trunk.

git-svn-id: http://redmine.rubyforge.org/svn/branches/0.7-stable@1474 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/fixtures/enumerations.yml

@@ -39,4 +39,9 @@ enumerations_010:
   name: Development
   id: 10
   opt: ACTI
+  is_default: true
+enumerations_011: 
+  name: QA
+  id: 11
+  opt: ACTI
   

test/functional/timelog_controller_test.rb

@@ -30,7 +30,17 @@ class TimelogControllerTest < Test::Unit::TestCase
     @response   = ActionController::TestResponse.new
   end
   
-  def test_create
+  def test_get_edit
+    @request.session[:user_id] = 3
+    get :edit, :project_id => 1
+    assert_response :success
+    assert_template 'edit'
+    # Default activity selected
+    assert_tag :tag => 'option', :attributes => { :selected => 'selected' },
+                                 :content => 'Development'
+  end
+  
+  def test_post_edit
     @request.session[:user_id] = 3
     post :edit, :project_id => 1,
                 :time_entry => {:comments => 'Some work on TimelogControllerTest',

test/unit/changeset_test.rb

@@ -39,6 +39,17 @@ class ChangesetTest < Test::Unit::TestCase
     assert fixed.closed?
     assert_equal 90, fixed.done_ratio
   end
+  
+  def test_ref_keywords_any_line_start
+    Setting.commit_ref_keywords = '*'
+
+    c = Changeset.new(:repository => Project.find(1).repository,
+                      :committed_on => Time.now,
+                      :comments => '#1 is the reason of this commit')
+    c.scan_comment_for_issue_ids
+
+    assert_equal [1], c.issue_ids.sort
+  end
 
   def test_previous
     changeset = Changeset.find_by_revision('3')

test/unit/helpers/application_helper_test.rb

@@ -58,7 +58,9 @@ class ApplicationHelperTest < HelperTestCase
     to_test = {
       'This is a "link":http://foo.bar' => 'This is a <a href="http://foo.bar" class="external">link</a>',
       'This is an intern "link":/foo/bar' => 'This is an intern <a href="/foo/bar">link</a>',
-      '"link (Link title)":http://foo.bar' => '<a href="http://foo.bar" title="Link title" class="external">link</a>'
+      '"link (Link title)":http://foo.bar' => '<a href="http://foo.bar" title="Link title" class="external">link</a>',
+      # no multiline link text
+      "This is a double quote \"on the first line\nand another on a second line\":test" => "This is a double quote \"on the first line<br />\nand another on a second line\":test"
     }
     to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
   end

test/unit/query_test.rb

@@ -116,6 +116,11 @@ class QueryTest < Test::Unit::TestCase
     assert q.has_column?(c)
   end
   
+  def test_label_for
+    q = Query.new
+    assert_equal 'assigned_to', q.label_for('assigned_to_id')
+  end
+  
   def test_editable_by
     admin = User.find(1)
     manager = User.find(2)