##// END OF EJS Templates
Merged r5021 from trunk....
Jean-Philippe Lang -
r4902:465534a2989d
parent child
Show More
@@ -23,6 +23,7 class JournalsController < ApplicationController
23 accept_key_auth :index
23 accept_key_auth :index
24
24
25 helper :issues
25 helper :issues
26 helper :custom_fields
26 helper :queries
27 helper :queries
27 include QueriesHelper
28 include QueriesHelper
28 helper :sort
29 helper :sort
@@ -20,3 +20,10 journal_details_003:
20 value: "6"
20 value: "6"
21 prop_key: fixed_version_id
21 prop_key: fixed_version_id
22 journal_id: 4
22 journal_id: 4
23 journal_details_005:
24 old_value: Old value
25 property: cf
26 id: 5
27 value: New value
28 prop_key: 2
29 journal_id: 3
@@ -22,7 +22,8 require 'journals_controller'
22 class JournalsController; def rescue_action(e) raise e end; end
22 class JournalsController; def rescue_action(e) raise e end; end
23
23
24 class JournalsControllerTest < ActionController::TestCase
24 class JournalsControllerTest < ActionController::TestCase
25 fixtures :projects, :users, :members, :member_roles, :roles, :issues, :journals, :journal_details, :enabled_modules
25 fixtures :projects, :users, :members, :member_roles, :roles, :issues, :journals, :journal_details, :enabled_modules,
26 :trackers, :issue_statuses, :enumerations, :custom_fields, :custom_values, :custom_fields_projects
26
27
27 def setup
28 def setup
28 @controller = JournalsController.new
29 @controller = JournalsController.new
General Comments 0
You need to be logged in to leave comments. Login now