               [method examples] methods
               [example expected] examples
               :let [mockreq (mock/request method path)
-                    request (assoc-in mockreq accept-header example)]]
-        (test-munged-request request
-          (fn [munged-request] ; ring middleware
-            (let [actual (get-in munged-request accept-header)
-                  msg (str/join " "
-                        ["data:" path method example "=>" expected])]
-              (is (= expected actual) msg))))))
-    (testing (str "Content-Type: application/octet-stream "
-               "is added to file_bucket_file put requests")
-      (let [request (mock/request :put "/production/file_bucket_file/foo")]
-        (test-munged-request request
-          (fn [munged-request] ; ring middleware
-            (let [actual (get-in munged-request content-type-request-header)]
-              (is (= "application/octet-stream" actual)))))))))
+                    request (assoc-in mockreq accept-header example)
+                    subject (get-in (munged-request request) accept-header)]]
+        (is (= expected subject))))))
+
+(deftest test-v3-file-bucket-file-put
+  (testing (str "file_bucket_file put requests have application/octet-stream")
+    (let [request (mock/request :put "/production/file_bucket_file/foo")
+          munged-req (munged-request request)
+          content-type (get-in munged-req [:headers "content-type"])]
+      (is (= "application/octet-stream" content-type)))))

    "pson, s, raw, foo" "pson, binary, foo"
    "s, pson, foo" "binary, pson, foo"))

;
(def accept-header-test-data
  "Nested map of request data.  The map keys represent URI paths, the request
  method, the example input, and the expected output.

            [puppetlabs.services.legacy-routes.legacy-routes-core :refer :all]
            [puppetlabs.services.master.master-core :as master-core]
            [ring.mock.request :as mock]
            [ring.util.codec :as ring-codec]))

(use-fixtures :once schema-test/validate-schemas)

