jro_apps/redmine Commit - r8902:7056649a4be9

Override @#url_for@ in AM to force generation of absolute links (#10251)....

Etienne Massip -

r8902:7056649a4be9

parent child

Context file:

r8902:7056649a4be9

Collapse all files

app/models/mailer.rb +5 0

                 { :host => h, :protocol => Setting.protocol }
               end
+              def url_for(options)
+                options[:only_path] = false if options.is_a?(Hash)
+                super options
+              end
               # Builds a tmail object used to email recipients of the added issue.
               #
               # Example:

app/views/mailer/_issue.html.erb +1 -1

             <% end %>
             </ul>
-            <%= textilizable(issue, :description, :only_path => false) %>
+            <%= textilizable(issue, :description) %>

app/views/mailer/document_added.html.erb +1 -1

             <%= link_to(h(@document.title), @document_url) %> (<%=h @document.category.name %>)<br />
             <br />
-            <%= textilizable(@document, :description, :only_path => false) %>
+            <%= textilizable(@document, :description) %>

app/views/mailer/issue_edit.html.erb +1 -1

             <% end %>
             </ul>
-            <%= textilizable(@journal, :notes, :only_path => false) %>
+            <%= textilizable(@journal, :notes) %>
             <hr />
             <%= render :partial => "issue.html.erb", :locals => { :issue => @issue, :issue_url => @issue_url } %>

app/views/mailer/message_posted.html.erb +1 -1

             <h1><%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url) %></h1>
             <em><%=h @message.author %></em>
-            <%= textilizable(@message, :content, :only_path => false) %>
+            <%= textilizable(@message, :content) %>

app/views/mailer/news_added.html.erb +1 -1

             <h1><%= link_to(h(@news.title), @news_url) %></h1>
             <em><%=h @news.author.name %></em>
-            <%= textilizable(@news, :description, :only_path => false) %>
+            <%= textilizable(@news, :description) %>

app/views/mailer/news_comment_added.html.erb +1 -1

@@ -2,4 +2,4
2		2
3	<p><%= l(:text_user_wrote, :value => h(@comment.author)) %></p>	3	<p><%= l(:text_user_wrote, :value => h(@comment.author)) %></p>
4		4
5	<%= textilizable @comment, :comments~~, :only_path => false~~ %>	5	<%= textilizable @comment, :comments %>

app/views/mailer/reminder.html.erb +1 -1

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

test/fixtures/journal_details.yml +7 0

@@ -34,3 +34,10 journal_details_005:
34	value: New value	34	value: New value
35	prop_key: 2	35	prop_key: 2
36	journal_id: 3	36	journal_id: 3
		37	journal_details_006:
		38	old_value: nil
		39	property: attachment
		40	id: 6
		41	value: 060719210727_picture.jpg
		42	prop_key: 4
		43	journal_id: 3

test/fixtures/journals.yml +5 -5

             ---
             journals_001:
               created_on: <%= 2.days.ago.to_date.to_s(:db) %>
               notes: "Journal notes"
               id: 1
               journalized_type: Issue
               user_id: 2
               journalized_id: 1
             journals_003:
               created_on: <%= 1.days.ago.to_date.to_s(:db) %>
-              notes: "A comment with inline image: !picture.jpg!"
+              notes: "A comment with inline image: !picture.jpg! and a reference to #1 and r2."
               id: 3
               journalized_type: Issue
               user_id: 2
               journalized_id: 2
             journals_004:
               created_on: <%= 1.days.ago.to_date.to_s(:db) %>
               notes: "A comment with a private version."
               id: 4
               journalized_type: Issue
               user_id: 1
               journalized_id: 6
             journals_005:
               id: 5
               created_on: <%= 1.days.ago.to_date.to_s(:db) %>
               notes: "A comment on a private issue."

test/unit/mailer_test.rb +84 -61

               end
               def test_generated_links_in_emails
+                Setting.default_language = 'en'
                 Setting.host_name = 'mydomain.foo'
                 Setting.protocol = 'https'
