From a9fe2317cf2f97c4b8085aa107e08c01a1f486b5 Mon Sep 17 00:00:00 2001
From: raj356 <rajarshi356@gmail.com>
Date: Sat, 20 Jul 2024 23:20:49 +0530
Subject: [PATCH] Merged removeDefaultHeader and removeDefaultHeaders methods
 into one (#366)

* merged removeDefaultHeader and removeDefaultHeaders methods

* updating version of the pactum

* make key optional parameter

---------

Co-authored-by: Anudeep <asa.anudeep4@gmail.com>
---
 package-lock.json         |  4 ++--
 package.json              |  2 +-
 src/exports/request.d.ts  |  9 ++-------
 src/exports/request.js    | 15 ++++++---------
 test/unit/request.spec.js | 39 ++++++++++++++++++++++++++++++++-------
 5 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7bfe008..c948abe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "pactum",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "pactum",
-      "version": "3.7.0",
+      "version": "3.7.1",
       "license": "MIT",
       "dependencies": {
         "@exodus/schemasafe": "^1.3.0",
diff --git a/package.json b/package.json
index 03b010a..229d8a0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pactum",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "description": "REST API Testing Tool for all levels in a Test Pyramid",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
diff --git a/src/exports/request.d.ts b/src/exports/request.d.ts
index fb302c3..77ea7ed 100644
--- a/src/exports/request.d.ts
+++ b/src/exports/request.d.ts
@@ -26,14 +26,9 @@ export function setBaseUrl(url: string): void;
 export function setFollowRedirects(follow: boolean): void;
 
 /**
- * removes default header
+ * removes all or selective default headers
  */
-export function removeDefaultHeader(key: string): void;
-
-/**
- * removes all default headers
- */
-export function removeDefaultHeaders(): void;
+export function removeDefaultHeaders(key?: string): void;
 
 /**
  * records data that will be available in reports
diff --git a/src/exports/request.js b/src/exports/request.js
index bcf43ce..2368ce5 100644
--- a/src/exports/request.js
+++ b/src/exports/request.js
@@ -46,15 +46,12 @@ const request = {
     config.request.followRedirects = follow;
   },
 
-  removeDefaultHeader(key) {
-    if (!key) {
-      throw new PactumRequestError(`Invalid header key provided - ${key}`);
-    }
-    delete config.request.headers[key];
-  },
-
-  removeDefaultHeaders() {
-    config.request.headers = {};
+  removeDefaultHeaders(key) {
+    if(key) {
+      delete config.request.headers[key];
+    } else {
+      config.request.headers = {};
+    } 
   },
 
   setDefaultRecorders(name, path) {
diff --git a/test/unit/request.spec.js b/test/unit/request.spec.js
index 9df28c7..c96f939 100644
--- a/test/unit/request.spec.js
+++ b/test/unit/request.spec.js
@@ -21,12 +21,8 @@ describe('request', () => {
     expect(() => request.setDefaultHeaders()).throws('Invalid header key provided - undefined');
   });
 
-  it('removeDefaultHeader - undefined', () => {
-    expect(() => request.removeDefaultHeader()).throws('Invalid header key provided - undefined');
-  });
-
-  it('removeDefaultHeader - which is not present', () => {
-    request.removeDefaultHeader('present');
+  it('removeDefaultHeaders - which is not present', () => {
+    request.removeDefaultHeaders('present');
   });
 
   it('setDefaultHeader & setDefaultHeaders & remove', () => {
@@ -41,7 +37,7 @@ describe('request', () => {
       'no': 'space',
       'gta': 'v'
     });
-    request.removeDefaultHeader('no');
+    request.removeDefaultHeaders('no');
     expect(config.request.headers).deep.equals({
       'hello': 'space',
       'gta': 'v'
@@ -62,6 +58,35 @@ describe('request', () => {
     expect(() => request.setDefaultTimeout('100')).throws('Invalid timeout provided - 100');
   });
 
+  it('setting default headers and removing it', () => {
+    request.setDefaultHeaders({
+      'pactumjs': 'userfriendly',
+      'apitesting': 'pactumjs'
+    });
+    expect(config.request.headers).deep.equals({
+      'pactumjs': 'userfriendly',
+      'apitesting': 'pactumjs'
+    });
+    request.removeDefaultHeaders();
+    expect(config.request.headers).deep.equals({});
+  });
+
+  it('setting duplicate headers and removing it', () => {
+    request.setDefaultHeaders({
+      'pactumjs': 'lightweight',
+      'test': 'testing',
+      'test': 'tested'
+    });
+    expect(config.request.headers).deep.equals({
+      'pactumjs': 'lightweight',
+      'test': 'tested'
+    });
+    request.removeDefaultHeaders('test');
+    expect(config.request.headers).deep.equals({
+      'pactumjs': 'lightweight'
+    });
+  });
+  
   afterEach(() => {
    config.request.headers = {};
   });