jro_apps/redmine Commit - r2715:d41bd93acbea

Fixed: error raised when trying to add an empty comment to a news (#3615)....

Jean-Philippe Lang -

r2715:d41bd93acbea

parent child

Context file:

r2715:d41bd93acbea

Collapse all files

app/controllers/news_controller.rb +1 0

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class NewsController < ApplicationController
               before_filter :find_news, :except => [:new, :index, :preview]
               before_filter :find_project, :only => [:new, :preview]
               before_filter :authorize, :except => [:index, :preview]
               before_filter :find_optional_project, :only => :index
               accept_key_auth :index
               def index
                 @news_pages, @newss = paginate :news,
                                                :per_page => 10,
                                                :conditions => (@project ? {:project_id => @project.id} : Project.visible_by(User.current)),
                                                :include => [:author, :project],
                                                :order => "#{News.table_name}.created_on DESC"
                 respond_to do |format|
                   format.html { render :layout => false if request.xhr? }
                   format.atom { render_feed(@newss, :title => (@project ? @project.name : Setting.app_title) + ": #{l(:label_news_plural)}") }
                 end
               end
               def show
                 @comments = @news.comments
                 @comments.reverse! if User.current.wants_comments_in_reverse_order?
               end
               def new
                 @news = News.new(:project => @project, :author => User.current)
                 if request.post?
                   @news.attributes = params[:news]
                   if @news.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :controller => 'news', :action => 'index', :project_id => @project
                   end
                 end
               end
               def edit
                 if request.post? and @news.update_attributes(params[:news])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'show', :id => @news
                 end
               end
               def add_comment
                 @comment = Comment.new(params[:comment])
                 @comment.author = User.current
                 if @news.comments << @comment
                   flash[:notice] = l(:label_comment_added)
                   redirect_to :action => 'show', :id => @news
                 else
+                  show
                   render :action => 'show'
                 end
               end
               def destroy_comment
                 @news.comments.find(params[:comment_id]).destroy
                 redirect_to :action => 'show', :id => @news
               end
               def destroy
                 @news.destroy
                 redirect_to :action => 'index', :project_id => @project
               end
               def preview
                 @text = (params[:news] ? params[:news][:description] : nil)
                 render :partial => 'common/preview'
               end
             private
               def find_news
                 @news = News.find(params[:id])
                 @project = @news.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_project
                 @project = Project.find(params[:project_id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_optional_project
                 return true unless params[:project_id]
                 @project = Project.find(params[:project_id])
                 authorize
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

test/functional/news_controller_test.rb +9 0

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             require 'news_controller'
             # Re-raise errors caught by the controller.
             class NewsController; def rescue_action(e) raise e end; end
             class NewsControllerTest < Test::Unit::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :news, :comments
               def setup
                 @controller = NewsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
               def test_index_routing
                 assert_routing(
                   {:method => :get, :path => '/news'},
                   :controller => 'news', :action => 'index'
                 )
               end
               def test_index_routing_formatted
                 assert_routing(
                   {:method => :get, :path => '/news.atom'},
                   :controller => 'news', :action => 'index', :format => 'atom'
                 )
               end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:newss)
                 assert_nil assigns(:project)
               end
               def test_index_with_project_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/567/news'},
                   :controller => 'news', :action => 'index', :project_id => '567'
                 )
               end
               def test_index_with_project_routing_formatted
                 assert_routing(
                   {:method => :get, :path => '/projects/567/news.atom'},
                   :controller => 'news', :action => 'index', :project_id => '567', :format => 'atom'
                 )
               end
               def test_index_with_project
                 get :index, :project_id => 1
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:newss)
               end
               def test_show_routing
                 assert_routing(
                   {:method => :get, :path => '/news/2'},
                   :controller => 'news', :action => 'show', :id => '2'
                 )
               end
               def test_show
                 get :show, :id => 1
                 assert_response :success
                 assert_template 'show'
                 assert_tag :tag => 'h2', :content => /eCookbook first release/
               end
               def test_show_not_found
                 get :show, :id => 999
                 assert_response 404
               end
               def test_new_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/567/news/new'},
                   :controller => 'news', :action => 'new', :project_id => '567'
                 )
                 assert_recognizes(
                   {:controller => 'news', :action => 'new', :project_id => '567'},
                   {:method => :post, :path => '/projects/567/news'}
                 )
               end
               def test_get_new
                 @request.session[:user_id] = 2
                 get :new, :project_id => 1
                 assert_response :success
                 assert_template 'new'
               end
               def test_post_new
                 ActionMailer::Base.deliveries.clear
                 Setting.notified_events << 'news_added'
                 @request.session[:user_id] = 2
                 post :new, :project_id => 1, :news => { :title => 'NewsControllerTest',
                                                         :description => 'This is the description',
                                                         :summary => '' }
                 assert_redirected_to 'projects/ecookbook/news'
                 news = News.find_by_title('NewsControllerTest')
                 assert_not_nil news
                 assert_equal 'This is the description', news.description
                 assert_equal User.find(2), news.author
                 assert_equal Project.find(1), news.project
                 assert_equal 1, ActionMailer::Base.deliveries.size
               end
               def test_edit_routing
                 assert_routing(
                   {:method => :get, :path => '/news/234'},
                   :controller => 'news', :action => 'show', :id => '234'
                 )
                 assert_recognizes(#TODO: PUT to news URI instead, need to modify form
                   {:controller => 'news', :action => 'edit', :id => '567'},
                   {:method => :post, :path => '/news/567/edit'}
                 )
               end
               def test_get_edit
                 @request.session[:user_id] = 2
                 get :edit, :id => 1
                 assert_response :success
                 assert_template 'edit'
               end
               def test_post_edit
                 @request.session[:user_id] = 2
                 post :edit, :id => 1, :news => { :description => 'Description changed by test_post_edit' }
                 assert_redirected_to 'news/1'
                 news = News.find(1)
                 assert_equal 'Description changed by test_post_edit', news.description
               end
               def test_post_new_with_validation_failure
                 @request.session[:user_id] = 2
                 post :new, :project_id => 1, :news => { :title => '',
                                                         :description => 'This is the description',
                                                         :summary => '' }
                 assert_response :success
                 assert_template 'new'
                 assert_not_nil assigns(:news)
                 assert assigns(:news).new_record?
                 assert_tag :tag => 'div', :attributes => { :id => 'errorExplanation' },
                                           :content => /1 error/
               end
               def test_add_comment
                 @request.session[:user_id] = 2
                 post :add_comment, :id => 1, :comment => { :comments => 'This is a NewsControllerTest comment' }
                 assert_redirected_to 'news/1'
                 comment = News.find(1).comments.find(:first, :order => 'created_on DESC')
                 assert_not_nil comment
                 assert_equal 'This is a NewsControllerTest comment', comment.comments
                 assert_equal User.find(2), comment.author
               end
+              def test_empty_comment_should_not_be_added
+                @request.session[:user_id] = 2
+                assert_no_difference 'Comment.count' do
+                  post :add_comment, :id => 1, :comment => { :comments => '' }
+                  assert_response :success
+                  assert_template 'show'
+                end
+              end
               def test_destroy_comment
                 comments_count = News.find(1).comments.size
                 @request.session[:user_id] = 2
                 post :destroy_comment, :id => 1, :comment_id => 2
                 assert_redirected_to 'news/1'
                 assert_nil Comment.find_by_id(2)
                 assert_equal comments_count - 1, News.find(1).comments.size
               end
               def test_destroy_routing
                 assert_recognizes(#TODO: should use DELETE to news URI, need to change form
                   {:controller => 'news', :action => 'destroy', :id => '567'},
                   {:method => :post, :path => '/news/567/destroy'}
                 )
               end
               def test_destroy
                 @request.session[:user_id] = 2
                 post :destroy, :id => 1
                 assert_redirected_to 'projects/ecookbook/news'
                 assert_nil News.find_by_id(1)
               end
               def test_preview
                 get :preview, :project_id => 1,
                               :news => {:title => '',
                                         :description => 'News description',
                                         :summary => ''}
                 assert_response :success
                 assert_template 'common/_preview'
                 assert_tag :tag => 'fieldset', :attributes => { :class => 'preview' },
                                                :content => /News description/
               end
             end

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