request: fixed npm-notice functionality

PR-URL: #119

Author: Benjamin Coe

lib/request.js

@@ -64,6 +64,13 @@ function regRequest (uri, params, cb_) {
   var self = this
   this.attempt(function (operation) {
     makeRequest.call(self, uri, params, function (er, parsed, raw, response) {
+      if (response) {
+        self.log.verbose('headers', response.headers)
+        if (response.headers['npm-notice']) {
+          self.log.warn('notice', response.headers['npm-notice'])
+        }
+      }
+
       if (!er || (er.message && er.message.match(/^SSL Error/))) {
         if (er) er.code = 'ESSL'
         return cb(er, parsed, raw, response)
@@ -79,12 +86,6 @@ function regRequest (uri, params, cb_) {
         self.log.info('retry', 'will retry, error on last attempt: ' + er)
         return undefined
       }
-      if (response) {
-        self.log.verbose('headers', response.headers)
-        if (response.headers['npm-notice']) {
-          self.log.warn('notice', response.headers['npm-notice'])
-        }
-      }
       cb.apply(null, arguments)
     })
   })

test/request.js

@@ -277,6 +277,40 @@ test('run request through its paces', function (t) {
   })
 })
 
+test('outputs notice if npm-notice header is set', function (t) {
+  var client = common.freshClient({
+    log: {
+      error: noop,
+      warn: function (prefix, msg) {
+        warnings.push(msg)
+      },
+      info: noop,
+      verbose: noop,
+      silly: noop,
+      http: noop,
+      pause: noop,
+      resume: noop
+    }
+  })
+  var message = 'notice me!'
+  var warnings = []
+
+  function noop () {}
+
+  server.expect('GET', '/npm-notice', function (req, res) {
+    req.pipe(concat(function () {
+      res.statusCode = 200
+      res.setHeader('npm-notice', message)
+      res.end()
+    }))
+  })
+
+  client.request(common.registry + '/npm-notice', {}, function (er) {
+    t.notEqual(warnings.indexOf(message), -1, 'notice not printed')
+    t.end()
+  })
+})
+
 test('cleanup', function (t) {
   server.close()
   t.end()