Merge branch 'master' into master

developit · Apr 29, 2022 · e7595db · e7595db
2 parents 22018ac + a3b7a14
commit e7595db
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/mod.ts b/mod.ts
@@ -0,0 +1 @@
+export * from './src/index.js'
diff --git a/src/index.js b/src/index.js
@@ -172,7 +172,7 @@ function create(defaults) {
 			data = f(data, options.headers) || data;
 		});
 
-		if (data && typeof data === 'object' && typeof data.append !== 'function') {
+		if (data && typeof data === 'object' && typeof data.append !== 'function' && typeof data.text !== 'function') {
 			data = JSON.stringify(data);
 			customHeaders['content-type'] = 'application/json';
 		}
@@ -200,7 +200,7 @@ function create(defaults) {
 		const fetchFunc = options.fetch || fetch;
 
 		return fetchFunc(url, {
-			method: _method || options.method,
+			method: (_method || options.method || 'get').toUpperCase(),
 			body: data,
 			headers: deepMerge(options.headers, customHeaders, true),
 			credentials: options.withCredentials ? 'include' : 'same-origin'

diff --git a/test/index.test.js b/test/index.test.js
@@ -87,7 +87,7 @@ describe('redaxios', () => {
 				expect(window.fetch).toHaveBeenCalledWith(
 					'http://foo/bar',
 					jasmine.objectContaining({
-						method: 'get',
+						method: 'GET',
 						headers: {},
 						body: undefined
 					})
@@ -112,7 +112,7 @@ describe('redaxios', () => {
 				expect(window.fetch).toHaveBeenCalledWith(
 					'/foo/bar',
 					jasmine.objectContaining({
-						method: 'get',
+						method: 'GET',
 						headers: {},
 						body: undefined
 					})
@@ -203,7 +203,25 @@ describe('redaxios', () => {
 			expect(fetchMock).toHaveBeenCalledWith(
 				'/foo',
 				jasmine.objectContaining({
-					method: 'post',
+					method: 'POST',
+					headers: {
+						'content-type': 'application/json'
+					},
+					body: '{"hello":"world"}'
+				})
+			);
+			expect(res.status).toEqual(200);
+			expect(res.data).toEqual('yep');
+		});
+
+		it('should issue PATCH requests (with JSON body)', async () => {
+			const res = await axios.patch('/foo', {
+				hello: 'world'
+			});
+			expect(fetchMock).toHaveBeenCalledWith(
+				'/foo',
+				jasmine.objectContaining({
+					method: 'PATCH',
 					headers: {
 						'content-type': 'application/json'
 					},
@@ -235,7 +253,7 @@ describe('redaxios', () => {
 				expect(fetchMock).toHaveBeenCalledWith(
 					'/foo',
 					jasmine.objectContaining({
-						method: 'post',
+						method: 'POST',
 						headers: {
 							'content-type': 'multipart/form-data'
 						},