Download as
Browse Code »

Commit 1009c905b1214ee6715dd78b34a3ec69374833a3

Authored by Daniela Feitosa
1 parent 7793e384
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fixed send_email plugin tests 

Some tests were broken after changes on routes included with commit
bfce4eb13212734b675c4fd07f23ecca6946cb3e
Showing 9 changed files with 17 additions and 18 deletions   Show diff stats
plugins/send_email/controllers/send_email_plugin_controller.rb 0 → 100644
  Diff comments   View file @1009c90
... ... @@ -0,0 +1,4 @@
  1 +class SendEmailPluginController < ApplicationController
  2 + append_view_path File.join(File.dirname(__FILE__) + '/../views')
  3 + include SendEmailPluginBaseController
  4 +end
... ...
plugins/send_email/controllers/send_email_plugin_environment_controller.rb
View file @7793e38
... ... @@ -1,4 +0,0 @@
1   -class SendEmailPluginEnvironmentController < ApplicationController
2   - append_view_path File.join(File.dirname(__FILE__) + '/../views')
3   - include SendEmailPluginBaseController
4   -end
plugins/send_email/test/functional/send_email_plugin_base_controller_test.rb
  Diff comments   View file @1009c90
... ... @@ -59,7 +59,7 @@ class SendEmailPluginProfileControllerTest &lt; ActionController::TestCase
59 59 run_common_tests()
60 60 end
61 61  
62   -class SendEmailPluginEnvironmentControllerTest < ActionController::TestCase
  62 +class SendEmailPluginControllerTest < ActionController::TestCase
63 63 def setup
64 64 ActionMailer::Base.delivery_method = :test
65 65 ActionMailer::Base.perform_deliveries = true
... ...
plugins/send_email/views/send_email_plugin/fail.rhtml 0 → 100644
  Diff comments   View file @1009c90
... ... @@ -0,0 +1,3 @@
  1 +<%= error_messages_for 'mail', :header_message => _('The message could not be sent') %>
  2 +
  3 +<%= button :back, _('Back'), :back %>
... ...
plugins/send_email/views/send_email_plugin/success.rhtml 0 → 100644
  Diff comments   View file @1009c90
... ... @@ -0,0 +1,8 @@
  1 +<h2><%= _('Message sent') %></h2>
  2 +
  3 +<table class='sendemail-plugin-message-sent'>
  4 + <tr><td class='label'><strong><%= _('Subject') %>:</strong></td><td class='value'><em><%=h @mail.subject %></em></td></tr>
  5 + <tr><td class='label'><strong><%= _('Message') %>:</strong></td><td class='value'><pre><%=h render :file => 'send_email_plugin/sender/message' %></pre></td></tr>
  6 +</table>
  7 +
  8 +<p><%= button :back, _('Back'), :back %></p>
... ...
plugins/send_email/views/send_email_plugin_base/fail.rhtml
View file @7793e38
... ... @@ -1,3 +0,0 @@
1   -<%= error_messages_for 'mail', :header_message => _('The message could not be sent') %>
2   -
3   -<%= button :back, _('Back'), :back %>
plugins/send_email/views/send_email_plugin_base/success.rhtml
View file @7793e38
... ... @@ -1,8 +0,0 @@
1   -<h2><%= _('Message sent') %></h2>
2   -
3   -<table class='sendemail-plugin-message-sent'>
4   - <tr><td class='label'><strong><%= _('Subject') %>:</strong></td><td class='value'><em><%=h @mail.subject %></em></td></tr>
5   - <tr><td class='label'><strong><%= _('Message') %>:</strong></td><td class='value'><pre><%=h render :file => 'send_email_plugin/sender/message' %></pre></td></tr>
6   -</table>
7   -
8   -<p><%= button :back, _('Back'), :back %></p>
plugins/send_email/views/send_email_plugin_environment
View file @7793e38
... ... @@ -1 +0,0 @@
1   -send_email_plugin_base
2 0 \ No newline at end of file
plugins/send_email/views/send_email_plugin_profile
  Diff comments   View file @1009c90
1   -send_email_plugin_base
2 1 \ No newline at end of file
  2 +send_email_plugin
3 3 \ No newline at end of file
... ...