Set scheme when using ENV to enable SSL (#155)

* Set scheme if `nil` when using ENV to enable SSL
* Replace should syntax with expect syntax in Rack::Test::Session spec

Thanks to @neilang and @rafaelgonzalez for doing this. (@perlun was merely the person rebasing their work into master)

lib/rack/test.rb

@@ -242,6 +242,7 @@ def env_for(path, env)
       def process_request(uri, env)
         uri = URI.parse(uri)
         uri.host ||= @default_host
+        uri.scheme ||= "https" if env["HTTPS"] == "on"
 
         @rack_mock_session.request(uri, env)
 

spec/rack/test/cookie_spec.rb

@@ -138,6 +138,16 @@
       expect(rack_mock_session.cookie_jar['secure-cookie']).to eq('set')
     end
 
+    it "supports secure cookies when enabling SSL via env" do
+      get "//example.com/cookies/set-secure", { "value" => "set" }, "HTTPS" => "on"
+      get "//example.com/cookies/show", nil, "HTTPS" => "off"
+      check expect(last_request.cookies).to eq({})
+
+      get "//example.com/cookies/show", nil, "HTTPS" => "on"
+      expect(last_request.cookies).to eq({ "secure-cookie" => "set" })
+      expect(rack_mock_session.cookie_jar['secure-cookie']).to eq('set')
+    end
+
     it "keeps separate cookie jars for different domains" do
       get "http://example.com/cookies/set", "value" => "example"
       get "http://example.com/cookies/show"