8cece46dd4
Conflicts: app/controllers/application_controller.rb app/controllers/context_menus_controller.rb app/controllers/gantts_controller.rb app/controllers/issue_moves_controller.rb app/controllers/issues_controller.rb app/controllers/journals_controller.rb app/controllers/previews_controller.rb app/controllers/timelog_controller.rb app/helpers/issues_helper.rb app/helpers/journals_helper.rb app/models/issue.rb app/models/journal.rb app/models/journal_observer.rb app/views/admin/projects.rhtml app/views/context_menus/issues.html.erb app/views/issues/_action_menu.rhtml app/views/issues/_history.rhtml app/views/news/_news.rhtml app/views/news/index.rhtml app/views/repositories/diff.rhtml config/locales/bg.yml config/locales/bs.yml config/locales/ca.yml config/locales/cs.yml config/locales/da.yml config/locales/de.yml config/locales/el.yml config/locales/en-GB.yml config/locales/es.yml config/locales/eu.yml config/locales/fi.yml config/locales/fr.yml config/locales/gl.yml config/locales/he.yml config/locales/hr.yml config/locales/hu.yml config/locales/id.yml config/locales/it.yml config/locales/ko.yml config/locales/lt.yml config/locales/lv.yml config/locales/mn.yml config/locales/nl.yml config/locales/no.yml config/locales/pl.yml config/locales/pt-BR.yml config/locales/pt.yml config/locales/ro.yml config/locales/ru.yml config/locales/sk.yml config/locales/sl.yml config/locales/sr-YU.yml config/locales/sr.yml config/locales/sv.yml config/locales/th.yml config/locales/tr.yml config/locales/uk.yml config/locales/vi.yml config/locales/zh-TW.yml config/locales/zh.yml config/routes.rb doc/CHANGELOG lib/redmine.rb lib/redmine/export/pdf.rb lib/redmine/helpers/gantt.rb lib/redmine/version.rb public/stylesheets/application.css test/functional/context_menus_controller_test.rb test/functional/issues_controller_test.rb test/functional/journals_controller_test.rb test/functional/previews_controller_test.rb test/functional/users_controller_test.rb test/functional/wiki_controller_test.rb test/integration/routing_test.rb test/unit/issue_test.rb test/unit/mailer_test.rb test/unit/query_test.rb
67 lines
2.2 KiB
Ruby
67 lines
2.2 KiB
Ruby
# redMine - project management software
|
|
# Copyright (C) 2006-2008 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 'journals_controller'
|
|
|
|
# Re-raise errors caught by the controller.
|
|
class JournalsController; def rescue_action(e) raise e end; end
|
|
|
|
class JournalsControllerTest < ActionController::TestCase
|
|
fixtures :projects, :users, :members, :member_roles, :roles, :issues, :journals, :enabled_modules
|
|
|
|
def setup
|
|
@controller = JournalsController.new
|
|
@request = ActionController::TestRequest.new
|
|
@response = ActionController::TestResponse.new
|
|
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_get_edit
|
|
@request.session[:user_id] = 1
|
|
xhr :get, :edit, :id => 2
|
|
assert_response :success
|
|
assert_select_rjs :insert, :after, 'journal-2-notes' do
|
|
assert_select 'form[id=journal-2-form]'
|
|
assert_select 'textarea'
|
|
end
|
|
end
|
|
|
|
def test_post_edit
|
|
@request.session[:user_id] = 1
|
|
xhr :post, :edit, :id => 2, :notes => 'Updated notes'
|
|
assert_response :success
|
|
assert_select_rjs :replace, 'journal-2-notes'
|
|
assert_equal 'Updated notes', Journal.find(2).notes
|
|
end
|
|
|
|
def test_post_edit_with_empty_notes
|
|
@request.session[:user_id] = 1
|
|
xhr :post, :edit, :id => 2, :notes => ''
|
|
assert_response :success
|
|
assert_select_rjs :remove, 'change-2'
|
|
assert_nil Journal.find_by_id(2)
|
|
end
|
|
end
|