From: Tom Hughes <tom@compton.nu>
Date: Wed, 26 Feb 2014 00:13:19 +0000 (+0000)
Subject: Reorganise tests to match modern rails test layout
X-Git-Tag: live~4425^2~18
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/98184dfb9cacc74ac5bcb91a41a2d5804b3f4f7d

Reorganise tests to match modern rails test layout
---

diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake
new file mode 100644
index 000000000..7a915c228
--- /dev/null
+++ b/lib/tasks/testing.rake
@@ -0,0 +1,5 @@
+namespace :test do
+  Rails::TestTask.new(lib: "test:prepare") do |t|    
+    t.pattern = 'test/lib/**/*_test.rb'
+  end
+end
diff --git a/test/functional/amf_controller_test.rb b/test/controllers/amf_controller_test.rb
similarity index 99%
rename from test/functional/amf_controller_test.rb
rename to test/controllers/amf_controller_test.rb
index f3a4e7cd1..36b76c329 100644
--- a/test/functional/amf_controller_test.rb
+++ b/test/controllers/amf_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'stringio'
 include Potlatch
 
diff --git a/test/functional/api_controller_test.rb b/test/controllers/api_controller_test.rb
similarity index 99%
rename from test/functional/api_controller_test.rb
rename to test/controllers/api_controller_test.rb
index c92e1132e..6426184fc 100644
--- a/test/functional/api_controller_test.rb
+++ b/test/controllers/api_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'api_controller'
 
 class ApiControllerTest < ActionController::TestCase
diff --git a/test/functional/browse_controller_test.rb b/test/controllers/browse_controller_test.rb
similarity index 99%
rename from test/functional/browse_controller_test.rb
rename to test/controllers/browse_controller_test.rb
index 82a039242..2ab9106f1 100644
--- a/test/functional/browse_controller_test.rb
+++ b/test/controllers/browse_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'browse_controller'
 
 class BrowseControllerTest < ActionController::TestCase
diff --git a/test/functional/changeset_controller_test.rb b/test/controllers/changeset_controller_test.rb
similarity index 99%
rename from test/functional/changeset_controller_test.rb
rename to test/controllers/changeset_controller_test.rb
index ef5e1541a..25bb936d9 100644
--- a/test/functional/changeset_controller_test.rb
+++ b/test/controllers/changeset_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'changeset_controller'
 
 class ChangesetControllerTest < ActionController::TestCase
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 92d9bcffd..ad3d6787b 100644
--- 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
diff --git a/test/functional/export_controller_test.rb b/test/controllers/export_controller_test.rb
similarity index 96%
rename from test/functional/export_controller_test.rb
rename to test/controllers/export_controller_test.rb
index d36f0cfd8..8d61b9911 100644
--- a/test/functional/export_controller_test.rb
+++ b/test/controllers/export_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ExportControllerTest < ActionController::TestCase
 
diff --git a/test/functional/geocoder_controller_test.rb b/test/controllers/geocoder_controller_test.rb
similarity index 99%
rename from test/functional/geocoder_controller_test.rb
rename to test/controllers/geocoder_controller_test.rb
index 607e929c1..94cf7cf46 100644
--- a/test/functional/geocoder_controller_test.rb
+++ b/test/controllers/geocoder_controller_test.rb
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'geocoder_controller'
 
 class GeocoderControllerTest < ActionController::TestCase
diff --git a/test/functional/message_controller_test.rb b/test/controllers/message_controller_test.rb
similarity index 99%
rename from test/functional/message_controller_test.rb
rename to test/controllers/message_controller_test.rb
index 66ca8bc70..44271f5dd 100644
--- a/test/functional/message_controller_test.rb
+++ b/test/controllers/message_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class MessageControllerTest < ActionController::TestCase
   fixtures :users, :messages
diff --git a/test/functional/node_controller_test.rb b/test/controllers/node_controller_test.rb
similarity index 99%
rename from test/functional/node_controller_test.rb
rename to test/controllers/node_controller_test.rb
index 5c01cba3d..3d689bb3f 100644
--- a/test/functional/node_controller_test.rb
+++ b/test/controllers/node_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class NodeControllerTest < ActionController::TestCase
   api_fixtures
diff --git a/test/functional/notes_controller_test.rb b/test/controllers/notes_controller_test.rb
similarity index 99%
rename from test/functional/notes_controller_test.rb
rename to test/controllers/notes_controller_test.rb
index 374c879d6..6f2125193 100644
--- a/test/functional/notes_controller_test.rb
+++ b/test/controllers/notes_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class NotesControllerTest < ActionController::TestCase
   fixtures :users, :notes, :note_comments
