History

Fix default docs behavior when all docs are disabled

Fixes #424.

Thibaut Courouble committed 10 years ago

Commit 13bd8a01 parent 66f170c2 files · +7 −1Browse files

Unified · Split

2 files
  1. lib/app.rb +1 −1
  2. test/app_test.rb +6 −0
lib/app.rb+1−1
@@ -119,7 +119,7 @@ class App < Sinatra::Application · 118 unmodified lines
119 @docs ||= begin119 @docs ||= begin
120 cookie = cookies[:docs]120 cookie = cookies[:docs]
121 121
122 if cookie.nil? || cookie.empty?122 if cookie.nil?
123 settings.default_docs123 settings.default_docs
124 else124 else
125 cookie.split('/')125 cookie.split('/')
test/app_test.rb+6−0
@@ -132,6 +132,12 @@ class AppTest < MiniTest::Spec · 131 unmodified lines
132 assert last_response.ok?132 assert last_response.ok?
133 end133 end
134 134
135 it "renders when the doc exists, is a default doc, and all docs are enabled" do
136 set_cookie('docs=')
137 get '/css/', {}, 'HTTP_USER_AGENT' => MODERN_BROWSER
138 assert last_response.ok?
139 end
140
135 it "redirects via JS cookie when the doc exists and is enabled" do141 it "redirects via JS cookie when the doc exists and is enabled" do
136 set_cookie('docs=html~5')142 set_cookie('docs=html~5')
137 get '/html~5/', {}, 'HTTP_USER_AGENT' => MODERN_BROWSER143 get '/html~5/', {}, 'HTTP_USER_AGENT' => MODERN_BROWSER