Skip to content

Merge Staging to Master: Update default API version to v2, fix v1 tests (#450) #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jrhoads merged 2 commits into from
Jul 30, 2025
Merged

Merge Staging to Master: Update default API version to v2, fix v1 tests (#450) #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26f0d0d
Update default API version to v2, fix v1 tests (#450)
jrhoads Jul 28, 2025
b7d1d66
Merge pull request #451 from ror-community/dev
jrhoads Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rorapi/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'],

}
Expand Down
8 changes: 5 additions & 3 deletions rorapi/tests/tests_unit/tests_views_v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__),
Expand All @@ -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__),
Expand All @@ -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)

Expand All @@ -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):
Expand Down
8 changes: 4 additions & 4 deletions rorapi/tests/tests_unit/tests_views_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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):
Expand Down
Loading