diff --git a/test/functional/oauth_clients_controller_test.rb b/test/controllers/oauth_clients_controller_test.rb
similarity index 99%
rename from test/functional/oauth_clients_controller_test.rb
rename to test/controllers/oauth_clients_controller_test.rb
index 77f07b288..a1df9f0f2 100644
--- a/test/functional/oauth_clients_controller_test.rb
+++ b/test/controllers/oauth_clients_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OauthClientsControllerTest < ActionController::TestCase
   fixtures :users, :client_applications
diff --git a/test/functional/oauth_controller_test.rb b/test/controllers/oauth_controller_test.rb
similarity index 96%
rename from test/functional/oauth_controller_test.rb
rename to test/controllers/oauth_controller_test.rb
index 85358892e..879e259c3 100644
--- a/test/functional/oauth_controller_test.rb
+++ b/test/controllers/oauth_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OauthControllerTest < ActionController::TestCase
   ##
diff --git a/test/functional/old_node_controller_test.rb b/test/controllers/old_node_controller_test.rb
similarity index 99%
rename from test/functional/old_node_controller_test.rb
rename to test/controllers/old_node_controller_test.rb
index ac318f84b..5b0436348 100644
--- a/test/functional/old_node_controller_test.rb
+++ b/test/controllers/old_node_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'old_node_controller'
 
 class OldNodeControllerTest < ActionController::TestCase
diff --git a/test/functional/old_relation_controller_test.rb b/test/controllers/old_relation_controller_test.rb
similarity index 99%
rename from test/functional/old_relation_controller_test.rb
rename to test/controllers/old_relation_controller_test.rb
index 55e8a7377..1db613cd4 100644
--- a/test/functional/old_relation_controller_test.rb
+++ b/test/controllers/old_relation_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'old_relation_controller'
 
 class OldRelationControllerTest < ActionController::TestCase
diff --git a/test/functional/old_way_controller_test.rb b/test/controllers/old_way_controller_test.rb
similarity index 99%
rename from test/functional/old_way_controller_test.rb
rename to test/controllers/old_way_controller_test.rb
index 2e9ec8263..40315caa5 100644
--- a/test/functional/old_way_controller_test.rb
+++ b/test/controllers/old_way_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'old_way_controller'
 
 class OldWayControllerTest < ActionController::TestCase
diff --git a/test/functional/redactions_controller_test.rb b/test/controllers/redactions_controller_test.rb
similarity index 98%
rename from test/functional/redactions_controller_test.rb
rename to test/controllers/redactions_controller_test.rb
index 83bb3adc2..44a760694 100644
--- a/test/functional/redactions_controller_test.rb
+++ b/test/controllers/redactions_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'redactions_controller'
 
 class RedactionsControllerTest < ActionController::TestCase
diff --git a/test/functional/relation_controller_test.rb b/test/controllers/relation_controller_test.rb
similarity index 99%
rename from test/functional/relation_controller_test.rb
rename to test/controllers/relation_controller_test.rb
index 4737fdf51..66d601284 100644
--- a/test/functional/relation_controller_test.rb
+++ b/test/controllers/relation_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'relation_controller'
 
 class RelationControllerTest < ActionController::TestCase
diff --git a/test/functional/search_controller_test.rb b/test/controllers/search_controller_test.rb
similarity index 93%
rename from test/functional/search_controller_test.rb
rename to test/controllers/search_controller_test.rb
index 7fd060dc4..c75304774 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/controllers/search_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class SearchControllerTest < ActionController::TestCase
   ##
diff --git a/test/functional/site_controller_test.rb b/test/controllers/site_controller_test.rb
similarity index 99%
rename from test/functional/site_controller_test.rb
rename to test/controllers/site_controller_test.rb
index 9aff8e572..86a92490a 100644
--- a/test/functional/site_controller_test.rb
+++ b/test/controllers/site_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class SiteControllerTest < ActionController::TestCase
   api_fixtures
diff --git a/test/functional/swf_controller_test.rb b/test/controllers/swf_controller_test.rb
similarity index 84%
rename from test/functional/swf_controller_test.rb
rename to test/controllers/swf_controller_test.rb
index 09b8f3aae..d7213133b 100644
--- a/test/functional/swf_controller_test.rb
+++ b/test/controllers/swf_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class SwfControllerTest < ActionController::TestCase
   ##
