Use correct token when creating stations

Track tokens should only be used when creating stations from tracks not
from search results. Also return the created station from the search
models when a station is created.

Fixes #63
Closes #64

2 files changed, 11 insertions, 4 deletions

diff --git a/tests/test_pandora/test_client.py b/tests/test_pandora/test_client.py
index 1c5a229..4262d34 100644
--- a/tests/test_pandora/test_client.py
+++ b/tests/test_pandora/test_client.py
@@ -177,7 +177,14 @@ class TestCreatingStation(TestCase):
         client = APIClient(Mock(return_value={}), None, None, None, None)
         client.create_station(artist_token="foo")
         client.transport.assert_called_with(
-            "station.createStation", trackToken="foo", musicType="artist"
+            "station.createStation", musicToken="foo", musicType="artist"
+        )
+
+    def test_using_song_token(self):
+        client = APIClient(Mock(return_value={}), None, None, None, None)
+        client.create_station(song_token="foo")
+        client.transport.assert_called_with(
+            "station.createStation", musicToken="foo", musicType="song"
         )
 
     def test_using_track_token(self):
diff --git a/tests/test_pandora/test_models.py b/tests/test_pandora/test_models.py
index 8605d1b..a155588 100644
--- a/tests/test_pandora/test_models.py
+++ b/tests/test_pandora/test_models.py
@@ -577,7 +577,7 @@ class TestArtistSearchResultItem(TestCase):
         )
         result._api_client.create_station = Mock()
 
-        result.create_station()
+        self.assertIsNotNone(result.create_station())
         result._api_client.create_station.assert_called_with(
             artist_token=result.token
         )
@@ -614,7 +614,7 @@ class TestSongSearchResultItem(TestCase):
         )
         result._api_client.create_station = Mock()
 
-        result.create_station()
+        self.assertIsNotNone(result.create_station())
         result._api_client.create_station.assert_called_with(
             track_token=result.token
         )
@@ -650,7 +650,7 @@ class TestGenreStationSearchResultItem(TestCase):
         )
         result._api_client.create_station = Mock()
 
-        result.create_station()
+        self.assertIsNotNone(result.create_station())
         result._api_client.create_station.assert_called_with(
             search_token=result.token
         )