fix: Adjust the tests (#51)

Author: ZPascal

README.md

@@ -13,6 +13,10 @@ The core features that are implemented inside this library:
 
 In general, my focus on this project is to implement and deliver old and new features from the Grafana API, to document all features and functionality clear,ly and to increase the overall test coverage of the project.
 
+## TODO
+- [ ] [Team Sync](https://grafana.com/docs/grafana/latest/developers/http_api/team_sync/)
+- [ ] [Public Dashboard](https://grafana.com/docs/grafana/latest/developers/http_api/dashboard_public/)
+
 ## Currently, supported features
 
 ### Dashboard

grafana_api/folder.py

@@ -1,6 +1,8 @@
 import logging
 import json
 
+import httpx
+
 from .api import Api
 from .model import APIModel, APIEndpoints, RequestsMethods
 
@@ -132,7 +134,7 @@ def create_folder(self, title: str, uid: str = None) -> dict:
             raise ValueError
 
     def update_folder(
-        self, title: str, uid: str, version: int = 0, overwrite: bool = False
+            self, title: str, uid: str, version: int = 0, overwrite: bool = False
     ) -> dict:
         """The method includes a functionality to update a folder information inside the organization specified by the uid, the title, the version of the folder or if folder information be overwritten
 
@@ -197,7 +199,10 @@ def delete_folder(self, uid: str):
                 RequestsMethods.DELETE,
             )
 
-            if api_call.status_code != 200:
+            if isinstance(api_call, dict) and api_call.get("message") != "Folder deleted":
+                logging.error(f"Please, check the error: {api_call}.")
+                raise Exception
+            elif isinstance(api_call, httpx.Response) and api_call.status_code != 200:
                 logging.error(f"Please, check the error: {api_call}.")
                 raise Exception
             else:

tests/integrationtest/test_organisation.py

@@ -55,16 +55,16 @@ def test_a_add_new_user_to_current_organization(self):
         organisation_users: list = (
             self.organisation.get_all_users_by_the_current_organization_lookup()
         )
-        self.assertEqual("Test", organisation_users[1].get("login"))
+        self.assertEqual("Test", organisation_users[2].get("login"))
 
     def test_b_update_organization_user_role_by_user_id(self):
         self.organisation.update_organization_user_role_by_user_id(7, "Editor")
 
         organisation_users: list = (
             self.organisation.get_all_users_by_the_current_organization()
         )
-        self.assertEqual(7, organisation_users[1].get("userId"))
-        self.assertEqual("Editor", organisation_users[1].get("role"))
+        self.assertEqual(7, organisation_users[2].get("userId"))
+        self.assertEqual("Editor", organisation_users[2].get("role"))
 
     def test_c_delete_organization_user_by_user_id(self):
         self.organisation.delete_organization_user_by_user_id(7)

tests/integrationtest/test_playlist.py

@@ -22,12 +22,7 @@ def test_get_playlist(self):
 
     def test_get_playlist_items(self):
         self.assertEqual(
-            "653", self.playlist.get_playlist_items("PgorUJA4z")[0].get("value")
-        )
-
-    def test_get_playlist_dashboards(self):
-        self.assertEqual(
-            653, self.playlist.get_playlist_dashboards("PgorUJA4z")[0].get("id")
+            "tests", self.playlist.get_playlist_items("PgorUJA4z")[0].get("value")
         )
 
     def test_a_create_playlist(self):

tests/unittests/test_folder.py

@@ -1,6 +1,8 @@
 from unittest import TestCase
 from unittest.mock import MagicMock, patch
 
+import httpx
+
 from grafana_api.model import APIModel
 from grafana_api.folder import Folder
 
@@ -191,6 +193,15 @@ def test_delete_folder(self, call_the_api_mock):
 
         self.assertEqual(None, folder.delete_folder("test"))
 
+    @patch("grafana_api.api.Api.call_the_api")
+    def test_delete_folder_right_message(self, call_the_api_mock):
+        model: APIModel = APIModel(host=MagicMock(), token=MagicMock())
+        folder: Folder = Folder(grafana_api_model=model)
+
+        call_the_api_mock.return_value = dict({"message": "Folder deleted"})
+
+        self.assertEqual(None, folder.delete_folder("test"))
+
     @patch("grafana_api.api.Api.call_the_api")
     def test_delete_folder_no_uid(self, call_the_api_mock):
         model: APIModel = APIModel(host=MagicMock(), token=MagicMock())
@@ -202,11 +213,21 @@ def test_delete_folder_no_uid(self, call_the_api_mock):
             folder.delete_folder("")
 
     @patch("grafana_api.api.Api.call_the_api")
-    def test_delete_folder_error_response(self, call_the_api_mock):
+    def test_delete_folder_error_response_wrong_object(self, call_the_api_mock):
         model: APIModel = APIModel(host=MagicMock(), token=MagicMock())
         folder: Folder = Folder(grafana_api_model=model)
 
-        call_the_api_mock.return_value.status_code = 404
+        call_the_api_mock.return_value = httpx.Response(404)
+
+        with self.assertRaises(Exception):
+            folder.delete_folder("test")
+
+    @patch("grafana_api.api.Api.call_the_api")
+    def test_delete_folder_error_response_wrong_message(self, call_the_api_mock):
+        model: APIModel = APIModel(host=MagicMock(), token=MagicMock())
+        folder: Folder = Folder(grafana_api_model=model)
+
+        call_the_api_mock.return_value = dict({"message": "test"})
 
         with self.assertRaises(Exception):
             folder.delete_folder("test")