Download as
Browse Code »

Commit 0367bb22149231c15379dbc130d3d754df461976

Authored by Daniela Feitosa
2 parents 7c35802b 5e5a69a9
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

Merge branch 'stable'

Showing 5 changed files with 16 additions and 2 deletions   Show diff stats
app/controllers/application.rb
  Diff comments   View file @0367bb2
@@ -131,6 +131,7 @@ class ApplicationController < ActionController::Base @@ -131,6 +131,7 @@ class ApplicationController < ActionController::Base
131 @path ||= request.path 131 @path ||= request.path
132 render :template => 'shared/not_found.rhtml', :status => 404, :layout => get_layout 132 render :template => 'shared/not_found.rhtml', :status => 404, :layout => get_layout
133 end 133 end
  134 + alias :render_404 :render_not_found
134 135
135 def render_access_denied(message = nil, title = nil) 136 def render_access_denied(message = nil, title = nil)
136 @no_design_blocks = true 137 @no_design_blocks = true
app/models/suggest_article.rb
  Diff comments   View file @0367bb2
@@ -15,7 +15,7 @@ class SuggestArticle < Task @@ -15,7 +15,7 @@ class SuggestArticle < Task
15 settings_items :article_parent_id, :type => String 15 settings_items :article_parent_id, :type => String
16 settings_items :source, :type => String 16 settings_items :source, :type => String
17 settings_items :source_name, :type => String 17 settings_items :source_name, :type => String
18 - settings_items :highlighted, :type => :boolean 18 + settings_items :highlighted, :type => :boolean, :default => false
19 19
20 def sender 20 def sender
21 "#{name} (#{email})" 21 "#{name} (#{email})"
@@ -31,8 +31,8 @@ ActiveRecord::Schema.define(:version => 20110203160153) do @@ -31,8 +31,8 @@ ActiveRecord::Schema.define(:version => 20110203160153) do
31 t.integer "profile_id" 31 t.integer "profile_id"
32 end 32 end
33 33
34 - add_index "action_tracker_notifications", ["action_tracker_id", "profile_id"], :name => "index_action_tracker_notifications_on_profile_id_and_action_tra", :unique => true  
35 add_index "action_tracker_notifications", ["action_tracker_id"], :name => "index_action_tracker_notifications_on_action_tracker_id" 34 add_index "action_tracker_notifications", ["action_tracker_id"], :name => "index_action_tracker_notifications_on_action_tracker_id"
  35 + add_index "action_tracker_notifications", ["profile_id", "action_tracker_id"], :name => "index_action_tracker_notifications_on_profile_id_and_action_tracker_id", :unique => true
36 add_index "action_tracker_notifications", ["profile_id"], :name => "index_action_tracker_notifications_on_profile_id" 36 add_index "action_tracker_notifications", ["profile_id"], :name => "index_action_tracker_notifications_on_profile_id"
37 37
38 create_table "article_versions", :force => true do |t| 38 create_table "article_versions", :force => true do |t|
test/integration/exception_notification_test.rb
  Diff comments   View file @0367bb2
@@ -25,4 +25,9 @@ class ExceptionNotificationTest < ActionController::IntegrationTest @@ -25,4 +25,9 @@ class ExceptionNotificationTest < ActionController::IntegrationTest
25 assert_includes ActionMailer::Base.deliveries.map(&:to).flatten, 'admin@example.com' 25 assert_includes ActionMailer::Base.deliveries.map(&:to).flatten, 'admin@example.com'
26 assert_includes ActionMailer::Base.deliveries.map(&:to).flatten, 'user@example.com' 26 assert_includes ActionMailer::Base.deliveries.map(&:to).flatten, 'user@example.com'
27 end 27 end
  28 +
  29 + should 'render not found when try to access invalid url' do
  30 + get '/profile/ze/tag/notexists'
  31 + assert_template 'not_found.rhtml'
  32 + end
28 end 33 end
test/unit/suggest_article_test.rb
  Diff comments   View file @0367bb2
@@ -113,6 +113,14 @@ class SuggestArticleTest < ActiveSupport::TestCase @@ -113,6 +113,14 @@ class SuggestArticleTest < ActiveSupport::TestCase
113 assert article.highlighted 113 assert article.highlighted
114 end 114 end
115 115
  116 + should 'not be highlighted by default' do
  117 + t = build(SuggestArticle, :target => @profile)
  118 + t.perform
  119 +
  120 + article = TinyMceArticle.last(:conditions => { :name => t.article_name})
  121 + assert_equal false, article.highlighted
  122 + end
  123 +
116 should 'override target notification message method from Task' do 124 should 'override target notification message method from Task' do
117 task = build(SuggestArticle, :target => @profile) 125 task = build(SuggestArticle, :target => @profile)
118 assert_nothing_raised NotImplementedError do 126 assert_nothing_raised NotImplementedError do