Merge pull request #4 from paraita/fix-encoding-issue

Fix the test and the encoding issue
paraita · Jan 27, 2017 · 36a1326 · 36a1326
2 parents 28950f7 + 225d84a
commit 36a1326
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -2,4 +2,5 @@ flask-restplus==0.9.2
 sophiabus230==0.6
 coverage==4.3.4
 coveralls==1.1
-gunicorn==19.6.0
+gunicorn==19.6.0
+nose==1.3.7
diff --git a/whereismybus230/starter.py b/whereismybus230/starter.py
@@ -35,7 +35,7 @@ def get(self):
         return [
             {
                 'bus_time': bus['bus_time'].isoformat(),
-                'dest': str(bus['dest'], 'utf-8'),
+                'dest': str(bus['dest']),
                 'is_real_time': bus['is_real_time']
             }
             for bus in tt

diff --git a/whereismybus230/test_main.py b/whereismybus230/test_main.py
@@ -16,16 +16,15 @@ def setUp(self):
         self.app.testing = True
 
     @patch('sophiabus230.get_next_buses')
-    def test_get_no_buses(self, mock_bus):
+    def test_getNoBuses(self, mock_bus):
         mock_bus.return_value = []
-        result = self.app.get('/bus230')
+        result = self.app.get('/bus230?stop_id=1939')
         json_data = json.loads(result.data)
         self.assertEqual(json_data, [])
         self.assertEqual(result.status_code, 200)
 
     @patch('sophiabus230.get_next_buses')
-    def test_get(self, mock_bus):
-
+    def test_getBuses(self, mock_bus):
         expected_tt = [
             {'dest': 'Cathédrale-Vieille Ville',
              'is_real_time': True,
@@ -37,17 +36,18 @@ def test_get(self, mock_bus):
              }
             ]
         mock_bus.return_value = [
-            {'dest': b'Cath\xc3\xa9drale-Vieille Ville',
+            {'dest': 'Cathédrale-Vieille Ville',
              'is_real_time': True,
              'bus_time': datetime.datetime(2017, 1, 19, 17, 23, 6, 302989,
                                            tzinfo=tzfile('/usr/share/zoneinfo/Europe/Paris'))
              },
-            {'dest': b'Cath\xc3\xa9drale-Vieille Ville',
+            {'dest': 'Cathédrale-Vieille Ville',
              'is_real_time': False,
              'bus_time': datetime.datetime(2017, 1, 19, 17, 32)
              }
             ]
-        result = self.app.get('/bus230')
+        result = self.app.get('/bus230?stop_id=1939')
         json_data = json.loads(result.data)
-        self.assertEqual(json_data, expected_tt)
         self.assertEqual(result.status_code, 200)
+        self.assertEqual(expected_tt, json_data)
+