From 5039f6dfb512a2605be487507379d123ff6222b7 Mon Sep 17 00:00:00 2001 From: Eeshan Garg Date: Wed, 3 Oct 2018 15:08:01 -0230 Subject: [PATCH] webhooks/gitlab: Get test coverage up to 100%. Test coverage was improved by removing an unused function and removing some code (written by me) that was actually handling Test Hook event types incorrectly. --- tools/test-backend | 1 - zerver/webhooks/gitlab/view.py | 7 ------- 2 files changed, 8 deletions(-) diff --git a/tools/test-backend b/tools/test-backend index 4c1a054de4..5abb757e54 100755 --- a/tools/test-backend +++ b/tools/test-backend @@ -101,7 +101,6 @@ not_yet_fully_covered = { 'zerver/data_import/import_util.py', # Webhook integrations with incomplete coverage 'zerver/webhooks/github_legacy/view.py', - 'zerver/webhooks/gitlab/view.py', 'zerver/webhooks/greenhouse/view.py', 'zerver/webhooks/hellosign/view.py', 'zerver/webhooks/ifttt/view.py', diff --git a/zerver/webhooks/gitlab/view.py b/zerver/webhooks/gitlab/view.py index 80af23f4a1..a243c94247 100644 --- a/zerver/webhooks/gitlab/view.py +++ b/zerver/webhooks/gitlab/view.py @@ -261,9 +261,6 @@ def get_branch_name(payload: Dict[str, Any]) -> str: def get_tag_name(payload: Dict[str, Any]) -> str: return payload['ref'].replace('refs/tags/', '') -def get_object_iid(payload: Dict[str, Any]) -> str: - return payload['object_attributes']['iid'] - def get_object_url(payload: Dict[str, Any]) -> str: return payload['object_attributes']['url'] @@ -364,13 +361,9 @@ def get_subject_based_on_event(event: str, payload: Dict[str, Any]) -> str: return get_repo_name(payload) def get_event(request: HttpRequest, payload: Dict[str, Any], branches: Optional[str]) -> Optional[str]: - # if there is no 'action' attribute, then this is a test payload - # and we should ignore it event = validate_extract_webhook_http_header(request, 'X_GITLAB_EVENT', 'GitLab') if event in ['Issue Hook', 'Merge Request Hook', 'Wiki Page Hook']: action = payload['object_attributes'].get('action') - if action is None: - return 'Test Hook' event = "{} {}".format(event, action) elif event == 'Note Hook': action = payload['object_attributes'].get('noteable_type')