Reorganise tests to match modern rails test layout

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

diff --git a/test/functional/diary_entry_controller_test.rb b/test/controllers/diary_entry_controller_test.rb
similarity index 99%
rename from test/functional/diary_entry_controller_test.rb
rename to test/controllers/diary_entry_controller_test.rb
index 92d9bcffdaae41b47ef2e0db50278016d61df76c..ad3d6787b1aea7581ffbbf1cf5f48fe0979f58c8 100644 (file)
--- a/test/functional/diary_entry_controller_test.rb
+++ b/test/controllers/diary_entry_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class DiaryEntryControllerTest < ActionController::TestCase
   fixtures :users, :diary_entries, :diary_comments, :languages