Reorganise tests to match modern rails test layout

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

diff --git a/test/functional/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb
similarity index 99%
rename from test/functional/user_blocks_controller_test.rb
rename to test/controllers/user_blocks_controller_test.rb
index d52ff68c4d73b07ac7d49a37694249efc6cc1843..ffb5744ea25a510ef1f36fae293e826829b960b1 100644 (file)
--- a/test/functional/user_blocks_controller_test.rb
+++ b/test/controllers/user_blocks_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserBlocksControllerTest < ActionController::TestCase
   fixtures :users, :user_roles, :user_blocks