Redirect from root to /Home, fixes gollum#250

github · May 10, 2012 · 43d2143 · 43d2143
1 parent a692ec1
commit 43d2143
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lib/gollum/frontend/app.rb b/lib/gollum/frontend/app.rb
@@ -39,7 +39,7 @@ class App < Sinatra::Base
     end
 
     get '/' do
-      show_page_or_file('Home')
+      redirect File.join(settings.wiki_options[:base_path].to_s, 'Home')
     end
 
     get '/edit/*' do

diff --git a/test/test_app.rb b/test/test_app.rb
@@ -167,6 +167,20 @@
     assert_equal page1.version.sha, page2.version.sha
   end
 
+  test "redirects from 'base_path' or 'base_path/' to 'base_path/Home'" do
+    Precious::App.set(:wiki_options, {})
+    get "/"
+    assert_match "http://example.org/Home", last_response.headers['Location']
+
+    Precious::App.set(:wiki_options, { :base_path => '/wiki' })
+    get "/"
+    assert_match "http://example.org/wiki/Home", last_response.headers['Location']
+
+    Precious::App.set(:wiki_options, { :base_path => '/wiki/' })
+    get "/"
+    assert_match "http://example.org/wiki/Home", last_response.headers['Location']
+  end
+
   def app
     Precious::App
   end