Commit b4bceaeb authored by analog-nico's avatar analog-nico
Browse files

Fixed applying the default options in rp.default() calls

parent ea89889a

lib/rp.js

+1 −2
Original line number Diff line number Diff line
@@ -86,8 +86,7 @@ Object.keys(request).filter(function(key){ 
rp.request = request;



rp.defaults =  function (options, requester) {

    options.simple = options.simple || defaultOptions.simple;

    options.resolveWithFullResponse = options.resolveWithFullResponse || defaultOptions.resolveWithFullResponse;

    _.defaults(options, defaultOptions);



    var def = function (method) {

        var d = function (uri, opts, callback) {

test/spec/request-test.js

+1 −3
Original line number Diff line number Diff line
@@ -393,8 +393,7 @@ describe('Request-Promise', function () { 


    describe('should cover the defaults mechanism', function () {



        // FIXME: Simple default sticks to true

        xit("for overwriting the simple property's default", function () {

        it("for overwriting the simple property's default", function () {



            var nonSimpleRP = rp.defaults({ simple: false });
@@ -413,7 +412,6 @@ describe('Request-Promise', function () { 


        });



        // FIXME: Simple default sticks to true

        xit('for cascading overwrites', function () {



            var nonSimpleRP = rp.defaults({ simple: false });