Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions rorapi/common/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ def get(self, request, version=REST_FRAMEWORK["DEFAULT_VERSION"]):
class IndexData(APIView):
permission_classes = [OurTokenPermission]

def get(self, request, branch, version=REST_FRAMEWORK["DEFAULT_VERSION"]):
def post(self, request, branch, version=REST_FRAMEWORK["DEFAULT_VERSION"]):
st = 200
msg = process_files(branch, 'v2')
if msg["status"] == "ERROR":
Expand All @@ -276,7 +276,7 @@ def get(self, request, branch, version=REST_FRAMEWORK["DEFAULT_VERSION"]):
class IndexDataDump(APIView):
permission_classes = [OurTokenPermission]

def get(self, request, filename, dataenv, version=REST_FRAMEWORK["DEFAULT_VERSION"]):
def post(self, request, filename, dataenv, version=REST_FRAMEWORK["DEFAULT_VERSION"]):
# Always use v2 schema - v1 indexing support has been removed
schema = 2
testdata = True
Expand Down
50 changes: 43 additions & 7 deletions rorapi/tests/tests_unit/tests_views_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -354,23 +354,41 @@ def setUp(self):
def test_index_ror_success(self, index_mock, permission_mock):
index_mock.return_value = self.success_msg
permission_mock.return_value = True
response = self.client.get('/v2/indexdata/foo')
response = self.client.post('/v2/indexdata/foo')
self.assertEquals(response.status_code, 200)

@mock.patch('rorapi.common.views.OurTokenPermission.has_permission')
@mock.patch('rorapi.common.views.process_files')
def test_index_ror_fail_error(self, index_mock, permission_mock):
index_mock.return_value = self.error_msg
permission_mock.return_value = True
response = self.client.get('/v2/indexdata/foo')
response = self.client.post('/v2/indexdata/foo')
self.assertEquals(response.status_code, 400)

@mock.patch('rorapi.common.views.OurTokenPermission.has_permission')
def test_index_ror_fail_no_permission(self, permission_mock):
permission_mock.return_value = False
response = self.client.get('/v2/indexdata/foo')
response = self.client.post('/v2/indexdata/foo')
self.assertEquals(response.status_code, 403)

@mock.patch.dict(os.environ, {"TOKEN": "token-value", "ROUTE_USER": "route-user"}, clear=False)
@mock.patch('rorapi.common.views.process_files')
def test_index_ror_fail_no_auth_headers(self, index_mock):
index_mock.return_value = self.success_msg
response = self.client.post('/v2/indexdata/foo')
self.assertEquals(response.status_code, 403)

@mock.patch.dict(os.environ, {"TOKEN": "token-value", "ROUTE_USER": "route-user"}, clear=False)
@mock.patch('rorapi.common.views.process_files')
def test_index_ror_success_with_auth_headers(self, index_mock):
index_mock.return_value = self.success_msg
response = self.client.post(
'/v2/indexdata/foo',
HTTP_TOKEN='token-value',
HTTP_ROUTE_USER='route-user'
)
self.assertEquals(response.status_code, 200)

class HeartbeatViewTestCase(SimpleTestCase):
def setUp(self):
with open(
Expand Down Expand Up @@ -446,19 +464,37 @@ def setUp(self):
def test_index_ror_success(self, index_mock, permission_mock):
index_mock.return_value = self.success_msg
permission_mock.return_value = True
response = self.client.get('/v2/indexdatadump/v1.1-1111-11-11-ror-data/prod')
response = self.client.post('/v2/indexdatadump/v1.1-1111-11-11-ror-data/prod')
self.assertEquals(response.status_code, 200)

@mock.patch('rorapi.common.views.OurTokenPermission.has_permission')
@mock.patch('django.core.management.call_command')
def test_index_ror_fail_error(self, index_mock, permission_mock):
index_mock.return_value = self.error_msg
permission_mock.return_value = True
response = self.client.get('/v2/indexdatadump/v1.1-1111-11-11-ror-data/prod')
response = self.client.post('/v2/indexdatadump/v1.1-1111-11-11-ror-data/prod')
self.assertEquals(response.status_code, 400)

@mock.patch('rorapi.common.views.OurTokenPermission.has_permission')
def test_index_ror_fail_no_permission(self, permission_mock):
permission_mock.return_value = False
response = self.client.get('/v2/indexdatadump/v1.1-1111-11-11-ror-data/prod')
self.assertEquals(response.status_code, 403)
response = self.client.post('/v2/indexdatadump/v1.1-1111-11-11-ror-data/prod')
self.assertEquals(response.status_code, 403)

@mock.patch.dict(os.environ, {"TOKEN": "token-value", "ROUTE_USER": "route-user"}, clear=False)
@mock.patch('django.core.management.call_command')
def test_index_ror_dump_fail_no_auth_headers(self, index_mock):
index_mock.return_value = self.success_msg
response = self.client.post('/v2/indexdatadump/v1.1-1111-11-11-ror-data/prod')
self.assertEquals(response.status_code, 403)

@mock.patch.dict(os.environ, {"TOKEN": "token-value", "ROUTE_USER": "route-user"}, clear=False)
@mock.patch('django.core.management.call_command')
def test_index_ror_dump_success_with_auth_headers(self, index_mock):
index_mock.return_value = self.success_msg
response = self.client.post(
'/v2/indexdatadump/v1.1-1111-11-11-ror-data/prod',
HTTP_TOKEN='token-value',
HTTP_ROUTE_USER='route-user'
)
self.assertEquals(response.status_code, 200)
Loading