Merge branch 'caitlin-tibbetts-master'

Author: JMPerez

__test__/spotify-web-api.spec.js

@@ -1678,19 +1678,6 @@ describe('Basic tests', function () {
       expect(that.requests[0].url).toBe('https://api.spotify.com/v1/me/player');
     });
 
-    it('should queue', function () {
-      var callback = sinon.spy();
-      var api = new SpotifyWebApi();
-      api.queue('spotify:track:1301WleyT98MSxVHPZCA6M', callback);
-      that.requests[0].respond(204);
-      expect(that.requests[0].method).toBe('POST');
-      expect(callback.calledWith(null, '')).toBeTruthy();
-      expect(that.requests.length).toBe(1);
-      expect(that.requests[0].url).toBe(
-        'https://api.spotify.com/v1/me/player/queue?uri=spotify%3Atrack%3A1301WleyT98MSxVHPZCA6M'
-      );
-    });
-
     it('should play', function () {
       var callback = sinon.spy();
       var api = new SpotifyWebApi();
@@ -1730,6 +1717,38 @@ describe('Basic tests', function () {
       );
     });
 
+    it('should queue a track', function () {
+      var callback = sinon.spy();
+      var api = new SpotifyWebApi();
+      api.queue('spotify:track:2Oehrcv4Kov0SuIgWyQY9e', {}, callback);
+      that.requests[0].respond(204);
+      expect(that.requests[0].method).toBe('POST');
+      expect(callback.calledWith(null, '')).toBeTruthy();
+      expect(that.requests.length).toBe(1);
+      expect(that.requests[0].url).toBe(
+        'https://api.spotify.com/v1/me/player/queue?uri=spotify%3Atrack%3A2Oehrcv4Kov0SuIgWyQY9e'
+      );
+    });
+
+    it('should queue a track on a certain device', function () {
+      var callback = sinon.spy();
+      var api = new SpotifyWebApi();
+      api.queue(
+        'spotify:track:2Oehrcv4Kov0SuIgWyQY9e',
+        {
+          device_id: 'my_device_id'
+        },
+        callback
+      );
+      that.requests[0].respond(204);
+      expect(that.requests[0].method).toBe('POST');
+      expect(callback.calledWith(null, '')).toBeTruthy();
+      expect(that.requests.length).toBe(1);
+      expect(that.requests[0].url).toBe(
+        'https://api.spotify.com/v1/me/player/queue?uri=spotify%3Atrack%3A2Oehrcv4Kov0SuIgWyQY9e&device_id=my_device_id'
+      );
+    });
+
     it('should pause', function () {
       var callback = sinon.spy();
       var api = new SpotifyWebApi();

src/spotify-web-api.js

@@ -1618,8 +1618,8 @@ var SpotifyWebApi = (function () {
   };
 
   /**
-   * Start a new context or resume current playback on the user’s active device.
-   * See [Start/Resume a User’s Playback](https://developer.spotify.com/web-api/start-a-users-playback/) on
+   * Play a track on the user's active device
+   * See [Start/Resume a User's Playback](https://developer.spotify.com/documentation/web-api/reference/player/start-a-users-playback/) on
    * the Spotify Developer site for more information about the endpoint.
    *
    * @param {Object} options A JSON object with options that can be passed.