Reorganise tests to match modern rails test layout

diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake
new file mode 100644 (file)
index 0000000..7a915c2
--- /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 f3a4e7cd1b642ea69da87723ea2010eae669761d..36b76c3293dcff76879339c8282516838e191954 100644 (file)
--- 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 c92e1132e3786760ea2278df679818229df4246c..6426184fcdb42e8269dbab8ab6cab8d449786793 100644 (file)
--- 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 82a0392425e70578f52cd70995c71c4e327d8cd1..2ab9106f1f9e018ab391226e84efd64100bd5add 100644 (file)
--- 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 ef5e1541a4125a7ad0cd784ef8f642921c74e3c6..25bb936d93975ed126f55d5bbb197d0c0868455b 100644 (file)
--- 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 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

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 d36f0cfd807e61fa5b78aaf7456213438652a36a..8d61b9911b54b514b3967c65b08cac2f1116699d 100644 (file)
--- 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 607e929c11e1d877609900038d5d336cc383d35e..94cf7cf46c9f1d5990ac2b7f6932cc19a6ddf813 100644 (file)
--- 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 66ca8bc7008f3a27ce28a9a06d885ab9e84b9009..44271f5ddb4b5c88881c4d0497d8643763944291 100644 (file)
--- 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 5c01cba3d08500edcf64e1a92e8915b74bc67761..3d689bb3f4f5f236f90b2a70ed2cd449b27bc664 100644 (file)
--- 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 374c879d696af6fba53d9830fb52a3cdacc7292d..6f212519326f77475bd4ea8b8a9605977733e14b 100644 (file)
--- 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 77f07b2880639ed1699fbf58ecf418d0f0d47e87..a1df9f0f2a7db0f8654ecf1aaa2f640d83f1179f 100644 (file)
--- 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 85358892e9d73d24f39af394ddf703bac51c4663..879e259c3869aeb2cefa298bac2fc10ce6cf9409 100644 (file)
--- 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 ac318f84bd7ba11ca19c73a5067d790823e948dd..5b0436348031c41dd99e493541fe548f78ddbefe 100644 (file)
--- 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 55e8a7377afc5f1060a64427bd7bad87d60140e3..1db613cd4733f384344c976f14953529ac53ebe5 100644 (file)
--- 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 2e9ec8263e3e2fa63592c1aab76596b28a499386..40315caa5be37eb7fb15f9329a55eb2add41ea73 100644 (file)
--- 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 83bb3adc21b8fa0f641f79a83f86cee7d9a5ce7e..44a76069468d3c423217b8128cf64fe85e2a91d5 100644 (file)
--- 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 4737fdf51f42d6286f7a4b8006ffa6e5deb9be9a..66d6012840a64bb7b4a648938e287e26c7b10611 100644 (file)
--- 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 7fd060dc4548c98c714dc46c63c581ccddd6d195..c7530477489fc0254d55c1fc34b6dd2133f37770 100644 (file)
--- 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 9aff8e572e3e4dee15a9d4daf753ba817fef214c..86a92490ac067fb5ee9ad10b43938c1088119f7a 100644 (file)
--- 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 09b8f3aae32634dac8eeec5f96464485eea6ecc1..d7213133b9a809bd9b78a5ec519ff69aa5b667b9 100644 (file)
--- 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 1a074082b848e7f167a6cdcd989684440686f394..01c81a1aa5cf45c6bb89a217a4f753dab158d627 100644 (file)
--- 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 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

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 3a9c93238c0c7cfa66895fcf8dcf070ea2db3000..c068ee408168b39e6d42b5b9447ab0ae713984f0 100644 (file)
--- 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 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

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 4e4bd6da72a3e9b523b507dfd48dfec1df34c339..1d005824d2ea840daa9615b9ff46b251cb46d438 100644 (file)
--- 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 332f92dc7898d3bc571fd1817fc4f4f8b8ed6df3..6e2ee3b0f2acf4d46e128aeba4c7c29105797220 100644 (file)
--- 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 f40a966757aec4a808bbb6a90e71aadaf578307e..a2361d618f88c02df824f90628512384aa1e04a2 100644 (file)
--- 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 fa4821b7a8eeb8bdc5516029923b20272b0eaccb..f3581f6a21b0b258fabb127ef65072b50f5e728a 100644 (file)
--- 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 fbb947af45199b977954df05628fdb63f11306a1..dd03fde46ec899210d9ef2f07b025055a1d3d7c5 100644 (file)
--- 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 357c20212fe542e852282ca5441dcfac737355ac..a4ff2eb7ec0cfa24c5dbfc0091ffc266b4a984a4 100644 (file)
--- 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 aec204e71f23f21e22eb8a971e000c3efa8e53ef..b36082caca91b64a5084f18bb957bac5f15ed0f6 100644 (file)
--- 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 94ec46e0a43f9d251da101f861ff7b6b334c081b..db81117c338d29816502a605259c4681d4ba0495 100644 (file)
--- 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 6530b7ccbb2ca52c8e3326f7d413874fdcf9e4bc..503160e9daa6c8095ebd9488d0fd4b2ab306e9d1 100644 (file)
--- 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 278a68e7b0f904120b18c7d6b7012ea8be4067b2..58e70bfd2c47af077fb40b7dd0a63457a3e0008c 100644 (file)
--- 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 6d8e3e7e0f948c04f179741a3550a00624a0d323..66f8f4b095442e38763bda954a3dc67572bbe543 100644 (file)
--- 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 3d2fab4d01a8ae677671e42491d6b426dafd2a2b..08031b4de52fcb0cd40ab6982f016bf72283ceb6 100644 (file)
--- 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 7063e39c56db797cc1856732dfbfdb8b22bbc45d..1bed53bce8aa13533d1792b185d0d060e17657aa 100644 (file)
--- 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 1a1059ddfa61a4d9f4e585cd7f1017501aa2ed3d..a5e4a39e0616fc085ea3ea409fd43e2387f01c5a 100644 (file)
--- 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 19b9afcfda5d09407a5eb500bcd1e310d13d6c8a..ea67e084eeab12223e3540468feccdac1b38145e 100644 (file)
--- 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 825942afaeb3d4b78dc91f4f10348ca3c48f9ede..bf253c0b8115ed1e496ff4eb31575a0a067ce777 100644 (file)
--- 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 c43dd0e9a2466a13b0d4329c3c594e63abc55611..e99d594a4e184a14f55e1b104bd73d8dd1da8464 100644 (file)
--- 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 cdc6b3cfd800bd17fec6691f9a52a8bc7407c555..7aa21f3636cb0a71b7f2cb9d8cfe24cd5e326225 100644 (file)
--- 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 991e6eb8465dda99339552a3fc836219b0fb09f3..9d843191206640bcd6a402e3b9119c32e4421019 100644 (file)
--- 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 cff75a5be9e137579fd0cefda2a0e87ffd9248df..1564361c470029df4863cc22914f77f8f83f1d94 100644 (file)
--- 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 9533cd55e0da9f1ea1f1743fbd08fa2c28552c88..b6e5ba46ad4bf2cb74bb90c79b7a9d6577ecb43f 100644 (file)
--- 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 e6d7a71b443e95f7fabc27a64263775bc0031f0f..e96c122300c99ad9a01114965f36e1067b88c744 100644 (file)
--- 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 0801aa299a9ca74f86ff0f9575a22caee5e14c5f..e8667bc74d5e7037e9e9bde5c73fde314ddd0cbf 100644 (file)
--- 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 6416e38c7db48e1035dc4e27049915e54feb2495..c9f671e7ec4c338d8f997b0678a2cdd03112aaa1 100644 (file)
--- 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 a171c1e2e1fae307edf7d1a53b561687b718e6a7..a9d6f5d6a22372eb3a2ade6c61c159622e878a13 100644 (file)
--- 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 3da91de38365df658a4aa1d243186afae7d62bdb..079e10c4289e441c04599195f9feb4439509f5d0 100644 (file)
--- 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 2f26317925066a267a69577f6ce7bb5553960602..61a61896ebe558856e57095f33a234e36f272fd6 100644 (file)
--- 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 2b28b3ee632c6975960005347dc69c255c2d2a14..5137cd9ef2695de57460a55415d546e4b64d08bd 100644 (file)
--- 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 def869a054bfcb89b3bdcb4604c516072d6a855f..ffbad0af6a4f2dd04c4d66ab849effdb9658c3b5 100644 (file)
--- 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 9ec005c966bbf86b46ce30b64ee83c86e13c844f..da2e449f15cc266b4d7a78963e068ca8c0c4527a 100644 (file)
--- 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 af7a186d8ca31a213fd5bdf9803eb42e38dc15ad..4984ea0cc2f59484aac65ebae0fa8532a7df044b 100644 (file)
--- 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 fdd61f0900ffaf815bf1dded171ff2e587a9edca..698e8cd7bfaacc94297404bdf9baf4256eca04e9 100644 (file)
--- 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 faff45dd004b93e4dbeeb9fc1c11c6efbbfbf086..ec4987ee0f79342bc9addd995d18027cb21aca94 100644 (file)
--- 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 31ff831971322d5015862e8d966cce0744a8487d..14fe8a72cc8a9d0660f259f1c9f787cb3140744d 100644 (file)
--- 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 dbc001980b3df30c7ca6bb91d66d5e722beaa783..07bdfbca87f4355828ceca94a0b9224ab323da3f 100644 (file)
--- 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 44975d1534063d4c08b37dc1b65dfa0c8595ae22..c002ebe39f00423663805944fe65be2d27532f64 100644 (file)
--- 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 c19570fc42b20f38d9096ac31131fa231279a63e..61b64f21109c28e4e2993e4ad75533b3de3aa050 100644 (file)
--- 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 2b1fe113f9d0644fcbcfe0446c43e2dd0a31d30d..82eaa7e58432a139031520cb2a7fe3de0079efc2 100644 (file)
--- 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 0833c572d1de0480ac519e2913a8e33770e6820a..0b5bedb05e88a77414c6f1adb2b45028d225583b 100644 (file)
--- 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 4caa6ce41c856a634eee83eff2caf5af52219a19..7141f54f0c62701ee1c52218195271dab725992e 100644 (file)
--- 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 d2720e993d900b1ac96783a6c639cc5261f291aa..9ec40f18f40e75c610b101cef01c0a4c5d48388d 100644 (file)
--- 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 c49f9fbdcacde2134247aab632e4c14e1ecb673c..74a0d22f9fa469228f92362e28974b65bfbe49ba 100644 (file)
--- 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 473071088be1efa13b062045d3c81362a938cd05..74a1d49aa59aaa57816074c1347d1372090dddb5 100644 (file)
--- 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 d95989a4f50092fce1caac78547d0feb3a1a2420..4d485b27625c3d72e9d3f712b4eb89460c4d0e2a 100644 (file)
--- 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 1a39309f1b60a798431b4c2e47dd64d938771f57..7f24469f625e66dcafc3131cd9b37e9d2a446db0 100644 (file)
--- 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 1fe2634541b89c70e6d09c52d364f06ee2baead1..7be5a2cf7dfceb7ea5b7afa393983f1c419cb3e4 100644 (file)
--- 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 9d6a3b75597a83425fbb319ac8af4cfbb44fda0c..174fe0bdd2da64494eb5990ba67d1bfbf6262331 100644 (file)
--- 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 9766e9c773acb9a777fd693a78f45be29ca0e114..4d6116159d49ccc3c908610cbdc47d23e9140f38 100644 (file)
--- 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 6b9237da765d60e770a7b1d6751279e1909ce80a..eb5baef10c32d0b623bb450543be535bd4725583 100644 (file)
--- 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