Fix tests

Author: meliaj

clever/models/event.py

@@ -42,39 +42,6 @@ class Event(object):
         'type': 'type'
     }
 
-    discriminator_value_class_map = {
-        '': 'DistrictsUpdated',
-        '': 'TermsCreated',
-        '': 'DistrictsDeleted',
-        '': 'SchooladminsCreated',
-        '': 'TeachersUpdated',
-        '': 'ContactsUpdated',
-        '': 'TermsDeleted',
-        '': 'TeachersDeleted',
-        '': 'TermsUpdated',
-        '': 'ContactsDeleted',
-        '': 'DistrictsCreated',
-        '': 'DistrictadminsDeleted',
-        '': 'SectionsCreated',
-        '': 'SchooladminsDeleted',
-        '': 'CoursesCreated',
-        '': 'StudentsDeleted',
-        '': 'SchoolsCreated',
-        '': 'CoursesDeleted',
-        '': 'CoursesUpdated',
-        '': 'DistrictadminsCreated',
-        '': 'SectionsDeleted',
-        '': 'SectionsUpdated',
-        '': 'SchoolsDeleted',
-        '': 'ContactsCreated',
-        '': 'TeachersCreated',
-        '': 'SchoolsUpdated',
-        '': 'StudentsCreated',
-        '': 'SchooladminsUpdated',
-        '': 'StudentsUpdated',
-        '': 'DistrictadminsUpdated'
-    }
-
     def __init__(self, created=None, id=None, type=None):
         """
         Event - a model defined in Swagger
@@ -83,7 +50,6 @@ def __init__(self, created=None, id=None, type=None):
         self._created = None
         self._id = None
         self._type = None
-        self.discriminator = 'type'
 
         if created is not None:
           self.created = created
@@ -156,16 +122,6 @@ def type(self, type):
 
         self._type = type
 
-    def get_real_child_model(self, data):
-        """
-        Returns the real base class specified by the discriminator
-        """
-        discriminator_value = data[self.discriminator].lower()
-        if self.discriminator_value_class_map.has_key(discriminator_value):
-            return self.discriminator_value_class_map[discriminator_value]
-        else:
-            return None
-
     def to_dict(self):
         """
         Returns the model properties as a dict

test/test_data_api.py

@@ -38,7 +38,7 @@ class TestDataApi(unittest.TestCase):
 
     def setUp(self):
         self.api = clever.apis.data_api.DataApi()
-        clever.configuration.access_token = 'TEST_TOKEN'
+        self.api.api_client.configuration.access_token = 'TEST_TOKEN'
 
     def tearDown(self):
         pass
@@ -52,7 +52,7 @@ def test_unicode_receive(self):
         real_pool = self.api.api_client.rest_client.pool_manager
         self.api.api_client.rest_client.pool_manager = mock_pool
 
-        mock_pool.expect_request('GET', 'https://api.clever.com/v1.2/districts/something')
+        mock_pool.expect_request('GET', 'https://api.clever.com/v2.0/districts/something')
         # Make sure unicode responses can be received.
         self.assertEqual(u'Oh haiô', self.api.get_district('something').data.name)
         self.api.api_client.rest_client.pool_manager = real_pool

test/test_events_api.py

@@ -27,7 +27,7 @@ class TestEventsApi(unittest.TestCase):
 
     def setUp(self):
         self.api = clever.apis.events_api.EventsApi()
-        clever.configuration.access_token = 'TEST_TOKEN'
+        self.api.api_client.configuration.access_token = 'TEST_TOKEN'
 
     def tearDown(self):
         pass