From fa890880941a1d4189bc9e73bec6c74c101f4f80 Mon Sep 17 00:00:00 2001
From: shockrah <alejandros714@protonmail.com>
Date: Mon, 7 Jun 2021 22:33:53 -0700
Subject: [PATCH] + Adding new badges tests ! Test bot is once again a massive
 disaster but at least it scales well /shrug Should probably refactor test bot
 to be moar straight forward or something idk

+ Also adding some spacing eye candy to make sure we can read things easily
---
 json-api/client-tests/main.py | 27 +++++++++++++++++++++++++++
 json-api/src/routes.rs        |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/json-api/client-tests/main.py b/json-api/client-tests/main.py
index 75a25a7..c48ae85 100644
--- a/json-api/client-tests/main.py
+++ b/json-api/client-tests/main.py
@@ -52,6 +52,26 @@ def bs_admin(server: Server) -> Admin:
     }
     return Admin(user_, server_)
 
+def badge_tests(admin: Admin) -> list:
+    badge = req(admin, 'post', '/badge/new', {'badge_name': str(now), 'badge_color': 0xFF1B24}, 200)
+    try:
+        json_data = badge.fire().json()
+        id = json_data['badge']['id']
+        generic_reqs = [
+            req(admin, 'post', '/badge/new', {'badge_name': str(now)}, 200),
+            req(admin, 'put', '/badge/update/color', {'badge_id': id, 'badge_color': 0xffffffff}, 200),
+            req(admin, 'put', '/badge/update/name', {'badage_id': id, 'badge_name': 'soundclown'}, 200),
+            req(admin, 'put', '/badge/update/perms', {'badge_id': id, 'badge_perms': 69}, 200),
+            req(admin, 'get', '/badge/list', {}, 200, verbose=True),
+        ]
+        for r in generic_reqs:
+            r.fire()
+
+        return generic_reqs
+    except Exception as e:
+        print(f'Exceptionin badge_tests: {e}')
+        return []
+
 
 def req(admin: Admin, method: str, path: str, qs: dict, hope: int, headers: dict={}, body=None, verbose=False) -> Request:
     url = admin.server.url + path
@@ -126,17 +146,21 @@ if __name__ == '__main__':
         req(admin, 'post', '/channels/list', {'kind': TEXT_CHAN}, 404),
         req(admin, 'get' , '/channels/list', {'kind': TEXT_CHAN}, 200),
         req(admin , 'delete', '/channels/delete', {'channel_id':del_chan_id}, 200),
+
         req(admin, 'post', '/message/send', {'channel_id': chan_id},200,{'content-type':'text/plain'}, 'asdf'),
         req(admin, 'post', '/message/send', {'channel_id': 123}, 400, {'content-type': 'text/plain'}, 'asdf'),
         req(admin , 'post', '/message/send', {'channel_id': chan_id}, 200, {'content-type': 'image/png'}, 'asdf'),
         req(admin , 'post', '/message/send', {'channel_id': 123}, 400, {'content-type': 'image/png'}, 'asdf'),
         req(admin, 'get', '/message/recent', {'channel_id': chan_id, 'limit': 20}, 200, verbose=True),
         req(admin, 'get', '/message/recent', {'channel_id': 123, 'limit': 20}, 404),
+        
         req(admin, 'get', '/members/me', {}, 200),
         req(admin, 'get', '/members/get_online', {}, 200),
         req(admin, 'post', '/members/me/nickname', {'nick': f'randy-{now}'}, 200),
+
         req(admin , 'get', '/join', {'code': 123}, 404),
         req(admin , "get", "/meta", {}, 200),
+        
         req(admin, 'get', '/neighbor/list', {}, 200),
         req(admin,'post', '/neighbor/add', {}, 200, body=to_json(tmp_neighbor)),
         req(admin, 'get', '/neighbor/list', {}, 200, verbose=True),
@@ -146,7 +170,10 @@ if __name__ == '__main__':
         req(admin, 'delete', '/neighbor/delete', {'url':'fake'}, 200),
         req(admin, 'delete', '/neighbor/delete', {'url': str(now)}, 200),
         req(admin, 'get', '/neighbor/list', {}, 200, verbose=True),
+
     ])
+    badges_col = badge_tests(admin)
+    requests.extend(badges_col)
 
     # add this after fire the generic tests
     inv_req_mk, inv_req_use = make_and_receive_invite(admin)
diff --git a/json-api/src/routes.rs b/json-api/src/routes.rs
index 12ee9d8..d957be1 100644
--- a/json-api/src/routes.rs
+++ b/json-api/src/routes.rs
@@ -23,7 +23,7 @@ pub const SELF_UPDATE_NICKNAME: Rstr= "/members/me/nickname";
 // BADGE ROUTES
 pub const NEW_BADGE: Rstr          = "/badge/new";
 pub const DELETE_BADGE: Rstr       = "/badge/delete";
-pub const LIST_BADGE: Rstr         = "/badges/list";
+pub const LIST_BADGE: Rstr         = "/badge/list";
 pub const UPDATE_COLOR_BADGE: Rstr       = "/badge/update/color";
 pub const UPDATE_NAME_BADGE: Rstr        = "/badge/update/name";
 pub const UPDATE_PERMS_BADGE: Rstr       = "/badge/update/perms";