Merge pull request #452 from ror-community/staging

Author: jrhoads

rorapi/settings.py

@@ -98,7 +98,7 @@
 REST_FRAMEWORK = {
     'DEFAULT_RENDERER_CLASSES': ('rest_framework.renderers.JSONRenderer', ),
     'DEFAULT_VERSIONING_CLASS': 'rest_framework.versioning.URLPathVersioning',
-    'DEFAULT_VERSION': 'v1',
+    'DEFAULT_VERSION': 'v2',
     'ALLOWED_VERSIONS': ['v1','v2'],
 
 }

rorapi/tests/tests_unit/tests_views_v1.py

@@ -148,6 +148,7 @@ def test_retrieve_invalid_id(self, search_mock):
         self.assertTrue(any(['not a valid' in e for e in organization['errors']]))
 
 class GenerateIdViewTestCase(SimpleTestCase):
+
     def setUp(self):
         with open(
                 os.path.join(os.path.dirname(__file__),
@@ -172,6 +173,7 @@ def test_generateid_fail_no_permission(self, permission_mock):
         self.assertEquals(response.status_code, 403)
 
 class GenerateAddressViewTestCase(SimpleTestCase):
+    V1_VERSION = 'v1'
     def setUp(self):
         with open(
                 os.path.join(os.path.dirname(__file__),
@@ -188,7 +190,7 @@ def setUp(self):
     def test_generateaddress_success(self, address_mock, permission_mock):
         address_mock.return_value = self.test_data_address
         permission_mock.return_value = True
-        response = self.client.get('/generateaddress/5378538')
+        response = self.client.get('/v1/generateaddress/5378538')
         self.assertContains(response, 'address')
         self.assertEquals(response.status_code, 200)
 
@@ -197,14 +199,14 @@ def test_generateaddress_success(self, address_mock, permission_mock):
     def test_generateaddress_fail_empty(self, address_mock, permission_mock):
         address_mock.return_value = self.test_data_address_empty
         permission_mock.return_value = True
-        response = self.client.get('/generateaddress/0000000')
+        response = self.client.get('/v1/generateaddress/0000000')
         self.assertContains(response, 'Expecting value')
         self.assertEquals(response.status_code, 200)
 
     @mock.patch('rorapi.common.views.OurTokenPermission.has_permission')
     def test_generateid_fail_no_permission(self, permission_mock):
         permission_mock.return_value = False
-        response = self.client.get('/generateaddress/5378538')
+        response = self.client.get('/v1/generateaddress/5378538')
         self.assertEquals(response.status_code, 403)
 
 class IndexRorViewTestCase(SimpleTestCase):

rorapi/tests/tests_unit/tests_views_v2.py

@@ -234,7 +234,7 @@ def setUp(self):
         self.maxDiff = None
 
     @mock.patch('rorapi.common.views.OurTokenPermission.has_permission')
-    @mock.patch('update_address.new_geonames')
+    @mock.patch('update_address.new_geonames_v2')
     def test_generateaddress_success(self, address_mock, permission_mock):
         address_mock.return_value = self.test_data_address
         permission_mock.return_value = True
@@ -243,18 +243,18 @@ def test_generateaddress_success(self, address_mock, permission_mock):
         self.assertEquals(response.status_code, 200)
 
     @mock.patch('rorapi.common.views.OurTokenPermission.has_permission')
-    @mock.patch('update_address.new_geonames')
+    @mock.patch('update_address.new_geonames_v2')
     def test_generateaddress_fail_empty(self, address_mock, permission_mock):
         address_mock.return_value = self.test_data_address_empty
         permission_mock.return_value = True
-        response = self.client.get('/generateaddress/0000000')
+        response = self.client.get('/v2/generateaddress/0000000')
         self.assertContains(response, 'Expecting value')
         self.assertEquals(response.status_code, 200)
 
     @mock.patch('rorapi.common.views.OurTokenPermission.has_permission')
     def test_generateid_fail_no_permission(self, permission_mock):
         permission_mock.return_value = False
-        response = self.client.get('/generateaddress/5378538')
+        response = self.client.get('/v2/generateaddress/5378538')
         self.assertEquals(response.status_code, 403)
 
 class IndexRorViewTestCase(SimpleTestCase):