From: Tom Hughes <tom@compton.nu>
Date: Tue, 9 Jul 2013 16:20:45 +0000 (+0100)
Subject: Rename test to avoid class name conflict with unit test
X-Git-Tag: live~4922
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e8f1953d7de154fefbb781c9f8a9260be9661666

Rename test to avoid class name conflict with unit test
---

diff --git a/test/integration/short_link_test.rb b/test/integration/short_links_test.rb
similarity index 96%
rename from test/integration/short_link_test.rb
rename to test/integration/short_links_test.rb
index e99b290b9..ffa5d5394 100644
--- a/test/integration/short_link_test.rb
+++ b/test/integration/short_links_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class ShortLinkTest < ActionController::IntegrationTest
+class ShortLinksTest < ActionController::IntegrationTest
   ##
   # test the short link with various parameters and ensure they're
   # kept in the redirect.