From 4491452e653508ba0a736aa32c7a93970aa08e26 Mon Sep 17 00:00:00 2001
From: Andy Vaughn <andyv@mindtouch.com>
Date: Sat, 27 Apr 2019 17:31:27 -0700
Subject: [PATCH] mock http headers without clearing out content type headers

---
 src/Mock/MockRequestMatcher.php               | 12 ++++
 .../withAddedHeaders_Test.php                 | 58 +++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 tests/Mock/MockRequestMatcher/withAddedHeaders_Test.php

diff --git a/src/Mock/MockRequestMatcher.php b/src/Mock/MockRequestMatcher.php
index f6ecadb..84b4bae 100644
--- a/src/Mock/MockRequestMatcher.php
+++ b/src/Mock/MockRequestMatcher.php
@@ -149,6 +149,18 @@ public function withHeaders(IHeaders $headers) : MockRequestMatcher {
         return $request;
     }
 
+    /**
+     * Return an instance with the specified HTTP headers added to existing mocked HTTP headers.
+     *
+     * @param IHeaders $headers
+     * @return MockRequestMatcher
+     */
+    public function withAddedHeaders(IHeaders $headers) : MockRequestMatcher {
+        $request = clone $this;
+        $request->headers->addHeaders($headers);
+        return $request;
+    }
+
     /**
      * Return an instance with the specified body string
      *
diff --git a/tests/Mock/MockRequestMatcher/withAddedHeaders_Test.php b/tests/Mock/MockRequestMatcher/withAddedHeaders_Test.php
new file mode 100644
index 0000000..6e53a9f
--- /dev/null
+++ b/tests/Mock/MockRequestMatcher/withAddedHeaders_Test.php
@@ -0,0 +1,58 @@
+<?php declare(strict_types=1);
+/**
+ * MindTouch HTTP
+ * Copyright (C) 2006-2018 MindTouch, Inc.
+ * www.mindtouch.com  oss@mindtouch.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+namespace MindTouch\Http\tests\Mock\MockRequestMatcher;
+
+use MindTouch\Http\Content\ContentType;
+use MindTouch\Http\Content\UrlEncodedFormDataContent;
+use MindTouch\Http\Headers;
+use MindTouch\Http\HttpPlug;
+use MindTouch\Http\Mock\MockRequestMatcher;
+use MindTouch\Http\tests\MindTouchHttpUnitTestCase;
+use MindTouch\Http\XUri;
+
+class withAddedHeaders_Test extends MindTouchHttpUnitTestCase  {
+
+    /**
+     * @test
+     */
+    public function Can_add_headers() {
+
+        // arrange
+        $matcher = (new MockRequestMatcher(HttpPlug::METHOD_POST, XUri::tryParse('http://example.com/bazz')))
+            ->withHeaders(Headers::newFromHeaderNameValuePairs([
+                ['X-Qux', 'foo']
+            ]))
+            ->withContent(new UrlEncodedFormDataContent([
+                'baz' => 'qux'
+            ]))
+            ->withAddedHeaders(Headers::newFromHeaderNameValuePairs([
+                ['X-Fred', 'plugh']
+            ]));
+
+        // act
+        $result = $matcher->getHeaders();
+
+        // assert
+        $this->assertEquals([
+            'X-Qux: foo',
+            'Content-Type: ' . ContentType::FORM_URLENCODED,
+            'X-Fred: plugh'
+        ], $result->toRawHeaders());
+    }
+}
\ No newline at end of file