-                journal = Journal.find(2)
+                journal = Journal.find(3)
                 assert Mailer.deliver_issue_edit(journal)
-                mail = ActionMailer::Base.deliveries.last
+                mail = last_email
                 assert_not_nil mail
                 assert_select_email do
                   # link to the main ticket
-                  assert_select "a[href=?]",
+                  assert_select 'a[href=?]',
-                                "https://mydomain.foo/issues/1#change-2",
+                                'https://mydomain.foo/issues/2#change-3',
-                                :text => "Bug #1: Can't print recipes"
+                                :text => 'Feature request #2: Add ingredients categories'
                   # link to a referenced ticket
-                  assert_select "a[href=?][title=?]",
+                  assert_select 'a[href=?][title=?]',
-                                "https://mydomain.foo/issues/2",
+                                'https://mydomain.foo/issues/1',
-                                "Add ingredients categories (Assigned)",
+                                'Can\'t print recipes (New)',
-                                :text => "#2"
+                                :text => '#1'
                   # link to a changeset
-                  assert_select "a[href=?][title=?]",
+                  assert_select 'a[href=?][title=?]',
-                                "https://mydomain.foo/projects/ecookbook/repository/revisions/2",
+                                'https://mydomain.foo/projects/ecookbook/repository/revisions/2',
-                                "This commit fixes #1, #2 and references #1 &amp; #3",
+                                'This commit fixes #1, #2 and references #1 &amp; #3',
-                                :text => "r2"
+                                :text => 'r2'
+                  # link to a description diff
+                  assert_select 'a[href=?][title=?]',
+                                'https://mydomain.foo/journals/diff/3?detail_id=4',
+                                'View differences',
+                                :text => 'diff'
+                  # link to an attachment
+                  assert_select 'a[href=?]',
+                                'https://mydomain.foo/attachments/download/4/source.rb',
+                                :text => 'source.rb'
                 end
               end
               def test_generated_links_with_prefix
+                Setting.default_language = 'en'
                 relative_url_root = Redmine::Utils.relative_url_root
                 Setting.host_name = 'mydomain.foo/rdm'
                 Setting.protocol = 'http'
                 Redmine::Utils.relative_url_root = '/rdm'
-                journal = Journal.find(2)
+                journal = Journal.find(3)
                 assert Mailer.deliver_issue_edit(journal)
-                mail = ActionMailer::Base.deliveries.last
+                mail = last_email
                 assert_not_nil mail
                 assert_select_email do
                   # link to the main ticket
-                  assert_select "a[href=?]",
+                  assert_select 'a[href=?]',
-                                "http://mydomain.foo/rdm/issues/1#change-2",
+                                'http://mydomain.foo/rdm/issues/2#change-3',
-                                :text => "Bug #1: Can't print recipes"
+                                :text => 'Feature request #2: Add ingredients categories'
                   # link to a referenced ticket
-                  assert_select "a[href=?][title=?]",
+                  assert_select 'a[href=?][title=?]',
-                                "http://mydomain.foo/rdm/issues/2",
+                                'http://mydomain.foo/rdm/issues/1',
-                                "Add ingredients categories (Assigned)",
+                                'Can\'t print recipes (New)',
-                                :text => "#2"
+                                :text => '#1'
                   # link to a changeset
-                  assert_select "a[href=?][title=?]",
+                  assert_select 'a[href=?][title=?]',
-                                "http://mydomain.foo/rdm/projects/ecookbook/repository/revisions/2",
+                                'http://mydomain.foo/rdm/projects/ecookbook/repository/revisions/2',
-                                "This commit fixes #1, #2 and references #1 &amp; #3",
+                                'This commit fixes #1, #2 and references #1 &amp; #3',
-                                :text => "r2"
+                                :text => 'r2'
+                  # link to a description diff
+                  assert_select 'a[href=?][title=?]',
+                                'http://mydomain.foo/rdm/journals/diff/3?detail_id=4',
+                                'View differences',
+                                :text => 'diff'
+                  # link to an attachment
+                  assert_select 'a[href=?]',
+                                'http://mydomain.foo/rdm/attachments/download/4/source.rb',
+                                :text => 'source.rb'
                 end
               ensure
                 # restore it
               end
               def test_generated_links_with_prefix_and_no_relative_url_root
