Reorganise tests to match modern rails test layout
authorTom Hughes <tom@compton.nu>
Wed, 26 Feb 2014 00:13:19 +0000 (00:13 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 26 Feb 2014 00:13:19 +0000 (00:13 +0000)
74 files changed:
lib/tasks/testing.rake [new file with mode: 0644]
test/controllers/amf_controller_test.rb [moved from test/functional/amf_controller_test.rb with 99% similarity]
test/controllers/api_controller_test.rb [moved from test/functional/api_controller_test.rb with 99% similarity]
test/controllers/browse_controller_test.rb [moved from test/functional/browse_controller_test.rb with 99% similarity]
test/controllers/changeset_controller_test.rb [moved from test/functional/changeset_controller_test.rb with 99% similarity]
test/controllers/diary_entry_controller_test.rb [moved from test/functional/diary_entry_controller_test.rb with 99% similarity]
test/controllers/export_controller_test.rb [moved from test/functional/export_controller_test.rb with 96% similarity]
test/controllers/geocoder_controller_test.rb [moved from test/functional/geocoder_controller_test.rb with 99% similarity]
test/controllers/message_controller_test.rb [moved from test/functional/message_controller_test.rb with 99% similarity]
test/controllers/node_controller_test.rb [moved from test/functional/node_controller_test.rb with 99% similarity]
test/controllers/notes_controller_test.rb [moved from test/functional/notes_controller_test.rb with 99% similarity]
test/controllers/oauth_clients_controller_test.rb [moved from test/functional/oauth_clients_controller_test.rb with 99% similarity]
test/controllers/oauth_controller_test.rb [moved from test/functional/oauth_controller_test.rb with 96% similarity]
test/controllers/old_node_controller_test.rb [moved from test/functional/old_node_controller_test.rb with 99% similarity]
test/controllers/old_relation_controller_test.rb [moved from test/functional/old_relation_controller_test.rb with 99% similarity]
test/controllers/old_way_controller_test.rb [moved from test/functional/old_way_controller_test.rb with 99% similarity]
test/controllers/redactions_controller_test.rb [moved from test/functional/redactions_controller_test.rb with 98% similarity]
test/controllers/relation_controller_test.rb [moved from test/functional/relation_controller_test.rb with 99% similarity]
test/controllers/search_controller_test.rb [moved from test/functional/search_controller_test.rb with 93% similarity]
test/controllers/site_controller_test.rb [moved from test/functional/site_controller_test.rb with 99% similarity]
test/controllers/swf_controller_test.rb [moved from test/functional/swf_controller_test.rb with 84% similarity]
test/controllers/trace_controller_test.rb [moved from test/functional/trace_controller_test.rb with 99% similarity]
test/controllers/user_blocks_controller_test.rb [moved from test/functional/user_blocks_controller_test.rb with 99% similarity]
test/controllers/user_controller_test.rb [moved from test/functional/user_controller_test.rb with 99% similarity]
test/controllers/user_preference_controller_test.rb [moved from test/functional/user_preference_controller_test.rb with 99% similarity]
test/controllers/user_roles_controller_test.rb [moved from test/functional/user_roles_controller_test.rb with 99% similarity]
test/controllers/way_controller_test.rb [moved from test/functional/way_controller_test.rb with 99% similarity]
test/integration/client_application_test.rb
test/integration/cors_test.rb
test/integration/oauth_test.rb
test/integration/redirect_test.rb
test/integration/short_links_test.rb
test/integration/user_blocks_test.rb
test/integration/user_creation_test.rb
test/integration/user_diaries_test.rb
test/integration/user_login_test.rb
test/integration/user_roles_test.rb
test/integration/user_terms_seen_test.rb
test/lib/bounding_box_test.rb [moved from test/unit/bounding_box_test.rb with 99% similarity]
test/lib/i18n_test.rb [moved from test/unit/i18n_test.rb with 97% similarity]
test/lib/password_hash_test.rb [moved from test/unit/password_hash_test.rb with 96% similarity]
test/lib/rich_text_test.rb [moved from test/unit/rich_text_test.rb with 98% similarity]
test/lib/short_link_test.rb [moved from test/unit/short_link_test.rb with 96% similarity]
test/models/acl_test.rb [moved from test/unit/acl_test.rb with 70% similarity]
test/models/changeset_tag_test.rb [moved from test/unit/changeset_tag_test.rb with 96% similarity]
test/models/changeset_test.rb [moved from test/unit/changeset_test.rb with 98% similarity]
test/models/diary_comment_test.rb [moved from test/unit/diary_comment_test.rb with 77% similarity]
test/models/diary_entry_test.rb [moved from test/unit/diary_entry_test.rb with 97% similarity]
test/models/friend_test.rb [moved from test/unit/friend_test.rb with 74% similarity]
test/models/language_test.rb [moved from test/unit/language_test.rb with 69% similarity]
test/models/message_test.rb [moved from test/unit/message_test.rb with 99% similarity]
test/models/node_tag_test.rb [moved from test/unit/node_tag_test.rb with 97% similarity]
test/models/node_test.rb [moved from test/unit/node_test.rb with 99% similarity]
test/models/oauth_nonce_test.rb [moved from test/unit/oauth_nonce_test.rb with 91% similarity]
test/models/oauth_token_test.rb [moved from test/unit/oauth_token_test.rb with 94% similarity]
test/models/old_node_tag_test.rb [moved from test/unit/old_node_tag_test.rb with 97% similarity]
test/models/old_node_test.rb [moved from test/unit/old_node_test.rb with 98% similarity]
test/models/old_relation_tag_test.rb [moved from test/unit/old_relation_tag_test.rb with 97% similarity]
test/models/old_relation_test.rb [moved from test/unit/old_relation_test.rb with 98% similarity]
test/models/old_way_tag_test.rb [moved from test/unit/old_way_tag_test.rb with 96% similarity]
test/models/old_way_test.rb [moved from test/unit/old_way_test.rb with 98% similarity]
test/models/redaction_test.rb [moved from test/unit/redaction_test.rb with 95% similarity]
test/models/relation_member_test.rb [moved from test/unit/relation_member_test.rb with 75% similarity]
test/models/relation_tag_test.rb [moved from test/unit/relation_tag_test.rb with 98% similarity]
test/models/relation_test.rb [moved from test/unit/relation_test.rb with 99% similarity]
test/models/trace_test.rb [moved from test/unit/trace_test.rb with 98% similarity]
test/models/tracepoint_test.rb [moved from test/unit/tracepoint_test.rb with 73% similarity]
test/models/tracetag_test.rb [moved from test/unit/tracetag_test.rb with 94% similarity]
test/models/user_preference_test.rb [moved from test/unit/user_preference_test.rb with 96% similarity]
test/models/user_test.rb [moved from test/unit/user_test.rb with 99% similarity]
test/models/user_token_test.rb [moved from test/unit/user_token_test.rb with 76% similarity]
test/models/way_node_test.rb [moved from test/unit/way_node_test.rb with 72% similarity]
test/models/way_tag_test.rb [moved from test/unit/way_tag_test.rb with 96% similarity]
test/models/way_test.rb [moved from test/unit/way_test.rb with 99% similarity]

diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake
new file mode 100644 (file)
index 0000000..7a915c2
--- /dev/null
@@ -0,0 +1,5 @@
+namespace :test do
+  Rails::TestTask.new(lib: "test:prepare") do |t|    
+    t.pattern = 'test/lib/**/*_test.rb'
+  end
+end
similarity index 99%
rename from test/functional/amf_controller_test.rb
rename to test/controllers/amf_controller_test.rb
index f3a4e7c..36b76c3 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'stringio'
 include Potlatch
 
similarity index 99%
rename from test/functional/api_controller_test.rb
rename to test/controllers/api_controller_test.rb
index c92e113..6426184 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'api_controller'
 
 class ApiControllerTest < ActionController::TestCase
similarity index 99%
rename from test/functional/browse_controller_test.rb
rename to test/controllers/browse_controller_test.rb
index 82a0392..2ab9106 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'browse_controller'
 
 class BrowseControllerTest < ActionController::TestCase
similarity index 99%
rename from test/functional/changeset_controller_test.rb
rename to test/controllers/changeset_controller_test.rb
index ef5e154..25bb936 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'changeset_controller'
 
 class ChangesetControllerTest < ActionController::TestCase
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class DiaryEntryControllerTest < ActionController::TestCase
   fixtures :users, :diary_entries, :diary_comments, :languages
similarity index 96%
rename from test/functional/export_controller_test.rb
rename to test/controllers/export_controller_test.rb
index d36f0cf..8d61b99 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ExportControllerTest < ActionController::TestCase
 
similarity index 99%
rename from test/functional/geocoder_controller_test.rb
rename to test/controllers/geocoder_controller_test.rb
index 607e929..94cf7cf 100644 (file)
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'geocoder_controller'
 
 class GeocoderControllerTest < ActionController::TestCase
similarity index 99%
rename from test/functional/message_controller_test.rb
rename to test/controllers/message_controller_test.rb
index 66ca8bc..44271f5 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class MessageControllerTest < ActionController::TestCase
   fixtures :users, :messages
similarity index 99%
rename from test/functional/node_controller_test.rb
rename to test/controllers/node_controller_test.rb
index 5c01cba..3d689bb 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class NodeControllerTest < ActionController::TestCase
   api_fixtures
similarity index 99%
rename from test/functional/notes_controller_test.rb
rename to test/controllers/notes_controller_test.rb
index 374c879..6f21251 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class NotesControllerTest < ActionController::TestCase
   fixtures :users, :notes, :note_comments
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OauthClientsControllerTest < ActionController::TestCase
   fixtures :users, :client_applications
similarity index 96%
rename from test/functional/oauth_controller_test.rb
rename to test/controllers/oauth_controller_test.rb
index 8535889..879e259 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OauthControllerTest < ActionController::TestCase
   ##
similarity index 99%
rename from test/functional/old_node_controller_test.rb
rename to test/controllers/old_node_controller_test.rb
index ac318f8..5b04363 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'old_node_controller'
 
 class OldNodeControllerTest < ActionController::TestCase
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'old_relation_controller'
 
 class OldRelationControllerTest < ActionController::TestCase
similarity index 99%
rename from test/functional/old_way_controller_test.rb
rename to test/controllers/old_way_controller_test.rb
index 2e9ec82..40315ca 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'old_way_controller'
 
 class OldWayControllerTest < ActionController::TestCase
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'redactions_controller'
 
 class RedactionsControllerTest < ActionController::TestCase
similarity index 99%
rename from test/functional/relation_controller_test.rb
rename to test/controllers/relation_controller_test.rb
index 4737fdf..66d6012 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'relation_controller'
 
 class RelationControllerTest < ActionController::TestCase
similarity index 93%
rename from test/functional/search_controller_test.rb
rename to test/controllers/search_controller_test.rb
index 7fd060d..c753047 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class SearchControllerTest < ActionController::TestCase
   ##
similarity index 99%
rename from test/functional/site_controller_test.rb
rename to test/controllers/site_controller_test.rb
index 9aff8e5..86a9249 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class SiteControllerTest < ActionController::TestCase
   api_fixtures
similarity index 84%
rename from test/functional/swf_controller_test.rb
rename to test/controllers/swf_controller_test.rb
index 09b8f3a..d721313 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class SwfControllerTest < ActionController::TestCase
   ##
similarity index 99%
rename from test/functional/trace_controller_test.rb
rename to test/controllers/trace_controller_test.rb
index 1a07408..01c81a1 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class TraceControllerTest < ActionController::TestCase
   fixtures :users, :gpx_files
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserBlocksControllerTest < ActionController::TestCase
   fixtures :users, :user_roles, :user_blocks
similarity index 99%
rename from test/functional/user_controller_test.rb
rename to test/controllers/user_controller_test.rb
index 3a9c932..c068ee4 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserControllerTest < ActionController::TestCase
   fixtures :users
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserPreferenceControllerTest < ActionController::TestCase
   fixtures :users, :user_preferences
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserRolesControllerTest < ActionController::TestCase
   fixtures :users, :user_roles
similarity index 99%
rename from test/functional/way_controller_test.rb
rename to test/controllers/way_controller_test.rb
index 332f92d..6e2ee3b 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'way_controller'
 
 class WayControllerTest < ActionController::TestCase
index f40a966..a2361d6 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ClientApplicationTest < ActionDispatch::IntegrationTest
   fixtures :users, :client_applications
index fa4821b..f3581f6 100644 (file)
@@ -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
index fbb947a..dd03fde 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OAuthTest < ActionDispatch::IntegrationTest
   fixtures :users, :client_applications, :gpx_files
index 357c202..a4ff2eb 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class RedirectTest  < ActionDispatch::IntegrationTest
   def test_legacy_redirects
index aec204e..b36082c 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ShortLinksTest < ActionDispatch::IntegrationTest
   ##
index 94ec46e..db81117 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserBlocksTest < ActionDispatch::IntegrationTest
   fixtures :users, :user_blocks, :user_roles
index 6530b7c..503160e 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserCreationTest < ActionDispatch::IntegrationTest
   fixtures :users
index 278a68e..58e70bf 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserDiariesTest < ActionDispatch::IntegrationTest
   fixtures :users, :diary_entries
index 6d8e3e7..66f8f4b 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserLoginTest < ActionDispatch::IntegrationTest
   fixtures :users
index 3d2fab4..08031b4 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserRolesTest < ActionDispatch::IntegrationTest
   fixtures :users, :user_roles
index 7063e39..1bed53b 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserTermsSeenTest < ActionDispatch::IntegrationTest
   fixtures :users
similarity index 99%
rename from test/unit/bounding_box_test.rb
rename to test/lib/bounding_box_test.rb
index 1a1059d..a5e4a39 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class BoundingBoxTest < ActiveSupport::TestCase
   def setup
similarity index 97%
rename from test/unit/i18n_test.rb
rename to test/lib/i18n_test.rb
index 19b9afc..ea67e08 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class I18nTest < ActiveSupport::TestCase
   I18n.available_locales.each do |locale|
similarity index 96%
rename from test/unit/password_hash_test.rb
rename to test/lib/password_hash_test.rb
index 825942a..bf253c0 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class PasswordHashTest < ActiveSupport::TestCase
   def test_md5_without_salt
similarity index 98%
rename from test/unit/rich_text_test.rb
rename to test/lib/rich_text_test.rb
index c43dd0e..e99d594 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class RichTextTest < ActiveSupport::TestCase
   include ActionDispatch::Assertions::SelectorAssertions
similarity index 96%
rename from test/unit/short_link_test.rb
rename to test/lib/short_link_test.rb
index cdc6b3c..7aa21f3 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ShortLinkTest < ActiveSupport::TestCase
   ##
similarity index 70%
rename from test/unit/acl_test.rb
rename to test/models/acl_test.rb
index 991e6eb..9d84319 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class AclTest < ActiveSupport::TestCase
   # Replace this with your real tests.
similarity index 96%
rename from test/unit/changeset_tag_test.rb
rename to test/models/changeset_tag_test.rb
index cff75a5..1564361 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ChangesetTagTest < ActiveSupport::TestCase
   api_fixtures
similarity index 98%
rename from test/unit/changeset_test.rb
rename to test/models/changeset_test.rb
index 9533cd5..b6e5ba4 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ChangesetTest < ActiveSupport::TestCase
   api_fixtures
similarity index 77%
rename from test/unit/diary_comment_test.rb
rename to test/models/diary_comment_test.rb
index e6d7a71..e96c122 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class DiaryCommentTest < ActiveSupport::TestCase
   api_fixtures
similarity index 97%
rename from test/unit/diary_entry_test.rb
rename to test/models/diary_entry_test.rb
index 0801aa2..e8667bc 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class DiaryEntryTest < ActiveSupport::TestCase
   api_fixtures
similarity index 74%
rename from test/unit/friend_test.rb
rename to test/models/friend_test.rb
index 6416e38..c9f671e 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class FriendTest < ActiveSupport::TestCase
   api_fixtures
similarity index 69%
rename from test/unit/language_test.rb
rename to test/models/language_test.rb
index a171c1e..a9d6f5d 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class LanguageTest < ActiveSupport::TestCase
   test "language count" do
similarity index 99%
rename from test/unit/message_test.rb
rename to test/models/message_test.rb
index 3da91de..079e10c 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class MessageTest < ActiveSupport::TestCase
   api_fixtures
similarity index 97%
rename from test/unit/node_tag_test.rb
rename to test/models/node_tag_test.rb
index 2f26317..61a6189 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class NodeTagTest < ActiveSupport::TestCase
   api_fixtures
similarity index 99%
rename from test/unit/node_test.rb
rename to test/models/node_test.rb
index 2b28b3e..5137cd9 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class NodeTest < ActiveSupport::TestCase
   api_fixtures
similarity index 91%
rename from test/unit/oauth_nonce_test.rb
rename to test/models/oauth_nonce_test.rb
index def869a..ffbad0a 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OauthNonceTest < ActiveSupport::TestCase
   api_fixtures
similarity index 94%
rename from test/unit/oauth_token_test.rb
rename to test/models/oauth_token_test.rb
index 9ec005c..da2e449 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OauthTokenTest < ActiveSupport::TestCase
   api_fixtures
similarity index 97%
rename from test/unit/old_node_tag_test.rb
rename to test/models/old_node_tag_test.rb
index af7a186..4984ea0 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OldNodeTagTest < ActiveSupport::TestCase
   api_fixtures
similarity index 98%
rename from test/unit/old_node_test.rb
rename to test/models/old_node_test.rb
index fdd61f0..698e8cd 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OldNodeTest < ActiveSupport::TestCase
   api_fixtures
similarity index 97%
rename from test/unit/old_relation_tag_test.rb
rename to test/models/old_relation_tag_test.rb
index faff45d..ec4987e 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OldRelationTagTest < ActiveSupport::TestCase
   api_fixtures
similarity index 98%
rename from test/unit/old_relation_test.rb
rename to test/models/old_relation_test.rb
index 31ff831..14fe8a7 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OldRelationTest < ActiveSupport::TestCase
   api_fixtures
similarity index 96%
rename from test/unit/old_way_tag_test.rb
rename to test/models/old_way_tag_test.rb
index dbc0019..07bdfbc 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OldWayTagTest < ActiveSupport::TestCase
   api_fixtures
similarity index 98%
rename from test/unit/old_way_test.rb
rename to test/models/old_way_test.rb
index 44975d1..c002ebe 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OldWayTest < ActiveSupport::TestCase
   api_fixtures
similarity index 95%
rename from test/unit/redaction_test.rb
rename to test/models/redaction_test.rb
index c19570f..61b64f2 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'osm'
 
 class RedactionTest < ActiveSupport::TestCase
similarity index 75%
rename from test/unit/relation_member_test.rb
rename to test/models/relation_member_test.rb
index 2b1fe11..82eaa7e 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class RelationMemberTest < ActiveSupport::TestCase
   api_fixtures
similarity index 98%
rename from test/unit/relation_tag_test.rb
rename to test/models/relation_tag_test.rb
index 0833c57..0b5bedb 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class RelationTagTest < ActiveSupport::TestCase
   api_fixtures
similarity index 99%
rename from test/unit/relation_test.rb
rename to test/models/relation_test.rb
index 4caa6ce..7141f54 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class RelationTest < ActiveSupport::TestCase
   api_fixtures
similarity index 98%
rename from test/unit/trace_test.rb
rename to test/models/trace_test.rb
index d2720e9..9ec40f1 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class TraceTest < ActiveSupport::TestCase
   api_fixtures
similarity index 73%
rename from test/unit/tracepoint_test.rb
rename to test/models/tracepoint_test.rb
index c49f9fb..74a0d22 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class TracepointTest < ActiveSupport::TestCase
   api_fixtures
similarity index 94%
rename from test/unit/tracetag_test.rb
rename to test/models/tracetag_test.rb
index 4730710..74a1d49 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class TracetagTest < ActiveSupport::TestCase
   api_fixtures
similarity index 96%
rename from test/unit/user_preference_test.rb
rename to test/models/user_preference_test.rb
index d95989a..4d485b2 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserPreferenceTest < ActiveSupport::TestCase
   api_fixtures
similarity index 99%
rename from test/unit/user_test.rb
rename to test/models/user_test.rb
index 1a39309..7f24469 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserTest < ActiveSupport::TestCase
   api_fixtures
similarity index 76%
rename from test/unit/user_token_test.rb
rename to test/models/user_token_test.rb
index 1fe2634..7be5a2c 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class UserTokenTest < ActiveSupport::TestCase
   api_fixtures
similarity index 72%
rename from test/unit/way_node_test.rb
rename to test/models/way_node_test.rb
index 9d6a3b7..174fe0b 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class WayNodeTest < ActiveSupport::TestCase
   api_fixtures
similarity index 96%
rename from test/unit/way_tag_test.rb
rename to test/models/way_tag_test.rb
index 9766e9c..4d61161 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class WayTagTest < ActiveSupport::TestCase
   api_fixtures
similarity index 99%
rename from test/unit/way_test.rb
rename to test/models/way_test.rb
index 6b9237d..eb5baef 100644 (file)
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class WayTest < ActiveSupport::TestCase
   api_fixtures