Fix extend function

Author: JMPerez

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "spotify-web-api-js",
   "description": "A client-side JS wrapper for the Spotify Web API",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "homepage": "https://github.com/JMPerez/spotify-web-api-js",
   "author": {
     "name": "José M. Pérez"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "spotify-web-api-js",
   "description": "A client-side JS wrapper for the Spotify Web API",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "homepage": "https://github.com/JMPerez/spotify-web-api-js",
   "author": {
     "name": "José M. Pérez"

src/spotify-web-api.js

@@ -32,7 +32,7 @@ var SpotifyWebApi = (function() {
     } else if (typeof options === 'function') {
       cb = options;
     }
-    _extend(requestData.params, opt);
+    requestData.params = _extend(requestData.params, opt);
     return _performRequest(requestData, cb);
   };
 

tests/fixtures/artist_albums_limit_2.json

@@ -0,0 +1,57 @@
+{
+  "href" : "https://api.spotify.com/v1/artists/5YyScSZOuBHpoFhGvHFedc/albums?offset=0&limit=2&album_type=single,album,compilation,appears_on",
+  "items" : [ {
+    "album_type" : "album",
+    "available_markets" : [ ],
+    "external_urls" : {
+      "spotify" : "https://open.spotify.com/album/45P1TztZZFbxpmMNuQdR21"
+    },
+    "href" : "https://api.spotify.com/v1/albums/45P1TztZZFbxpmMNuQdR21",
+    "id" : "45P1TztZZFbxpmMNuQdR21",
+    "images" : [ {
+      "height" : 640,
+      "url" : "https://i.scdn.co/image/54533347f41c7d0afaa3e51f127ec93ea5e70311",
+      "width" : 640
+    }, {
+      "height" : 300,
+      "url" : "https://i.scdn.co/image/23e03d404f2b2e203022240d0b555b0ef953c757",
+      "width" : 300
+    }, {
+      "height" : 64,
+      "url" : "https://i.scdn.co/image/92cc17359e1c3f4a2faf42ff8dfc98390c9550b4",
+      "width" : 64
+    } ],
+    "name" : "Mas de Cien Amaneceres",
+    "type" : "album",
+    "uri" : "spotify:album:45P1TztZZFbxpmMNuQdR21"
+  }, {
+    "album_type" : "album",
+    "available_markets" : [ "AD", "AR", "AT", "AU", "BE", "BG", "BO", "BR", "CA", "CH", "CL", "CO", "CR", "CY", "CZ", "DE", "DK", "DO", "EC", "EE", "ES", "FI", "FR", "GB", "GR", "GT", "HK", "HN", "HU", "IE", "IS", "IT", "LI", "LT", "LU", "LV", "MC", "MT", "MX", "MY", "NI", "NL", "NO", "NZ", "PA", "PE", "PH", "PL", "PT", "PY", "RO", "SE", "SG", "SI", "SK", "SV", "TR", "TW", "US", "UY" ],
+    "external_urls" : {
+      "spotify" : "https://open.spotify.com/album/6M9uDidhgXknM1AIO5Pkb4"
+    },
+    "href" : "https://api.spotify.com/v1/albums/6M9uDidhgXknM1AIO5Pkb4",
+    "id" : "6M9uDidhgXknM1AIO5Pkb4",
+    "images" : [ {
+      "height" : 640,
+      "url" : "https://i.scdn.co/image/abe64732d0d16bef25dd27e35870dae76fb9eafb",
+      "width" : 640
+    }, {
+      "height" : 300,
+      "url" : "https://i.scdn.co/image/9e47cff4b5dc38ab6fb836ea3109e8046cad4d2b",
+      "width" : 300
+    }, {
+      "height" : 64,
+      "url" : "https://i.scdn.co/image/c8cd3b5e20281000e28682f2fc5313cf21b594f6",
+      "width" : 64
+    } ],
+    "name" : "Mas de Cien Amaneceres",
+    "type" : "album",
+    "uri" : "spotify:album:6M9uDidhgXknM1AIO5Pkb4"
+  } ],
+  "limit" : 2,
+  "next" : "https://api.spotify.com/v1/artists/5YyScSZOuBHpoFhGvHFedc/albums?offset=2&limit=2&album_type=single,album,compilation,appears_on",
+  "offset" : 0,
+  "previous" : null,
+  "total" : 33
+}

tests/js/spec/test.js

@@ -24,6 +24,7 @@ describe('Basic tests', function() {
     artist: loadFixture('artist'),
     artists: loadFixture('artists'),
     artist_albums: loadFixture('artist_albums'),
+    artist_albums_limit_2: loadFixture('artist_albums_limit_2'),
     artist_related_artists: loadFixture('artist_related_artists'),
     artist_top_tracks: loadFixture('artist_top_tracks'),
     search_album: loadFixture('search_album'),
@@ -144,6 +145,19 @@ describe('Basic tests', function() {
       expect(that.requests[0].url).to.equal('https://api.spotify.com/v1/artists/5YyScSZOuBHpoFhGvHFedc/albums');
     });
 
+    it('should get 2 artist\'s albums', function() {
+      var callback = sinon.spy();
+      var api = new SpotifyWebApi();
+      api.getArtistAlbums('5YyScSZOuBHpoFhGvHFedc', {limit: 2}, callback);
+      that.requests[0].respond(200,
+        {'Content-Type':'application/json'},
+        JSON.stringify(that.fixtures.artist_albums)
+      );
+      expect(callback.calledWith(null, that.fixtures.artist_albums_limit_2)).to.be.ok;
+      expect(that.requests).to.have.length(1);
+      expect(that.requests[0].url).to.equal('https://api.spotify.com/v1/artists/5YyScSZOuBHpoFhGvHFedc/albums?limit=2');
+    });
+
     it('should get an artist\'s top tracks', function() {
       var callback = sinon.spy();
       var api = new SpotifyWebApi();