Reorganise tests to match modern rails test layout

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

test/controllers/amf_controller_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'stringio'
 include Potlatch
 

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

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

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

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

test/controllers/export_controller_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ExportControllerTest < ActionController::TestCase
 

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

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

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

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

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

test/controllers/oauth_controller_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class OauthControllerTest < ActionController::TestCase
   ##

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

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

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

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

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

test/controllers/search_controller_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class SearchControllerTest < ActionController::TestCase
   ##

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

test/controllers/swf_controller_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class SwfControllerTest < ActionController::TestCase
   ##

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

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

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

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

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

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

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

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

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

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

test/integration/short_links_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ShortLinksTest < ActionDispatch::IntegrationTest
   ##

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

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

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

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

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

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

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

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|

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

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

test/lib/short_link_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ShortLinkTest < ActiveSupport::TestCase
   ##

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.

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

test/models/changeset_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ChangesetTest < ActiveSupport::TestCase
   api_fixtures

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

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

test/models/friend_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class FriendTest < ActiveSupport::TestCase
   api_fixtures

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

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

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

test/models/node_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class NodeTest < ActiveSupport::TestCase
   api_fixtures

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

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

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

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

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

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

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

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

test/models/redaction_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 require 'osm'
 
 class RedactionTest < ActiveSupport::TestCase

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

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

test/models/relation_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class RelationTest < ActiveSupport::TestCase
   api_fixtures

test/models/trace_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class TraceTest < ActiveSupport::TestCase
   api_fixtures

test/models/tracepoint_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class TracepointTest < ActiveSupport::TestCase
   api_fixtures

test/models/tracetag_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class TracetagTest < ActiveSupport::TestCase
   api_fixtures

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

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

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

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

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

test/models/way_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class WayTest < ActiveSupport::TestCase
   api_fixtures