+                Setting.default_language = 'en'
                 relative_url_root = Redmine::Utils.relative_url_root
                 Setting.host_name = 'mydomain.foo/rdm'
                 Setting.protocol = 'http'
                 Redmine::Utils.relative_url_root = nil
-                journal = Journal.find(2)
+                journal = Journal.find(3)
                 assert Mailer.deliver_issue_edit(journal)
-                mail = ActionMailer::Base.deliveries.last
+                mail = last_email
                 assert_not_nil mail
                 assert_select_email do
                   # link to the main ticket
-                  assert_select "a[href=?]",
+                  assert_select 'a[href=?]',
-                                "http://mydomain.foo/rdm/issues/1#change-2",
+                                'http://mydomain.foo/rdm/issues/2#change-3',
-                                :text => "Bug #1: Can't print recipes"
+                                :text => 'Feature request #2: Add ingredients categories'
                   # link to a referenced ticket
-                  assert_select "a[href=?][title=?]",
+                  assert_select 'a[href=?][title=?]',
-                                "http://mydomain.foo/rdm/issues/2",
+                                'http://mydomain.foo/rdm/issues/1',
-                                "Add ingredients categories (Assigned)",
+                                'Can\'t print recipes (New)',
-                                :text => "#2"
+                                :text => '#1'
                   # link to a changeset
-                  assert_select "a[href=?][title=?]",
+                  assert_select 'a[href=?][title=?]',
-                                "http://mydomain.foo/rdm/projects/ecookbook/repository/revisions/2",
+                                'http://mydomain.foo/rdm/projects/ecookbook/repository/revisions/2',
-                                "This commit fixes #1, #2 and references #1 &amp; #3",
+                                'This commit fixes #1, #2 and references #1 &amp; #3',
-                                :text => "r2"
+                                :text => 'r2'
+                  # link to a description diff
+                  assert_select 'a[href=?][title=?]',
+                                'http://mydomain.foo/rdm/journals/diff/3?detail_id=4',
+                                'View differences',
+                                :text => 'diff'
+                  # link to an attachment
+                  assert_select 'a[href=?]',
+                                'http://mydomain.foo/rdm/attachments/download/4/source.rb',
+                                :text => 'source.rb'
                 end
               ensure
                 # restore it
               def test_email_headers
                 issue = Issue.find(1)
                 Mailer.deliver_issue_add(issue)
-                mail = ActionMailer::Base.deliveries.last
+                mail = last_email
                 assert_not_nil mail
                 assert_equal 'OOF', mail.header_string('X-Auto-Response-Suppress')
                 assert_equal 'auto-generated', mail.header_string('Auto-Submitted')
               def test_email_headers_should_include_sender
                 issue = Issue.find(1)
                 Mailer.deliver_issue_add(issue)
-                mail = ActionMailer::Base.deliveries.last
+                mail = last_email
-                assert_not_nil mail
                 assert_equal issue.author.login, mail.header_string('X-Redmine-Sender')
               end
                 Setting.plain_text_mail = 1
                 journal = Journal.find(2)
                 Mailer.deliver_issue_edit(journal)
-                mail = ActionMailer::Base.deliveries.last
+                mail = last_email
                 assert_equal "text/plain", mail.content_type
                 assert_equal 0, mail.parts.size
                 assert !mail.encoded.include?('href')
                 Setting.plain_text_mail = 0
                 journal = Journal.find(2)
                 Mailer.deliver_issue_edit(journal)
-                mail = ActionMailer::Base.deliveries.last
+                mail = last_email
                 assert_equal 2, mail.parts.size
                 assert mail.encoded.include?('href')
               end
                 with_settings :mail_from => 'redmine@example.net' do
                   Mailer.deliver_test(User.find(1))
                 end