diff --git a/test/functional/trace_controller_test.rb b/test/controllers/trace_controller_test.rb
similarity index 99%
rename from test/functional/trace_controller_test.rb
rename to test/controllers/trace_controller_test.rb
index 1a074082b..01c81a1aa 100644
--- a/test/functional/trace_controller_test.rb
+++ b/test/controllers/trace_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class TraceControllerTest < ActionController::TestCase
   fixtures :users, :gpx_files
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 d52ff68c4..ffb5744ea 100644
--- 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
diff --git a/test/functional/user_controller_test.rb b/test/controllers/user_controller_test.rb
similarity index 99%
rename from test/functional/user_controller_test.rb
rename to test/controllers/user_controller_test.rb
index 3a9c93238..c068ee408 100644
--- a/test/functional/user_controller_test.rb
+++ b/test/controllers/user_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserControllerTest < ActionController::TestCase
   fixtures :users
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 32ece63cd..f8cafe6a9 100644
--- 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
diff --git a/test/functional/user_roles_controller_test.rb b/test/controllers/user_roles_controller_test.rb
similarity index 99%
rename from test/functional/user_roles_controller_test.rb
rename to test/controllers/user_roles_controller_test.rb
index 4e4bd6da7..1d005824d 100644
--- a/test/functional/user_roles_controller_test.rb
+++ b/test/controllers/user_roles_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserRolesControllerTest < ActionController::TestCase
   fixtures :users, :user_roles
diff --git a/test/functional/way_controller_test.rb b/test/controllers/way_controller_test.rb
similarity index 99%
rename from test/functional/way_controller_test.rb
rename to test/controllers/way_controller_test.rb
index 332f92dc7..6e2ee3b0f 100644
--- a/test/functional/way_controller_test.rb
+++ b/test/controllers/way_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'way_controller'
 
 class WayControllerTest < ActionController::TestCase
diff --git a/test/integration/client_application_test.rb b/test/integration/client_application_test.rb
index f40a96675..a2361d618 100644
--- a/test/integration/client_application_test.rb
+++ b/test/integration/client_application_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ClientApplicationTest < ActionDispatch::IntegrationTest
   fixtures :users, :client_applications
diff --git a/test/integration/cors_test.rb b/test/integration/cors_test.rb
index fa4821b7a..f3581f6a2 100644
--- a/test/integration/cors_test.rb
+++ b/test/integration/cors_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class CORSTest < ActionDispatch::IntegrationTest
   # Rails 4 adds a built-in `options` method. When we upgrade, we can remove
diff --git a/test/integration/oauth_test.rb b/test/integration/oauth_test.rb
index fbb947af4..dd03fde46 100644
--- a/test/integration/oauth_test.rb
+++ b/test/integration/oauth_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OAuthTest < ActionDispatch::IntegrationTest
   fixtures :users, :client_applications, :gpx_files
diff --git a/test/integration/redirect_test.rb b/test/integration/redirect_test.rb
index 357c20212..a4ff2eb7e 100644
--- a/test/integration/redirect_test.rb
+++ b/test/integration/redirect_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class RedirectTest  < ActionDispatch::IntegrationTest
   def test_legacy_redirects
diff --git a/test/integration/short_links_test.rb b/test/integration/short_links_test.rb
index aec204e71..b36082cac 100644
--- a/test/integration/short_links_test.rb
+++ b/test/integration/short_links_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ShortLinksTest < ActionDispatch::IntegrationTest
   ##
diff --git a/test/integration/user_blocks_test.rb b/test/integration/user_blocks_test.rb
index 94ec46e0a..db81117c3 100644
--- a/test/integration/user_blocks_test.rb
+++ b/test/integration/user_blocks_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserBlocksTest < ActionDispatch::IntegrationTest
   fixtures :users, :user_blocks, :user_roles
diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index 6530b7ccb..503160e9d 100644
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserCreationTest < ActionDispatch::IntegrationTest
   fixtures :users
diff --git a/test/integration/user_diaries_test.rb b/test/integration/user_diaries_test.rb
index 278a68e7b..58e70bfd2 100644
--- a/test/integration/user_diaries_test.rb
+++ b/test/integration/user_diaries_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserDiariesTest < ActionDispatch::IntegrationTest
   fixtures :users, :diary_entries
diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb
index 6d8e3e7e0..66f8f4b09 100644
--- a/test/integration/user_login_test.rb
+++ b/test/integration/user_login_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserLoginTest < ActionDispatch::IntegrationTest
   fixtures :users
diff --git a/test/integration/user_roles_test.rb b/test/integration/user_roles_test.rb
index 3d2fab4d0..08031b4de 100644
--- a/test/integration/user_roles_test.rb
+++ b/test/integration/user_roles_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserRolesTest < ActionDispatch::IntegrationTest
   fixtures :users, :user_roles
diff --git a/test/integration/user_terms_seen_test.rb b/test/integration/user_terms_seen_test.rb
index 7063e39c5..1bed53bce 100644
--- a/test/integration/user_terms_seen_test.rb
+++ b/test/integration/user_terms_seen_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserTermsSeenTest < ActionDispatch::IntegrationTest
   fixtures :users
diff --git a/test/unit/bounding_box_test.rb b/test/lib/bounding_box_test.rb
similarity index 99%
rename from test/unit/bounding_box_test.rb
rename to test/lib/bounding_box_test.rb
index 1a1059ddf..a5e4a39e0 100644
--- a/test/unit/bounding_box_test.rb
+++ b/test/lib/bounding_box_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class BoundingBoxTest < ActiveSupport::TestCase
   def setup
diff --git a/test/unit/i18n_test.rb b/test/lib/i18n_test.rb
similarity index 97%
rename from test/unit/i18n_test.rb
rename to test/lib/i18n_test.rb
index 19b9afcfd..ea67e084e 100644
--- a/test/unit/i18n_test.rb
+++ b/test/lib/i18n_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class I18nTest < ActiveSupport::TestCase
   I18n.available_locales.each do |locale|
diff --git a/test/unit/password_hash_test.rb b/test/lib/password_hash_test.rb
similarity index 96%
rename from test/unit/password_hash_test.rb
rename to test/lib/password_hash_test.rb
index 825942afa..bf253c0b8 100644
--- a/test/unit/password_hash_test.rb
+++ b/test/lib/password_hash_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class PasswordHashTest < ActiveSupport::TestCase
   def test_md5_without_salt
diff --git a/test/unit/rich_text_test.rb b/test/lib/rich_text_test.rb
similarity index 98%
rename from test/unit/rich_text_test.rb
rename to test/lib/rich_text_test.rb
index c43dd0e9a..e99d594a4 100644
--- a/test/unit/rich_text_test.rb
+++ b/test/lib/rich_text_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class RichTextTest < ActiveSupport::TestCase
   include ActionDispatch::Assertions::SelectorAssertions
diff --git a/test/unit/short_link_test.rb b/test/lib/short_link_test.rb
similarity index 96%
rename from test/unit/short_link_test.rb
rename to test/lib/short_link_test.rb
index cdc6b3cfd..7aa21f363 100644
--- a/test/unit/short_link_test.rb
+++ b/test/lib/short_link_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ShortLinkTest < ActiveSupport::TestCase
   ##
diff --git a/test/unit/acl_test.rb b/test/models/acl_test.rb
similarity index 70%
rename from test/unit/acl_test.rb
rename to test/models/acl_test.rb
index 991e6eb84..9d8431912 100644
--- a/test/unit/acl_test.rb
+++ b/test/models/acl_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class AclTest < ActiveSupport::TestCase
   # Replace this with your real tests.
diff --git a/test/unit/changeset_tag_test.rb b/test/models/changeset_tag_test.rb
similarity index 96%
rename from test/unit/changeset_tag_test.rb
rename to test/models/changeset_tag_test.rb
index cff75a5be..1564361c4 100644
--- a/test/unit/changeset_tag_test.rb
+++ b/test/models/changeset_tag_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ChangesetTagTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/changeset_test.rb b/test/models/changeset_test.rb
similarity index 98%
rename from test/unit/changeset_test.rb
rename to test/models/changeset_test.rb
index 9533cd55e..b6e5ba46a 100644
--- a/test/unit/changeset_test.rb
+++ b/test/models/changeset_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ChangesetTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/diary_comment_test.rb b/test/models/diary_comment_test.rb
similarity index 77%
rename from test/unit/diary_comment_test.rb
rename to test/models/diary_comment_test.rb
index e6d7a71b4..e96c12230 100644
--- a/test/unit/diary_comment_test.rb
+++ b/test/models/diary_comment_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class DiaryCommentTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/diary_entry_test.rb b/test/models/diary_entry_test.rb
similarity index 97%
rename from test/unit/diary_entry_test.rb
rename to test/models/diary_entry_test.rb
index 0801aa299..e8667bc74 100644
--- a/test/unit/diary_entry_test.rb
+++ b/test/models/diary_entry_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class DiaryEntryTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/friend_test.rb b/test/models/friend_test.rb
similarity index 74%
rename from test/unit/friend_test.rb
rename to test/models/friend_test.rb
index 6416e38c7..c9f671e7e 100644
--- a/test/unit/friend_test.rb
+++ b/test/models/friend_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class FriendTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/language_test.rb b/test/models/language_test.rb
similarity index 69%
rename from test/unit/language_test.rb
rename to test/models/language_test.rb
index a171c1e2e..a9d6f5d6a 100644
--- a/test/unit/language_test.rb
+++ b/test/models/language_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class LanguageTest < ActiveSupport::TestCase
   test "language count" do
