From a942c1c25ec955bfefd6ebcd9993f1d7ac1faf1e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 5 Dec 2014 08:08:00 +0000
Subject: [PATCH] Removed unimplemented JournalsController#edit html response
 and added some tests.

git-svn-id: http://svn.redmine.org/redmine/trunk@13704 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/journals_controller.rb      |  5 +----
 test/functional/journals_controller_test.rb | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index 940a7b5e1..98e8b46e5 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -84,10 +84,7 @@ class JournalsController < ApplicationController
       end
     else
       respond_to do |format|
-        format.html {
-          # TODO: implement non-JS journal update
-          render :nothing => true
-        }
+        # TODO: implement non-JS journal update
         format.js
       end
     end
diff --git a/test/functional/journals_controller_test.rb b/test/functional/journals_controller_test.rb
index d281be5a4..a05246023 100644
--- a/test/functional/journals_controller_test.rb
+++ b/test/functional/journals_controller_test.rb
@@ -32,6 +32,11 @@ class JournalsControllerTest < ActionController::TestCase
     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
@@ -55,6 +60,15 @@ class JournalsControllerTest < ActionController::TestCase
     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