From 02d020a2fca0fb429d8737a94323f4d247c1fdbf Mon Sep 17 00:00:00 2001 From: mmahacek Date: Thu, 16 Mar 2023 14:59:42 -0700 Subject: [PATCH 1/2] alias get_organizations Add `service_desk.get_organizations()` as an alias of `get_organisations()`. --- atlassian/service_desk.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/atlassian/service_desk.py b/atlassian/service_desk.py index 328e1a6a9..57139126f 100644 --- a/atlassian/service_desk.py +++ b/atlassian/service_desk.py @@ -323,7 +323,10 @@ def get_organisations(self, service_desk_id=None, start=0, limit=50): params=params, ) return self.get(url_with_sd_id, headers=self.experimental_headers, params=params) - + + # add alias for spelling consistency + get_organizations = get_organisations + def get_organization(self, organization_id): """ Get an organization for a given organization ID From cba89ce5ee1e682d026f49b7911e1c3dc5915702 Mon Sep 17 00:00:00 2001 From: Mark Mahacek Date: Fri, 17 Mar 2023 08:18:59 -0700 Subject: [PATCH 2/2] add tests for `get_organizations` --- atlassian/service_desk.py | 4 ++-- tests/test_servicedesk.py | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/atlassian/service_desk.py b/atlassian/service_desk.py index 57139126f..84536a613 100644 --- a/atlassian/service_desk.py +++ b/atlassian/service_desk.py @@ -323,10 +323,10 @@ def get_organisations(self, service_desk_id=None, start=0, limit=50): params=params, ) return self.get(url_with_sd_id, headers=self.experimental_headers, params=params) - + # add alias for spelling consistency get_organizations = get_organisations - + def get_organization(self, organization_id): """ Get an organization for a given organization ID diff --git a/tests/test_servicedesk.py b/tests/test_servicedesk.py index 274e45c6f..edd63571c 100644 --- a/tests/test_servicedesk.py +++ b/tests/test_servicedesk.py @@ -1,7 +1,8 @@ # coding: utf8 -import pytest import sys +import pytest + from atlassian import ServiceDesk SERVICEDESK = None @@ -25,6 +26,10 @@ def test_get_organisations(self): result = [x["name"] for x in SERVICEDESK.get_organisations()["values"]] assert result == ["Charlie Cakes Franchises"], "Result of [get_organisations()]" + def test_get_organizations(self): + result = [x["name"] for x in SERVICEDESK.get_organizations()["values"]] + assert result == ["Charlie Cakes Franchises"], "Result of [get_organizations()]" + def test_get_organisations_servicedesk_id(self): result = [x["name"] for x in SERVICEDESK.get_organisations(service_desk_id="{serviceDeskId}")["values"]] assert result == [ @@ -33,6 +38,14 @@ def test_get_organisations_servicedesk_id(self): "The Adjustment Bureau", ], "Result of [get_organisations(service_desk_id)]" + def test_get_organizations_servicedesk_id(self): + result = [x["name"] for x in SERVICEDESK.get_organizations(service_desk_id="{serviceDeskId}")["values"]] + assert result == [ + "Charlie Cakes Franchises", + "Atlas Coffee Co", + "The Adjustment Bureau", + ], "Result of [get_organizations(service_desk_id)]" + def test_get_organization(self): result = SERVICEDESK.get_organization("{organizationId}") assert result["name"] == "Charlie Cakes Franchises", "Result of [test_get_organization(...)]"