diff --git a/test/unit/message_test.rb b/test/models/message_test.rb
similarity index 99%
rename from test/unit/message_test.rb
rename to test/models/message_test.rb
index 3da91de38..079e10c42 100644
--- a/test/unit/message_test.rb
+++ b/test/models/message_test.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class MessageTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/node_tag_test.rb b/test/models/node_tag_test.rb
similarity index 97%
rename from test/unit/node_tag_test.rb
rename to test/models/node_tag_test.rb
index 2f2631792..61a61896e 100644
--- a/test/unit/node_tag_test.rb
+++ b/test/models/node_tag_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class NodeTagTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/node_test.rb b/test/models/node_test.rb
similarity index 99%
rename from test/unit/node_test.rb
rename to test/models/node_test.rb
index 2b28b3ee6..5137cd9ef 100644
--- a/test/unit/node_test.rb
+++ b/test/models/node_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class NodeTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/oauth_nonce_test.rb b/test/models/oauth_nonce_test.rb
similarity index 91%
rename from test/unit/oauth_nonce_test.rb
rename to test/models/oauth_nonce_test.rb
index def869a05..ffbad0af6 100644
--- a/test/unit/oauth_nonce_test.rb
+++ b/test/models/oauth_nonce_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OauthNonceTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/oauth_token_test.rb b/test/models/oauth_token_test.rb
similarity index 94%
rename from test/unit/oauth_token_test.rb
rename to test/models/oauth_token_test.rb
index 9ec005c96..da2e449f1 100644
--- a/test/unit/oauth_token_test.rb
+++ b/test/models/oauth_token_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OauthTokenTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/old_node_tag_test.rb b/test/models/old_node_tag_test.rb
similarity index 97%
rename from test/unit/old_node_tag_test.rb
rename to test/models/old_node_tag_test.rb
index af7a186d8..4984ea0cc 100644
--- a/test/unit/old_node_tag_test.rb
+++ b/test/models/old_node_tag_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OldNodeTagTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/old_node_test.rb b/test/models/old_node_test.rb
similarity index 98%
rename from test/unit/old_node_test.rb
rename to test/models/old_node_test.rb
index fdd61f090..698e8cd7b 100644
--- a/test/unit/old_node_test.rb
+++ b/test/models/old_node_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OldNodeTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/old_relation_tag_test.rb b/test/models/old_relation_tag_test.rb
similarity index 97%
rename from test/unit/old_relation_tag_test.rb
rename to test/models/old_relation_tag_test.rb
index faff45dd0..ec4987ee0 100644
--- a/test/unit/old_relation_tag_test.rb
+++ b/test/models/old_relation_tag_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OldRelationTagTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/old_relation_test.rb b/test/models/old_relation_test.rb
similarity index 98%
rename from test/unit/old_relation_test.rb
rename to test/models/old_relation_test.rb
index 31ff83197..14fe8a72c 100644
--- a/test/unit/old_relation_test.rb
+++ b/test/models/old_relation_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OldRelationTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/old_way_tag_test.rb b/test/models/old_way_tag_test.rb
similarity index 96%
rename from test/unit/old_way_tag_test.rb
rename to test/models/old_way_tag_test.rb
index dbc001980..07bdfbca8 100644
--- a/test/unit/old_way_tag_test.rb
+++ b/test/models/old_way_tag_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OldWayTagTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/old_way_test.rb b/test/models/old_way_test.rb
similarity index 98%
rename from test/unit/old_way_test.rb
rename to test/models/old_way_test.rb
index 44975d153..c002ebe39 100644
--- a/test/unit/old_way_test.rb
+++ b/test/models/old_way_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OldWayTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/redaction_test.rb b/test/models/redaction_test.rb
similarity index 95%
rename from test/unit/redaction_test.rb
rename to test/models/redaction_test.rb
index c19570fc4..61b64f211 100644
--- a/test/unit/redaction_test.rb
+++ b/test/models/redaction_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'osm'
 
 class RedactionTest < ActiveSupport::TestCase
