jro_apps/redmine Commit - r2767:3d0fbea9fdfd

test/fixtures/mail_handler/ticket_with_spaces_between_attribute_and_separator.eml created 644 +43 0

@@ -0,0 +1,43
	1	Return-Path: <jsmith@somenet.foo>
	2	Received: from osiris ([127.0.0.1])
	3	by OSIRIS
	4	with hMailServer ; Sun, 22 Jun 2008 12:28:07 +0200
	5	Message-ID: <000501c8d452$a95cd7e0$0a00a8c0@osiris>
	6	From: "John Smith" <jsmith@somenet.foo>
	7	To: <redmine@somenet.foo>
	8	Subject: New ticket on a given project
	9	Date: Sun, 22 Jun 2008 12:28:07 +0200
	10	MIME-Version: 1.0
	11	Content-Type: text/plain;
	12	format=flowed;
	13	charset="iso-8859-1";
	14	reply-type=original
	15	Content-Transfer-Encoding: 7bit
	16	X-Priority: 3
	17	X-MSMail-Priority: Normal
	18	X-Mailer: Microsoft Outlook Express 6.00.2900.2869
	19	X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2869
	20
	21	Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas imperdiet
	22	turpis et odio. Integer eget pede vel dolor euismod varius. Phasellus
	23	blandit eleifend augue. Nulla facilisi. Duis id diam. Class aptent taciti
	24	sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. In
	25	in urna sed tellus aliquet lobortis. Morbi scelerisque tortor in dolor. Cras
	26	sagittis odio eu lacus. Aliquam sem tortor, consequat sit amet, vestibulum
	27	id, iaculis at, lectus. Fusce tortor libero, congue ut, euismod nec, luctus
	28	eget, eros. Pellentesque tortor enim, feugiat in, dignissim eget, tristique
	29	sed, mauris. Pellentesque habitant morbi tristique senectus et netus et
	30	malesuada fames ac turpis egestas. Quisque sit amet libero. In hac habitasse
	31	platea dictumst.
	32
	33	Nulla et nunc. Duis pede. Donec et ipsum. Nam ut dui tincidunt neque
	34	sollicitudin iaculis. Duis vitae dolor. Vestibulum eget massa. Sed lorem.
	35	Nullam volutpat cursus erat. Cras felis dolor, lacinia quis, rutrum et,
	36	dictum et, ligula. Sed erat nibh, gravida in, accumsan non, placerat sed,
	37	massa. Sed sodales, ante fermentum ultricies sollicitudin, massa leo
	38	pulvinar dui, a gravida orci mi eget odio. Nunc a lacus.
	39
	40	Project : onlinestore
	41	Tracker: Feature request
	42	category : Stock management
	43	priority: Urgent

app/controllers/news_controller.rb +1 0

                   flash[:notice] = l(:label_comment_added)
                   redirect_to :action => 'show', :id => @news
                 else
+                  show
                   render :action => 'show'
                 end
               end

app/helpers/application_helper.rb +1 -1

                 #     export:some/file -> Force the download of the file
                 #  Forum messages:
                 #     message#1218 -> Link to message with id 1218
-                text = text.gsub(%r{([\s\(,\-\>]|^)(!)?(attachment|document|version|commit|source|export|message)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|\s|<|$)}) do |m|
+                text = text.gsub(%r{([\s\(,\-\>]|^)(!)?(attachment|document|version|commit|source|export|message)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|,|\s|<|$)}) do |m|
                   leading, esc, prefix, sep, oid = $1, $2, $3, $5 || $7, $6 || $8
                   link = nil
                   if esc.nil?

app/models/mail_handler.rb +1 -1

                   @keywords[attr]
                 else
                   @keywords[attr] = begin
