Fix integration test & more user_id clean-up (#56, resolves #55)

marccarre · floscha · commit 4aeed7341167 · 2019-03-17T13:21:55.000+01:00
* Fix Decks' description, currently incorrectly set to the user ID

* rest_api.py's update_deck no longer uses Deck's user_id

Fixes integration tests, previously failing with::
```
&gt;       updated_deck = self.get_deck(deck.id, deck.user_id)
E       AttributeError: 'Deck' object has no attribute 'user_id'

tinycards/networking/rest_api.py:277: AttributeError
```

* rest_api.py's get_deck no longer sets user_id on Deck object

* Fix example, where Deck's description would be set to user ID
diff --git a/examples/csv_to_deck.py b/examples/csv_to_deck.py
@@ -14,7 +14,7 @@ def csv_to_deck(csv_path):
     """
     # Create new deck.
     tinycards = Tinycards(user_identifier, user_password)
-    deck = Deck('French Words', tinycards.user_id)
+    deck = Deck('French Words')
     deck = tinycards.create_deck(deck)
 
     # Extract data from CSV file.
diff --git a/tests/integration_test.py b/tests/integration_test.py
@@ -30,7 +30,7 @@ def setUp(self):
 
     def _test_create_empty_deck(self):
         """Create a new empty deck."""
-        new_deck = Deck('Test Deck', self.tinycards.user_id)
+        new_deck = Deck('Test Deck')
         created_deck = self.tinycards.create_deck(new_deck)
         self.assertTrue(isinstance(created_deck, Deck))
         self.assertEqual('', created_deck.shareable_link)
@@ -83,7 +83,7 @@ def _test_delete_deck(self):
 
     def _test_create_shareable_deck(self):
         """Create a new empty, shareable deck."""
-        new_deck = Deck('Test shareable Deck', self.tinycards.user_id, private=True, shareable=True)
+        new_deck = Deck('Test shareable Deck', private=True, shareable=True)
         created_deck = self.tinycards.create_deck(new_deck)
         self.assertTrue(isinstance(created_deck, Deck))
         self.assertNotEqual('', created_deck.shareable_link)
@@ -95,7 +95,7 @@ def _test_create_deck_with_cover(self):
         """Create a new empty deck, with a cover."""
         current_dir = os.path.dirname(os.path.realpath(__file__))
         blue_cover_filepath = os.path.abspath(os.path.join(current_dir, 'test_logo_blue.jpg'))
-        deck = Deck('Test Deck with cover', self.tinycards.user_id, cover=blue_cover_filepath)
+        deck = Deck('Test Deck with cover', cover=blue_cover_filepath)
         deck = self.tinycards.create_deck(deck)
         self.assertTrue(isinstance(deck, Deck))
         self._assert_cover_was_updated(blue_cover_filepath, deck.cover)
diff --git a/tinycards/client/tinycards.py b/tinycards/client/tinycards.py
@@ -165,7 +165,7 @@ def update_deck(self, deck):
             Deck: The updated Deck object if update was successful.
 
         """
-        updated_deck = self.data_source.update_deck(deck)
+        updated_deck = self.data_source.update_deck(deck, self.user_id)
 
         return updated_deck
 
diff --git a/tinycards/networking/rest_api.py b/tinycards/networking/rest_api.py
@@ -216,7 +216,6 @@ def get_deck(self, deck_id, user_id, include_cards=True):
         deck = json_converter.json_to_deck(json_response)
         # Set additional properties.
         deck.id = deck_id
-        deck.user_id = user_id
 
         return deck
 
@@ -243,7 +242,7 @@ def create_deck(self, deck):
 
         return created_deck
 
-    def update_deck(self, deck):
+    def update_deck(self, deck, user_id):
         """Update an existing deck.
 
         Args:
@@ -274,7 +273,7 @@ def update_deck(self, deck):
 
         # The response from the PATCH request does not contain cards.
         # Therefore, we have to query the updated deck with an extra request.
-        updated_deck = self.get_deck(deck.id, deck.user_id)
+        updated_deck = self.get_deck(deck.id, user_id)
 
         return updated_deck
 
