comparison test/functional/project_enumerations_controller_test.rb @ 933:d36724ef856a

Merge from branch "cannam_integration"
author Chris Cannam
date Wed, 11 Jul 2012 13:30:13 +0100
parents ec1c49528f36
children 4f746d8966dd fb9a13467253
comparison
equal deleted inserted replaced
927:9ee5fd0b9bd3 933:d36724ef856a
10 :enabled_modules, 10 :enabled_modules,
11 :workflows, 11 :workflows,
12 :custom_fields, :custom_fields_projects, 12 :custom_fields, :custom_fields_projects,
13 :custom_fields_trackers, :custom_values, 13 :custom_fields_trackers, :custom_values,
14 :time_entries 14 :time_entries
15
16 self.use_transactional_fixtures = false
15 17
16 def setup 18 def setup
17 @request.session[:user_id] = nil 19 @request.session[:user_id] = nil
18 Setting.default_language = 'en' 20 Setting.default_language = 'en'
19 end 21 end