From: Shaun McDonald <shaun@shaunmcdonald.me.uk>
Date: Sun, 7 Jun 2009 21:45:33 +0000 (+0000)
Subject: Make some links more rails like, thus easier to read. Test that partials are included... 
X-Git-Tag: live~7143
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/32b422aefb5a25644afa7edef50777732cf5b20f

Make some links more rails like, thus easier to read. Test that partials are included as expected.
---

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 105244611..3a80c33a6 100644
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -85,8 +85,8 @@
         </p>
         <p>
         <%= t 'layouts.intro_3', 
-              :ucl => '<a href="http://www.vr.ucl.ac.uk">' + t('layouts.intro_3_ucl') + '</a>', 
-              :bytemark => '<a href="http://www.bytemark.co.uk">' + t('layouts.intro_3_bytemark') + '</a>' %>
+              :ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"), 
+              :bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.uk") %>
         </p>
       </div>
       <% end %>
diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index de1de19f4..da90caf57 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -24,9 +24,9 @@
   <table width="100%">
     <tr>
       <td align="center"><%=
-        I18n.t('site.index.license.notice',
-          :license_name => ('<a href="' + t('site.index.license.license_url') + '">' + t('site.index.license.license_name') + '</a>'),
-          :project_name => ('<a href="' + t('site.index.license.project_url') + '">' + t('site.index.license.project_name') + '</a>'))
+        t'site.index.license.notice',
+          :license_name => link_to(t('site.index.license.license_name'), t('site.index.license.license_url')),
+          :project_name => link_to(t('site.index.license.project_name'), t('site.index.license.project_url'))
         %></td>
     </tr>
   </table>
diff --git a/test/functional/site_controller_test.rb b/test/functional/site_controller_test.rb
index 63f88f350..c388870ad 100644
--- a/test/functional/site_controller_test.rb
+++ b/test/functional/site_controller_test.rb
@@ -8,15 +8,14 @@ class SiteControllerTest < ActionController::TestCase
     get :index
     assert_response :success
     assert_template 'index'
-    # Seems that we need to wait for Rails 2.3 for this one
-    # assert_template :partial => '_search', :count => 1
+    assert_site_partials
   end
   
   # Get the edit page
   def test_edit
     get :edit
     # Should be redirected
-    assert_response :redirect
+    assert_redirected_to :controller => :user, :action => 'login', :referer => "/edit"
   end
   
   # Get the export page
@@ -24,6 +23,7 @@ class SiteControllerTest < ActionController::TestCase
     get :export
     assert_response :success
     assert_template 'index'
+    assert_site_partials
   end
   
   # Offline page
@@ -31,5 +31,12 @@ class SiteControllerTest < ActionController::TestCase
     get :offline
     assert_response :success
     assert_template 'offline'
+    assert_site_partials 0
+  end
+  
+  def assert_site_partials(count = 1)
+    assert_template :partial => '_search', :count => count
+    assert_template :partial => '_key', :count => count
+    assert_template :partial => '_sidebar', :count => count
   end
 end