IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed API test cases for missing language pack and jasmin test case.

Browse Source
This commit is contained in:
Akshay Joshi
2020-01-20 16:14:12 +05:30
parent 23e218f1b5
commit b4b54d6b94
4 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
web/pgadmin/browser/server_groups/servers/databases/languages/tests/language_test_data.json
View File

@@ -27,7 +27,7 @@
}
},
{
"name": "Missing required parameter while creating langauge",
"name": "Missing required parameter while creating language",
"url": "/browser/language/obj/",
"is_positive_test": false,
"missing_name": true,
@@ -47,7 +47,7 @@
"mock_data": {}
},
{
"name": "Error while crerating langauge with missing langauge pack",
"name": "Error while creating language with missing language pack",
"url": "/browser/language/obj/",
"is_positive_test": false,
"missing_lang_pack": true,
@@ -63,11 +63,14 @@
"status_code": 500,
"message": "Could not find the required parameter"
},
"mocking_required": false,
"mock_data": {}
"mocking_required": true,
"mock_data": {
"function_name": "pgadmin.utils.driver.psycopg2.connection.Connection.execute_dict",
"return_value": "(False, 'Mocked Internal Server Error')"
}
},
{
"name": "Error while getting properties created langauge",
"name": "Error while getting properties created language",
"url": "/browser/language/obj/",
"is_positive_test": false,
"error_in_properties": true,
@@ -81,7 +84,7 @@
},
"expected_data": {
"status_code": 500,
"message": "Error while getting properties created langauge."
"message": "Error while getting properties created language."
},
"mocking_required": true,
"mock_data": {
@@ -114,13 +117,13 @@
"mock_data": {}
},
{
"name": "Error while getting created langauges properties",
"name": "Error while getting created languages properties",
"url": "/browser/language/obj/",
"is_positive_test": false,
"error_in_language_properties": true,
"expected_data": {
"status_code": 500,
"message": "Internal server error while getting langauges"
"message": "Internal server error while getting languages"
},
"mocking_required": true,
"mock_data": {
@@ -129,13 +132,13 @@
}
},
{
"name": "Error while getting created langauges acl",
"name": "Error while getting created languages acl",
"url": "/browser/language/obj/",
"is_positive_test": false,
"language_acl": true,
"expected_data": {
"status_code": 500,
"message": "Internal server error while getting langauges acl"
"message": "Internal server error while getting languages acl"
},
"mocking_required": true,
"mock_data": {
@@ -158,13 +161,13 @@
}
},
{
"name": "Error while getting created langauges list",
"name": "Error while getting created languages list",
"url": "/browser/language/obj/",
"is_positive_test": false,
"language_list": true,
"expected_data": {
"status_code": 500,
"message": "Internal server error while getting langauges"
"message": "Internal server error while getting languages"
},
"mocking_required": true,
"mock_data": {
@@ -394,7 +397,7 @@
"mock_data": {}
},
{
"name": "Error while getting getting a language to delete",
"name": "Error while getting a language to delete",
"url": "/browser/language/obj/",
"is_positive_test": false,
"error_in_getting_language": true,
@@ -409,7 +412,7 @@
}
},
{
"name": "Error while deleting the created langauge",
"name": "Error while deleting the created language",
"url": "/browser/language/obj/",
"is_positive_test": false,
"error_in_deleting_language": true,

9
web/pgadmin/browser/server_groups/servers/databases/languages/tests/test_language_add.py
View File

@@ -66,10 +66,11 @@ class LanguagesAddTestCase(BaseTestGenerator):
actual_status_code = response.status_code
expected_status_code = self.expected_data["status_code"]
if hasattr(self, "missing_lang_pack"):
self.data['name'] = 'plperlu'
response = self.create_language()
actual_status_code = response.status_code
expected_status_code = self.expected_data["status_code"]
with patch(self.mock_data["function_name"],
return_value=eval(self.mock_data["return_value"])):
response = self.create_language()
actual_status_code = response.status_code
expected_status_code = self.expected_data["status_code"]
if hasattr(self, "error_in_properties"):
with patch(self.mock_data["function_name"],

5
web/pgadmin/browser/static/js/activity.js
View File

@@ -91,7 +91,10 @@ _.extend(pgBrowser, {
},
logout_inactivity_user: function() {
window.location.href = pgBrowser.utils.logout_url;
if (!_.isUndefined(pgBrowser.utils) &&
!_.isUndefined(pgBrowser.utils.logout_url)) {
window.location.href = pgBrowser.utils.logout_url;
}
},
/* The daemon will track and logout when timeout occurs */

6
web/regression/.coveragerc.in
View File

@@ -13,6 +13,12 @@ omit =
*/tests/*
*/feature_tests/*
# Here exclude the lines from the code coverage report
[report]
exclude_lines=
import*
except*
# Mention patterns in 'include' to include code for the coverage measurement
# Here, code coverage will show report only for modules mentioned in the
# 'include'