From 762cc04b70842d128813bf8cf2e9c9ef1f47ccef Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Fri, 27 May 2011 10:16:47 -0700 Subject: [PATCH] Port 784bbccf's custom value test back into aaj --- test/fixtures/journals.yml | 8 ++++++-- test/functional/journals_controller_test.rb | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/test/fixtures/journals.yml b/test/fixtures/journals.yml index b26c2984..d738c027 100644 --- a/test/fixtures/journals.yml +++ b/test/fixtures/journals.yml @@ -35,7 +35,11 @@ journals_003: user_id: 2 notes: "A comment with inline image: !picture.jpg!" journaled_id: 2 - changes: "--- {}" + changes: | + --- + custom_values_2: + - 'Old value' + - 'New value' journals_004: id: 4 type: "IssueJournal" @@ -214,4 +218,4 @@ journals_018: user_id: 2 notes: journaled_id: 11 - changes: "--- {}" \ No newline at end of file + changes: "--- {}" diff --git a/test/functional/journals_controller_test.rb b/test/functional/journals_controller_test.rb index ac3bf88a..e40947a8 100644 --- a/test/functional/journals_controller_test.rb +++ b/test/functional/journals_controller_test.rb @@ -22,7 +22,8 @@ require 'journals_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 + 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 @controller = JournalsController.new