r18452@gaspard (orig r1723): jplang | 2008-08-07 21:59:02 +0200

Slight change to engines to let plugins override views. r18456@gaspard (orig r1727): jplang | 2008-08-10 17:22:54 +0200 Moves @layout 'base'@ to ApplicationController. r18457@gaspard (orig r1728): jplang | 2008-08-10 23:35:03 +0200 Quote ids for attachment association since Trac's attachment.id is varchar (#1759). r18458@gaspard (orig r1729): jplang | 2008-08-11 00:18:23 +0200 Adds links to forum messages using message#id syntax (#1756). r18459@gaspard (orig r1730): jplang | 2008-08-11 20:09:54 +0200 Allow same name for custom fields on different object types. r18460@gaspard (orig r1731): jplang | 2008-08-11 20:24:39 +0200 Fixes custom fields display order at several places (#1768). r18461@gaspard (orig r1732): edavis10 | 2008-08-11 22:49:52 +0200 Added doc/README_FOR_APP so RDoc can be built. (#1769) r18462@gaspard (orig r1733): jplang | 2008-08-11 22:55:17 +0200 Adds 'Edit' link on account/show for admin users. r18463@gaspard (orig r1734): jplang | 2008-08-11 23:02:36 +0200 Adds Lock/Unlock/Activate link on user edit screen. r18464@gaspard (orig r1735): jplang | 2008-08-11 23:10:24 +0200 Adds user count in status drop down on admin user list. r18472@gaspard (orig r1743): edavis10 | 2008-08-13 05:54:54 +0200 Added missing documentation for setting up the Darcs test repository. r18473@gaspard (orig r1744): edavis10 | 2008-08-13 06:20:16 +0200 Added rake tasks to generate rcov code coverage reports. rake -T test:coverage to see them all r18474@gaspard (orig r1745): edavis10 | 2008-08-13 06:20:23 +0200 Extracted rcov options and removed gems from the rcov report. r18476@gaspard (orig r1747): jplang | 2008-08-15 20:44:46 +0200 No warning about rcov each time a rake task is ran. r18477@gaspard (orig r1748): edavis10 | 2008-08-20 06:26:46 +0200 Javascripts are now cached into a single file for downloads in production mode. Thanks to Philippe Lafoucrière for the patch. (#1186) r18478@gaspard (orig r1749): edavis10 | 2008-08-20 07:09:13 +0200 Hiding the View Differences button when a wiki page's history only has one version. Patch contributed by Chaoqun Zou (#1743) r18479@gaspard (orig r1750): edavis10 | 2008-08-20 08:14:44 +0200 Messages on a Board can now be sorted by the number of replies. #1761 r18480@gaspard (orig r1751): edavis10 | 2008-08-20 08:21:06 +0200 Added the "Status:" keyword to the MailHandler for setting and changing an Issue status via email. #1669 git-svn-id: http://redmine.rubyforge.org/svn/branches/work@1752 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-08-20 18:37:09 +00:00
parent ef26e2e0ba
commit ab83ed5d8e
58 changed files with 237 additions and 59 deletions
@@ -38,4 +38,5 @@ massa. Sed sodales, ante fermentum ultricies sollicitudin, massa leo
 pulvinar dui, a gravida orci mi eget odio. Nunc a lacus.

 Project: onlinestore
+Status: Resolved

@@ -0,0 +1,75 @@
+Return-Path: <jsmith@somenet.foo>
+Received: from osiris ([127.0.0.1])
+	by OSIRIS
+	with hMailServer ; Sat, 21 Jun 2008 18:41:39 +0200
+Message-ID: <006a01c8d3bd$ad9baec0$0a00a8c0@osiris>
+From: "John Smith" <jsmith@somenet.foo>
+To: <redmine@somenet.foo>
+References: <485d0ad366c88_d7014663a025f@osiris.tmail>
+Subject: Re: [Cookbook - Feature #2] (New) Add ingredients categories
+Date: Sat, 21 Jun 2008 18:41:39 +0200
+MIME-Version: 1.0
+Content-Type: multipart/alternative;
+	boundary="----=_NextPart_000_0067_01C8D3CE.711F9CC0"
+X-Priority: 3
+X-MSMail-Priority: Normal
+X-Mailer: Microsoft Outlook Express 6.00.2900.2869
+X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2869
+
+This is a multi-part message in MIME format.
+
+------=_NextPart_000_0067_01C8D3CE.711F9CC0
+Content-Type: text/plain;
+	charset="utf-8"
+Content-Transfer-Encoding: quoted-printable
+
+This is reply
+
+Status: Resolved
+------=_NextPart_000_0067_01C8D3CE.711F9CC0
+Content-Type: text/html;
+	charset="utf-8"
+Content-Transfer-Encoding: quoted-printable
+
+=EF=BB=BF<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD>
+<META http-equiv=3DContent-Type content=3D"text/html; charset=3Dutf-8">
+<STYLE>BODY {
+	FONT-SIZE: 0.8em; COLOR: #484848; FONT-FAMILY: Verdana, sans-serif
+}
+BODY H1 {
+	FONT-SIZE: 1.2em; MARGIN: 0px; FONT-FAMILY: "Trebuchet MS", Verdana, =
+sans-serif
+}
+A {
+	COLOR: #2a5685
+}
+A:link {
+	COLOR: #2a5685
+}
+A:visited {
+	COLOR: #2a5685
+}
+A:hover {
+	COLOR: #c61a1a
+}
+A:active {
+	COLOR: #c61a1a
+}
+HR {
+	BORDER-RIGHT: 0px; BORDER-TOP: 0px; BACKGROUND: #ccc; BORDER-LEFT: 0px; =
+WIDTH: 100%; BORDER-BOTTOM: 0px; HEIGHT: 1px
+}
+.footer {
+	FONT-SIZE: 0.8em; FONT-STYLE: italic
+}
+</STYLE>
+
+<META content=3D"MSHTML 6.00.2900.2883" name=3DGENERATOR></HEAD>
+<BODY bgColor=3D#ffffff>
+<DIV><SPAN class=3Dfooter><FONT face=3DArial color=3D#000000 =
+size=3D2>This is=20
+reply Status: Resolved</FONT></DIV></SPAN></BODY></HTML>
+
+------=_NextPart_000_0067_01C8D3CE.711F9CC0--
+
@@ -212,7 +212,7 @@ class IssuesControllerTest < Test::Unit::TestCase
    assert_equal 2, issue.author_id
    assert_equal 3, issue.tracker_id
    assert_nil issue.estimated_hours
-    v = issue.custom_values.find_by_custom_field_id(2)
+    v = issue.custom_values.find(:first, :conditions => {:custom_field_id => 2})
    assert_not_nil v
    assert_equal 'Value for field 2', v.value
  end
@@ -109,8 +109,18 @@ class WikiControllerTest < Test::Unit::TestCase
    assert_template 'history'
    assert_not_nil assigns(:versions)
    assert_equal 3, assigns(:versions).size
+    assert_select "input[type=submit][name=commit]"
  end
-  
+
+  def test_history_with_one_version
+    get :history, :id => 1, :page => 'Another_page'
+    assert_response :success
+    assert_template 'history'
+    assert_not_nil assigns(:versions)
+    assert_equal 1, assigns(:versions).size
+    assert_select "input[type=submit][name=commit]", false
+  end
+
  def test_diff
    get :diff, :id => 1, :page => 'CookBook_documentation', :version => 2, :version_from => 1
    assert_response :success
@@ -20,7 +20,11 @@ require File.dirname(__FILE__) + '/../../test_helper'
 class ApplicationHelperTest < HelperTestCase
  include ApplicationHelper
  include ActionView::Helpers::TextHelper
-  fixtures :projects, :repositories, :changesets, :trackers, :issue_statuses, :issues, :documents, :versions, :wikis, :wiki_pages, :wiki_contents, :roles, :enabled_modules
+  fixtures :projects, :roles, :enabled_modules,
+                      :repositories, :changesets, 
+                      :trackers, :issue_statuses, :issues, :versions, :documents,
+                      :wikis, :wiki_pages, :wiki_contents,
+                      :boards, :messages

  def setup
    super
@@ -83,6 +87,8 @@ class ApplicationHelperTest < HelperTestCase
    version_link = link_to('1.0', {:controller => 'versions', :action => 'show', :id => 2},
                                  :class => 'version')

+    message_url = {:controller => 'messages', :action => 'show', :board_id => 1, :id => 4}
+    
    source_url = {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => ['some', 'file']}
    source_url_with_ext = {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => ['some', 'file.ext']}
    
@@ -111,6 +117,9 @@ class ApplicationHelperTest < HelperTestCase
      'source:/some/file.ext#L110'  => link_to('source:/some/file.ext#L110', source_url_with_ext.merge(:anchor => 'L110'), :class => 'source'),
      'source:/some/file@52#L110'   => link_to('source:/some/file@52#L110', source_url.merge(:rev => 52, :anchor => 'L110'), :class => 'source'),
      'export:/some/file'           => link_to('export:/some/file', source_url.merge(:format => 'raw'), :class => 'source download'),
+      # message
+      'message#4'                   => link_to('Post 2', message_url, :class => 'message'),
+      'message#5'                   => link_to('RE: post 2', message_url.merge(:anchor => 'message-5'), :class => 'message'),
      # escaping
      '!#3.'                        => '#3.',
      '!r1'                         => 'r1',
@@ -45,6 +45,16 @@ class MailHandlerTest < Test::Unit::TestCase
    assert_equal Project.find(2), issue.project
    assert issue.description.include?('Lorem ipsum dolor sit amet, consectetuer adipiscing elit.')
  end
+
+  def test_add_issue_with_status
+    # This email contains: 'Project: onlinestore' and 'Status: Resolved'
+    issue = submit_email('ticket_on_given_project.eml')
+    assert issue.is_a?(Issue)
+    assert !issue.new_record?
+    issue.reload
+    assert_equal Project.find(2), issue.project
+    assert_equal IssueStatus.find_by_name("Resolved"), issue.status
+  end
  
  def test_add_issue_with_attributes_override
    issue = submit_email('ticket_with_attributes.eml', :allow_override => 'tracker,category,priority')
@@ -95,7 +105,18 @@ class MailHandlerTest < Test::Unit::TestCase
    assert journal.is_a?(Journal)
    assert_equal User.find_by_login('jsmith'), journal.user
    assert_equal Issue.find(2), journal.journalized
-    assert_equal 'This is reply', journal.notes
+    assert_match /This is reply/, journal.notes
+  end
+
+  def test_add_issue_note_with_status_change
+    # This email contains: 'Status: Resolved'
+    journal = submit_email('ticket_reply_with_status.eml')
+    assert journal.is_a?(Journal)
+    issue = Issue.find(journal.issue.id)
+    assert_equal User.find_by_login('jsmith'), journal.user
+    assert_equal Issue.find(2), journal.journalized
+    assert_match /This is reply/, journal.notes
+    assert_equal IssueStatus.find_by_name("Resolved"), issue.status
  end

  private