jro_apps/redmine Commit - r13322:a942c1c25ec9

Removed unimplemented JournalsController#edit html response and added some tests....

Jean-Philippe Lang -

r13322:a942c1c25ec9

parent child

Context file:

r13322:a942c1c25ec9

Collapse all files

app/controllers/journals_controller.rb +1 -4

             # Redmine - project management software
             # Copyright (C) 2006-2014  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 JournalsController < ApplicationController
               before_filter :find_journal, :only => [:edit, :diff]
               before_filter :find_issue, :only => [:new]
               before_filter :find_optional_project, :only => [:index]
               before_filter :authorize, :only => [:new, :edit, :diff]
               accept_rss_auth :index
               menu_item :issues
               helper :issues
               helper :custom_fields
               helper :queries
               include QueriesHelper
               helper :sort
               include SortHelper
               def index
                 retrieve_query
                 sort_init 'id', 'desc'
                 sort_update(@query.sortable_columns)
                 if @query.valid?
                   @journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC",
                                               :limit => 25)
                 end
                 @title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name)
                 render :layout => false, :content_type => 'application/atom+xml'
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def diff
                 @issue = @journal.issue
                 if params[:detail_id].present?
                   @detail = @journal.details.find_by_id(params[:detail_id])
                 else
                   @detail = @journal.details.detect {|d| d.prop_key == 'description'}
                 end
                 (render_404; return false) unless @issue && @detail
                 @diff = Redmine::Helpers::Diff.new(@detail.value, @detail.old_value)
               end
               def new
                 @journal = Journal.visible.find(params[:journal_id]) if params[:journal_id]
                 if @journal
                   user = @journal.user
                   text = @journal.notes
                 else
                   user = @issue.author
                   text = @issue.description
                 end
                 # Replaces pre blocks with [...]
                 text = text.to_s.strip.gsub(%r{<pre>(.*?)</pre>}m, '[...]')
                 @content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> "
                 @content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def edit
                 (render_403; return false) unless @journal.editable_by?(User.current)
                 if request.post?
                   @journal.update_attributes(:notes => params[:notes]) if params[:notes]
                   @journal.destroy if @journal.details.empty? && @journal.notes.blank?
                   call_hook(:controller_journals_edit_post, { :journal => @journal, :params => params})
                   respond_to do |format|
                     format.html { redirect_to issue_path(@journal.journalized) }
                     format.js { render :action => 'update' }
                   end
                 else
                   respond_to do |format|
-                    format.html {
+                    # TODO: implement non-JS journal update
-                      # TODO: implement non-JS journal update
-                      render :nothing => true
                     format.js
                   end
                 end
               end
               private
               def find_journal
                 @journal = Journal.visible.find(params[:id])
                 @project = @journal.journalized.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

test/functional/journals_controller_test.rb +14 0

             # Redmine - project management software
             # Copyright (C) 2006-2014  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.expand_path('../../test_helper', __FILE__)
             class JournalsControllerTest < ActionController::TestCase
               fixtures :projects, :users, :members, :member_roles, :roles, :issues, :journals, :journal_details, :enabled_modules,
                 :trackers, :issue_statuses, :enumerations, :custom_fields, :custom_values, :custom_fields_projects
               def setup
                 User.current = nil
               end
               def test_index
                 get :index, :project_id => 1
                 assert_response :success
                 assert_not_nil assigns(:journals)
                 assert_equal 'application/atom+xml', @response.content_type
               end
+              def test_index_with_invalid_query_id
+                get :index, :project_id => 1, :query_id => 999
+                assert_response 404
+              end
               def test_index_should_return_privates_notes_with_permission_only
                 journal = Journal.create!(:journalized => Issue.find(2), :notes => 'Privates notes', :private_notes => true, :user_id => 1)
                 @request.session[:user_id] = 2
                 get :index, :project_id => 1
                 assert_response :success
                 assert_include journal, assigns(:journals)
                 Role.find(1).remove_permission! :view_private_notes
                 get :index, :project_id => 1
                 assert_response :success
                 assert_not_include journal, assigns(:journals)
               end
               def test_diff
                 get :diff, :id => 3, :detail_id => 4
                 assert_response :success
                 assert_template 'diff'
                 assert_select 'span.diff_out', :text => /removed/
                 assert_select 'span.diff_in', :text => /added/
               end
+              def test_diff_should_default_to_description_diff
+                get :diff, :id => 3
+                assert_response :success
+                assert_template 'diff'
+                assert_select 'span.diff_out', :text => /removed/
+                assert_select 'span.diff_in', :text => /added/
+              end
               def test_reply_to_issue
                 @request.session[:user_id] = 2
                 xhr :get, :new, :id => 6
                 assert_response :success
                 assert_template 'new'
                 assert_equal 'text/javascript', response.content_type
                 assert_include '> This is an issue', response.body
               end
               def test_reply_to_issue_without_permission
                 @request.session[:user_id] = 7
                 xhr :get, :new, :id => 6
                 assert_response 403
               end
               def test_reply_to_note
                 @request.session[:user_id] = 2
                 xhr :get, :new, :id => 6, :journal_id => 4
                 assert_response :success
                 assert_template 'new'
                 assert_equal 'text/javascript', response.content_type
                 assert_include '> A comment with a private version', response.body
               end
               def test_reply_to_private_note_should_fail_without_permission
                 journal = Journal.create!(:journalized => Issue.find(2), :notes => 'Privates notes', :private_notes => true)
                 @request.session[:user_id] = 2
                 xhr :get, :new, :id => 2, :journal_id => journal.id
                 assert_response :success
                 assert_template 'new'
                 assert_equal 'text/javascript', response.content_type
                 assert_include '> Privates notes', response.body
                 Role.find(1).remove_permission! :view_private_notes
                 xhr :get, :new, :id => 2, :journal_id => journal.id
                 assert_response 404
               end
               def test_edit_xhr
                 @request.session[:user_id] = 1
                 xhr :get, :edit, :id => 2
                 assert_response :success
                 assert_template 'edit'
                 assert_equal 'text/javascript', response.content_type
                 assert_include 'textarea', response.body
               end
               def test_edit_private_note_should_fail_without_permission
                 journal = Journal.create!(:journalized => Issue.find(2), :notes => 'Privates notes', :private_notes => true)
                 @request.session[:user_id] = 2
                 Role.find(1).add_permission! :edit_issue_notes
                 xhr :get, :edit, :id => journal.id
                 assert_response :success
                 assert_template 'edit'
                 assert_equal 'text/javascript', response.content_type
                 assert_include 'textarea', response.body
                 Role.find(1).remove_permission! :view_private_notes
                 xhr :get, :edit, :id => journal.id
                 assert_response 404
               end
               def test_update_xhr
                 @request.session[:user_id] = 1
                 xhr :post, :edit, :id => 2, :notes => 'Updated notes'
                 assert_response :success
                 assert_template 'update'
                 assert_equal 'text/javascript', response.content_type
                 assert_equal 'Updated notes', Journal.find(2).notes
                 assert_include 'journal-2-notes', response.body
               end
               def test_update_xhr_with_empty_notes_should_delete_the_journal
                 @request.session[:user_id] = 1
                 assert_difference 'Journal.count', -1 do
                   xhr :post, :edit, :id => 2, :notes => ''
                   assert_response :success
                   assert_template 'update'
                   assert_equal 'text/javascript', response.content_type
                 end
                 assert_nil Journal.find_by_id(2)
                 assert_include 'change-2', response.body
               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