Merge 2eb6831 into 253c5e5

request · Oct 28, 2017 · b643655 · b643655
2 parents 253c5e5 + 2eb6831
commit b643655
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/request.js b/request.js
@@ -197,7 +197,7 @@ Request.prototype.init = function (options) {
 
   // If there's a baseUrl, then use it as the base URL (i.e. uri must be
   // specified as a relative path and is appended to baseUrl).
-  if (self.baseUrl) {
+  if (self.baseUrl && (self.uri || self.uri === '')) {
     if (typeof self.baseUrl !== 'string') {
       return self.emit('error', new Error('options.baseUrl must be a string'))
     }

diff --git a/tests/test-errors.js b/tests/test-errors.js
@@ -12,6 +12,13 @@ tape('without uri', function (t) {
   t.end()
 })
 
+tape('without uri but with baseUrl', function (t) {
+  t.throws(function () {
+    request({ baseUrl: 'https://github.com' })
+  }, /^Error: options\.uri is a required argument$/)
+  t.end()
+})
+
 tape('invalid uri 1', function (t) {
   t.throws(function () {
     request({