diff --git a/test/unit/relation_member_test.rb b/test/models/relation_member_test.rb
similarity index 75%
rename from test/unit/relation_member_test.rb
rename to test/models/relation_member_test.rb
index 2b1fe113f..82eaa7e58 100644
--- a/test/unit/relation_member_test.rb
+++ b/test/models/relation_member_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class RelationMemberTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/relation_tag_test.rb b/test/models/relation_tag_test.rb
similarity index 98%
rename from test/unit/relation_tag_test.rb
rename to test/models/relation_tag_test.rb
index 0833c572d..0b5bedb05 100644
--- a/test/unit/relation_tag_test.rb
+++ b/test/models/relation_tag_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class RelationTagTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/relation_test.rb b/test/models/relation_test.rb
similarity index 99%
rename from test/unit/relation_test.rb
rename to test/models/relation_test.rb
index 4caa6ce41..7141f54f0 100644
--- a/test/unit/relation_test.rb
+++ b/test/models/relation_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class RelationTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/trace_test.rb b/test/models/trace_test.rb
similarity index 98%
rename from test/unit/trace_test.rb
rename to test/models/trace_test.rb
index d2720e993..9ec40f18f 100644
--- a/test/unit/trace_test.rb
+++ b/test/models/trace_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class TraceTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/tracepoint_test.rb b/test/models/tracepoint_test.rb
similarity index 73%
rename from test/unit/tracepoint_test.rb
rename to test/models/tracepoint_test.rb
index c49f9fbdc..74a0d22f9 100644
--- a/test/unit/tracepoint_test.rb
+++ b/test/models/tracepoint_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class TracepointTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/tracetag_test.rb b/test/models/tracetag_test.rb
similarity index 94%
rename from test/unit/tracetag_test.rb
rename to test/models/tracetag_test.rb
index 473071088..74a1d49aa 100644
--- a/test/unit/tracetag_test.rb
+++ b/test/models/tracetag_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class TracetagTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/user_preference_test.rb b/test/models/user_preference_test.rb
similarity index 96%
rename from test/unit/user_preference_test.rb
rename to test/models/user_preference_test.rb
index d95989a4f..4d485b276 100644
--- a/test/unit/user_preference_test.rb
+++ b/test/models/user_preference_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserPreferenceTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/user_test.rb b/test/models/user_test.rb
similarity index 99%
rename from test/unit/user_test.rb
rename to test/models/user_test.rb
index 1a39309f1..7f24469f6 100644
--- a/test/unit/user_test.rb
+++ b/test/models/user_test.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/user_token_test.rb b/test/models/user_token_test.rb
similarity index 76%
rename from test/unit/user_token_test.rb
rename to test/models/user_token_test.rb
index 1fe263454..7be5a2cf7 100644
--- a/test/unit/user_token_test.rb
+++ b/test/models/user_token_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserTokenTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/way_node_test.rb b/test/models/way_node_test.rb
similarity index 72%
rename from test/unit/way_node_test.rb
rename to test/models/way_node_test.rb
index 9d6a3b755..174fe0bdd 100644
--- a/test/unit/way_node_test.rb
+++ b/test/models/way_node_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class WayNodeTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/way_tag_test.rb b/test/models/way_tag_test.rb
similarity index 96%
rename from test/unit/way_tag_test.rb
rename to test/models/way_tag_test.rb
index 9766e9c77..4d6116159 100644
--- a/test/unit/way_tag_test.rb
+++ b/test/models/way_tag_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class WayTagTest < ActiveSupport::TestCase
   api_fixtures
diff --git a/test/unit/way_test.rb b/test/models/way_test.rb
similarity index 99%
rename from test/unit/way_test.rb
rename to test/models/way_test.rb
index 6b9237da7..eb5baef10 100644
--- a/test/unit/way_test.rb
+++ b/test/models/way_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class WayTest < ActiveSupport::TestCase
   api_fixtures