From 65dcfa6ec01f993aa1c234b15fa0f12e3596d687 Mon Sep 17 00:00:00 2001
From: Joe Skeen <joe.skeen@imail.org>
Date: Fri, 13 Nov 2015 09:31:08 -0700
Subject: [PATCH] Fix request-promise

---
 request-promise/request-promise-tests.ts | 15 +++++++++++++++
 request-promise/request-promise.d.ts     |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/request-promise/request-promise-tests.ts b/request-promise/request-promise-tests.ts
index 347cca818..8c7840ad4 100644
--- a/request-promise/request-promise-tests.ts
+++ b/request-promise/request-promise-tests.ts
@@ -20,6 +20,21 @@ rp(options)
 
 // --> Displays length of response from server after post
 
+//Defaults tests
+(() => {
+  const githubUrl = 'https://github.com';
+  const defaultJarRequest = rp.defaults({ jar: true });
+  defaultJarRequest.get(githubUrl).then(() => {});
+  //defaultJarRequest(); //this line doesn't compile (and shouldn't)
+  const defaultUrlRequest = rp.defaults({ url: githubUrl });
+  defaultUrlRequest().then(() => {});
+  defaultUrlRequest.get().then(() => {});
+  const defaultBodyRequest = defaultUrlRequest.defaults({body: '{}', json: true});
+  defaultBodyRequest.get().then(() => {});
+  defaultBodyRequest.post().then(() => {});
+  defaultBodyRequest.put().then(() => {});
+})();
+
 // Get full response after DELETE
 options = {
     method: 'DELETE',
diff --git a/request-promise/request-promise.d.ts b/request-promise/request-promise.d.ts
index 94e3d3152..d442e527f 100644
--- a/request-promise/request-promise.d.ts
+++ b/request-promise/request-promise.d.ts
@@ -19,12 +19,12 @@ declare module 'request-promise' {
         promise(): Promise<any>;
     }
     
-    interface RequestPromiseOptions extends request.OptionalOptions {
+    interface RequestPromiseOptions extends request.CoreOptions {
         simple?: boolean;
         transform?: (body: any, response: http.IncomingMessage) => any;
         resolveWithFullResponse?: boolean;
     }
     
-    var requestPromise: request.RequestAPI<RequestPromise, RequestPromiseOptions>;
+    var requestPromise: request.RequestAPI<RequestPromise, RequestPromiseOptions, request.RequiredUriUrl>;
 	export = requestPromise;
 }