test/web_test.rb in vault-tools-0.3.1 vs test/web_test.rb in vault-tools-0.3.2

@@ -12,68 +12,72 @@
   def setup
     super
     reload_web!
   end
 
-  # middleware is attached at load time, so we have to
-  # delete the web class and reload it to simulate being
-  # loaded with a given ENV
+  # Middleware is attached at load time, so we have to delete the Vault::Web
+  # class and reload it to simulate being loaded with different environment
+  # variables.
   def reload_web!
     # remove the constant to force a clean reload
     Vault.send(:remove_const, 'Web')
     load 'lib/vault-tools/web.rb'
   end
 
-  # A successful request causes a `web-20` log entry to be written.
+  # An `http_200` and an `http_2xx` log metric is written for successful
+  # requests.
   def test_head_status_check
     head '/'
-    assert_match(/measure=true/, Scrolls.stream.string)
-    assert_match(/at=web-20/, Scrolls.stream.string)
+    assert_match(/measure=http_200/, Scrolls.stream.string)
+    assert_match(/measure=http_2xx/, Scrolls.stream.string)
     assert_equal(200, last_response.status)
   end
 
-  # A successful request causes `web-20` log entry to be written and `OK`
-  # content is returned in the response body.
+  # A GET /health request logs success metrics and returns 'OK' in the
+  # response body.
   def test_get_health_check
     get '/health'
-    assert_match(/measure=true/, Scrolls.stream.string)
-    assert_match(/at=web-20/, Scrolls.stream.string)
+    assert_match(/measure=http_200/, Scrolls.stream.string)
+    assert_match(/measure=http_2xx/, Scrolls.stream.string)
     assert_equal(200, last_response.status)
     assert_equal('OK', last_response.body)
   end
 
-  # A validation error causes a `web-40` log entry to be written.
+  # An `http_404` and an `http_4xx` log metric is written when a path doesn't
+  # match a known resource.
   def test_head_with_unknown_endpoint
     head '/unknown'
-    assert_match(/measure=true/, Scrolls.stream.string)
-    assert_match(/at=web-40/, Scrolls.stream.string)
+    assert_match(/measure=http_404/, Scrolls.stream.string)
+    assert_match(/measure=http_4xx/, Scrolls.stream.string)
     assert_equal(404, last_response.status)
   end
 
   # An internal server error causes a `web-50` log entry to be written.  A
   # traceback is also written to the response body to ease debugging.
   def test_error_logs_500
     get '/boom'
-    assert_match(/measure=true/, Scrolls.stream.string)
-    assert_match(/at=web-50/, Scrolls.stream.string)
+    assert_match(/measure=http_500/, Scrolls.stream.string)
+    assert_match(/measure=http_5xx/, Scrolls.stream.string)
     assert_match(/^RuntimeError: An expected error occurred.$/m,
                  last_response.body)
     assert_equal(500, last_response.status)
   end
 
-
   # SSL is enforced when we are in production mode
   def test_ssl_enforced_in_production_mode
     set_env 'RACK_ENV', 'production'
+    set_env 'VAULT_TOOLS_DISABLE_SSL', nil
     reload_web!
     get '/health'
     assert_equal(301, last_response.status)
     assert_match(/^https/, last_response.headers['Location'])
   end
 
+  # SSL isn't enforced when the VAULT_TOOLS_DISABLE_SSL environment variable
+  # has a true value.
   def test_ssl_can_be_disabled
     set_env 'RACK_ENV', 'production'
-    set_env 'VAULT_TOOLS_DISABLE_SSL', 'anything'
+    set_env 'VAULT_TOOLS_DISABLE_SSL', '1'
     reload_web!
     get '/health'
     assert_equal(200, last_response.status)
   end
 end