-                    if (options[:override] || @@handler_options[:allow_override].include?(attr.to_s)) && plain_text_body.gsub!(/^#{attr}:[ \t]*(.+)\s*$/i, '')
+                    if (options[:override] || @@handler_options[:allow_override].include?(attr.to_s)) && plain_text_body.gsub!(/^#{attr}[ \t]*:[ \t]*(.+)\s*$/i, '')
                       $1.strip
                     elsif !@@handler_options[:issue][attr].blank?
                       @@handler_options[:issue][attr]

app/views/mailer/reminder.text.html.rhtml +1 -1

             <ul>
             <% @issues.each do |issue| -%>
-                <li><%=h "#{issue.project} - #{issue.tracker} ##{issue.id}: #{issue.subject}" %></li>
+              <li><%=h issue.project %> - <%=link_to("#{issue.tracker} ##{issue.id}", :controller => 'issues', :action => 'show', :id => issue, :only_path => false)%>: <%=h issue.subject %></li>
             <% end -%>
             </ul>

app/views/wiki/special_date_index.rhtml +2 -2

             <% unless @pages.empty? %>
             <p class="other-formats">
             <%= l(:label_export_to) %>
-            <span><%= link_to 'Atom', {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_pages => 1, :format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
+            <span><%= link_to 'Atom', {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
             <span><%= link_to 'HTML', {:action => 'special', :page => 'export'}, :class => 'html' %></span>
             </p>
             <% end %>
             <% content_for :header_tags do %>
-            <%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :id => @project, :show_wiki_pages => 1, :format => 'atom', :key => User.current.rss_key) %>
+            <%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
             <% end %>

app/views/wiki/special_page_index.rhtml +2 -2

             <% unless @pages.empty? %>
             <p class="other-formats">
             <%= l(:label_export_to) %>
-            <span><%= link_to 'Atom', {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_pages => 1, :format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
+            <span><%= link_to 'Atom', {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
             <span><%= link_to 'HTML', {:action => 'special', :page => 'export'} %></span>
             </p>
             <% end %>
             <% content_for :header_tags do %>
-            <%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :id => @project, :show_wiki_pages => 1, :format => 'atom', :key => User.current.rss_key) %>
+            <%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
             <% end %>

doc/CHANGELOG +5 0

             == 2009-xx-xx v0.8.5
+            * Incoming mail handler : Allow spaces between keywords and colon
+            * Do not require a non-word character after a comma in Redmine links
+            * Include issue hyperlinks in reminder emails
+            * Fixed: 500 Internal Server Error is raised if add an empty comment to the news
+            * Fixes: Atom links for wiki pages are not correct
             * Fixed: Atom feeds leak email address

test/functional/news_controller_test.rb +9 0

@@ -118,6 +118,15 class NewsControllerTest < Test::Unit::TestCase
118	assert_equal User.find(2), comment.author	118	assert_equal User.find(2), comment.author
119	end	119	end
120		120
		121	def test_empty_comment_should_not_be_added
		122	@request.session[:user_id] = 2
		123	assert_no_difference 'Comment.count' do
		124	post :add_comment, :id => 1, :comment => { :comments => '' }
		125	assert_response :success
		126	assert_template 'show'
		127	end
		128	end
		129
121	def test_destroy_comment	130	def test_destroy_comment
122	comments_count = News.find(1).comments.size	131	comments_count = News.find(1).comments.size
123	@request.session[:user_id] = 2	132	@request.session[:user_id] = 2

test/unit/helpers/application_helper_test.rb +5 0

                 changeset_link = link_to('r1', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 1},
                                                :class => 'changeset', :title => 'My very first commit')
+                changeset_link2 = link_to('r2', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 2},
+                                                :class => 'changeset', :title => 'This commit fixes #1, #2 and references #1 & #3')
                 document_link = link_to('Test document', {:controller => 'documents', :action => 'show', :id => 1},
                                                          :class => 'document')
                   '#3, #3 and #3.'              => "#{issue_link}, #{issue_link} and #{issue_link}.",
                   # changesets
                   'r1'                          => changeset_link,
+                  'r1.'                         => "#{changeset_link}.",
+                  'r1, r2'                      => "#{changeset_link}, #{changeset_link2}",
+                  'r1,r2'                       => "#{changeset_link},#{changeset_link2}",
                   # documents
                   'document#1'                  => document_link,
                   'document:"Test document"'    => document_link,

test/unit/mail_handler_test.rb +15 0

@@ -92,6 +92,21 class MailHandlerTest < Test::Unit::TestCase
92	assert issue.description.include?('Lorem ipsum dolor sit amet, consectetuer adipiscing elit.')	92	assert issue.description.include?('Lorem ipsum dolor sit amet, consectetuer adipiscing elit.')
93	end	93	end
94		94
		95	def test_add_issue_with_spaces_between_attribute_and_separator
		96	issue = submit_email('ticket_with_spaces_between_attribute_and_separator.eml', :allow_override => 'tracker,category,priority')
		97	assert issue.is_a?(Issue)
		98	assert !issue.new_record?
		99	issue.reload
		100	assert_equal 'New ticket on a given project', issue.subject
		101	assert_equal User.find_by_login('jsmith'), issue.author
		102	assert_equal Project.find(2), issue.project
		103	assert_equal 'Feature request', issue.tracker.to_s
		104	assert_equal 'Stock management', issue.category.to_s
		105	assert_equal 'Urgent', issue.priority.to_s
		106	assert issue.description.include?('Lorem ipsum dolor sit amet, consectetuer adipiscing elit.')
		107	end
		108
		109
95	def test_add_issue_with_attachment_to_specific_project	110	def test_add_issue_with_attachment_to_specific_project
96	issue = submit_email('ticket_with_attachment.eml', :issue => {:project => 'onlinestore'})	111	issue = submit_email('ticket_with_attachment.eml', :issue => {:project => 'onlinestore'})
97	assert issue.is_a?(Issue)	112	assert issue.is_a?(Issue)

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages