Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor: move NewsController#add_comment to CommentsController#create
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4170 e93f8b46-1217-0410-a6f0-8f06a7374b81
- Loading branch information
Showing
8 changed files
with
83 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
class CommentsController < ApplicationController | ||
default_search_scope :news | ||
model_object News | ||
before_filter :find_model_object | ||
before_filter :find_project_from_association | ||
before_filter :authorize | ||
|
||
verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed } | ||
def create | ||
@comment = Comment.new(params[:comment]) | ||
@comment.author = User.current | ||
if @news.comments << @comment | ||
flash[:notice] = l(:label_comment_added) | ||
end | ||
|
||
redirect_to :controller => 'news', :action => 'show', :id => @news | ||
end | ||
|
||
private | ||
|
||
# ApplicationController's find_model_object sets it based on the controller | ||
# name so it needs to be overriden and set to @news instead | ||
def find_model_object | ||
super | ||
@news = @object | ||
@comment = nil | ||
@news | ||
end | ||
|
||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
# 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' | ||
|
||
class CommentsControllerTest < ActionController::TestCase | ||
fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules, :news, :comments | ||
|
||
def setup | ||
User.current = nil | ||
end | ||
|
||
def test_add_comment | ||
@request.session[:user_id] = 2 | ||
post :create, :id => 1, :comment => { :comments => 'This is a test 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 test 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 :create, :id => 1, :comment => { :comments => '' } | ||
assert_response :redirect | ||
assert_redirected_to 'news/1' | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters