Merge branch 'master' of github.com:sebbacon/alaveteli into asktheeu

Conflicts:
	locale/cy/app.po
	locale/de/app.po
	locale/es/app.po
	locale/fr/app.po
	locale/sq/app.po
	locale/sr/app.po
	locale/sr@latin/app.po

1 files changed, 7 insertions, 1 deletions

diff --git a/spec/controllers/admin_general_controller_spec.rb b/spec/controllers/admin_general_controller_spec.rb
index 4c3708268..820d1e7f3 100644
--- a/spec/controllers/admin_general_controller_spec.rb
+++ b/spec/controllers/admin_general_controller_spec.rb
@@ -5,8 +5,14 @@ describe AdminGeneralController, "when viewing front page of admin interface" do
     before { basic_auth_login @request }
   
     it "should render the front page" do
-        get :index
+        get :index, :suppress_redirect => 1
         response.should render_template('index')
     end
 
+    it "should redirect to include trailing slash" do
+        get :index
+        response.should redirect_to(:controller => 'admin_general',
+                                    :action => 'index')
+    end
+
 end