From e8f1953d7de154fefbb781c9f8a9260be9661666 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 9 Jul 2013 17:20:45 +0100
Subject: [PATCH] Rename test to avoid class name conflict with unit test

---
 test/integration/{short_link_test.rb => short_links_test.rb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename test/integration/{short_link_test.rb => short_links_test.rb} (96%)

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.
-- 
2.45.1