Update sinatra and sintra-contrib.

Add rackup gem.

gollum.gemspec

@@ -24,8 +24,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'gollum-lib', '~> 6.0'
   s.add_dependency 'kramdown', '~> 2.3'
   s.add_dependency 'kramdown-parser-gfm', '~> 1.1.0'
-  s.add_dependency 'sinatra', '~> 3.0'
-  s.add_dependency 'sinatra-contrib', '~> 3.0'
+  s.add_dependency 'rackup', '~> 2.1'
+  s.add_dependency 'sinatra', '~> 4.0'
+  s.add_dependency 'sinatra-contrib', '~> 4.0'
   s.add_dependency 'mustache-sinatra', '~> 2.0'
   s.add_dependency 'useragent', '~> 0.16.2'
   s.add_dependency 'gemojione', '~> 4.1'

test/test_allow_editing.rb

@@ -23,7 +23,7 @@
       message: 'def',
       page: 'D'
 
-    assert_equal last_response.status, 302
+    assert_equal last_response.status, 303
 
     refute_nil @wiki.page('D')
   end

test/test_app.rb

@@ -475,7 +475,7 @@
 
     post "/gollum/upload_file", :file => Rack::Test::UploadedFile.new(::File.open(temp_upload_file))
 
-    assert_equal 302, last_response.status # redirect is expected
+    assert_equal 303, last_response.status # redirect is expected
     @wiki.clear_cache
     file = @wiki.file("uploads/#{::File.basename(temp_upload_file.path)}")
     assert_equal 'abc', file.raw_data
@@ -488,7 +488,7 @@
     Precious::App.set(:wiki_options, {allow_uploads: true, per_page_uploads: true})
     post "/gollum/upload_file", {:file => Rack::Test::UploadedFile.new(::File.open(temp_upload_file))}, {'HTTP_REFERER' => 'http://localhost:4567/Home.md', 'HTTP_HOST' => 'localhost:4567'}
 
-    assert_equal 302, last_response.status # redirect is expected
+    assert_equal 303, last_response.status # redirect is expected
     @wiki.clear_cache
     # Find the file in a page-specific subdir (here: Home), based on referer
     file = @wiki.file("uploads/Home/#{::File.basename(temp_upload_file.path)}")
@@ -502,7 +502,7 @@
     Precious::App.set(:wiki_options, {allow_uploads: true, per_page_uploads: true})
     post "/gollum/upload_file", {:file => Rack::Test::UploadedFile.new(::File.open(temp_upload_file))}, {'HTTP_REFERER' => 'http://localhost:4567/Home.md', 'HTTP_HOST' => 'localhost:4567'}
 
-    assert_equal 302, last_response.status # redirect is expected
+    assert_equal 303, last_response.status # redirect is expected
     @wiki.clear_cache
     # Find the file in a page-specific subdir (here: Home), based on referer
     file = @wiki.file("uploads/Home/#{::File.basename(temp_upload_file.path)}")
@@ -516,7 +516,7 @@
     Precious::App.set(:wiki_options, {allow_uploads: true, per_page_uploads: true})
     post "/gollum/upload_file", {:file => Rack::Test::UploadedFile.new(::File.open(temp_upload_file))}, {'HTTP_REFERER' => 'http://localhost:4567/gollum/edit/foo/Bar.md', 'HTTP_HOST' => 'localhost:4567'}
 
-    assert_equal 302, last_response.status # redirect is expected
+    assert_equal 303, last_response.status # redirect is expected
     @wiki.clear_cache
     # Find the file in a page-specific subdir (here: foo/Bar), based on referer
     file = @wiki.file("uploads/foo/Bar/#{::File.basename(temp_upload_file.path)}")
@@ -530,7 +530,7 @@
     Precious::App.set(:wiki_options, {allow_uploads: true, per_page_uploads: true})
     post "/gollum/upload_file", {:file => Rack::Test::UploadedFile.new(::File.open(temp_upload_file))}, {'HTTP_REFERER' => 'https://localhost:4567/Home.md', 'HTTP_HOST' => 'localhost:4567'}
 
-    assert_equal 302, last_response.status # redirect is expected
+    assert_equal 303, last_response.status # redirect is expected
     @wiki.clear_cache
     # Find the file in a page-specific subdir (here: Home), based on referer
     file = @wiki.file("uploads/Home/#{::File.basename(temp_upload_file.path)}")
@@ -543,7 +543,7 @@
     temp_upload_file.close
     Precious::App.set(:wiki_options, {allow_uploads: true})
     post "/gollum/upload_file", :file => Rack::Test::UploadedFile.new(::File.open(temp_upload_file))
-    assert_equal 302, last_response.status
+    assert_equal 303, last_response.status
     # Post the same file a second time; should result in conflict
     post "/gollum/upload_file", :file => Rack::Test::UploadedFile.new(::File.open(temp_upload_file))
     assert_equal 409, last_response.status
@@ -1085,7 +1085,7 @@ def app
     Precious::App.set(:wiki_options, {allow_uploads: true, per_page_uploads: true})
     post "/wiki/gollum/upload_file", {:file => Rack::Test::UploadedFile.new(::File.open(temp_upload_file))}, {'HTTP_REFERER' => 'http://localhost:4567/wiki/gollum/edit/foo/Bar.md', 'HTTP_HOST' => 'localhost:4567'}
 
-    assert_equal 302, last_response.status # redirect is expected
+    assert_equal 303, last_response.status # redirect is expected
     @wiki.clear_cache
     # Find the file in a page-specific subdir (here: foo/Bar), based on referer
     file = @wiki.file("uploads/foo/Bar/#{::File.basename(temp_upload_file.path)}")