-                mail = ActionMailer::Base.deliveries.last
+                mail = last_email
-                assert_not_nil mail
                 assert_equal 'redmine@example.net', mail.from_addrs.first.address
               end
                 with_settings :mail_from => 'Redmine app <redmine@example.net>' do
                   Mailer.deliver_test(User.find(1))
                 end
-                mail = ActionMailer::Base.deliveries.last
+                mail = last_email
-                assert_not_nil mail
                 assert_equal 'redmine@example.net', mail.from_addrs.first.address
                 assert_equal 'Redmine app', mail.from_addrs.first.name
               end
               def test_issue_add_message_id
                 issue = Issue.find(1)
                 Mailer.deliver_issue_add(issue)
-                mail = ActionMailer::Base.deliveries.last
+                mail = last_email
-                assert_not_nil mail
                 assert_equal Mailer.message_id_for(issue), mail.message_id
                 assert_nil mail.references
               end
               def test_issue_edit_message_id
                 journal = Journal.find(1)
                 Mailer.deliver_issue_edit(journal)
-                mail = ActionMailer::Base.deliveries.last
+                mail = last_email
-                assert_not_nil mail
                 assert_equal Mailer.message_id_for(journal), mail.message_id
                 assert_equal Mailer.message_id_for(journal.issue), mail.references.first.to_s
                 assert_select_email do
               def test_message_posted_message_id
                 message = Message.find(1)
                 Mailer.deliver_message_posted(message)
-                mail = ActionMailer::Base.deliveries.last
+                mail = last_email
-                assert_not_nil mail
                 assert_equal Mailer.message_id_for(message), mail.message_id
                 assert_nil mail.references
                 assert_select_email do
               def test_reply_posted_message_id
                 message = Message.find(3)
                 Mailer.deliver_message_posted(message)
-                mail = ActionMailer::Base.deliveries.last
+                mail = last_email
-                assert_not_nil mail
                 assert_equal Mailer.message_id_for(message), mail.message_id
                 assert_equal Mailer.message_id_for(message.parent), mail.references.first.to_s
                 assert_select_email do
                   token.reload
                   ActionMailer::Base.deliveries.clear
                   assert Mailer.deliver_register(token)
-                  mail = ActionMailer::Base.deliveries.last
+                  mail = last_email
                   assert_select_email do
                     assert_select "a[href=?]",
                                   "https://redmine.foo/account/activate?token=#{token.value}",
               def test_reminders
                 Mailer.reminders(:days => 42)
                 assert_equal 1, ActionMailer::Base.deliveries.size
-                mail = ActionMailer::Base.deliveries.last
+                mail = last_email
                 assert mail.bcc.include?('dlopper@somenet.foo')
                 assert mail.body.include?('Bug #3: Error 281 when updating a recipe')
                 assert_equal '1 issue(s) due in the next 42 days', mail.subject
                   Mailer.reminders(:days => 42)
                   assert_equal 1, ActionMailer::Base.deliveries.size
-                  mail = ActionMailer::Base.deliveries.last
+                  mail = last_email
                   assert mail.bcc.include?('dlopper@somenet.foo')
                   assert !mail.body.include?('Closed issue')
                 end
                 assert_equal 0, ActionMailer::Base.deliveries.size # No mail for dlopper
                 Mailer.reminders(:days => 42, :users => ['3'])
                 assert_equal 1, ActionMailer::Base.deliveries.size # No mail for dlopper
-                mail = ActionMailer::Base.deliveries.last
+                mail = last_email
                 assert mail.bcc.include?('dlopper@somenet.foo')
                 assert mail.body.include?('Bug #3: Error 281 when updating a recipe')
               end
                 user = User.find(1)
                 user.language = 'fr'
                 Mailer.deliver_account_activated(user)
-                mail = ActionMailer::Base.deliveries.last
+                mail = last_email
                 assert mail.body.include?('Votre compte')
                 assert_equal :it, current_language

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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