Reorganise tests to match modern rails test layout

[rails.git] / test / controllers / user_preference_controller_test.rb

diff --git a/test/functional/user_preference_controller_test.rb b/test/controllers/user_preference_controller_test.rb
similarity index 99%
rename from test/functional/user_preference_controller_test.rb
rename to test/controllers/user_preference_controller_test.rb
index 32ece63cddb0d647e1d71a182b29bf3f2849bbf1..f8cafe6a9279a46ed3b7e942b951f3a480055cc5 100644 (file)
--- a/test/functional/user_preference_controller_test.rb
+++ b/test/controllers/user_preference_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserPreferenceControllerTest < ActionController::TestCase
   fixtures :users, :user_preferences