From 69a9ecc47eadbe02ef8dee081a6f26ea9e869a27 Mon Sep 17 00:00:00 2001
From: workaryangupta <work.aryangupta@gmail.com>
Date: Thu, 4 Jul 2024 00:49:44 +0530
Subject: [PATCH] fixed more failing tests since ext is no longer a part of
 uploaded file paths

---
 tests/_test_mscolab/test_file_manager.py    | 10 +++++-----
 tests/_test_mscolab/test_server.py          |  1 -
 tests/_test_mscolab/test_sockets_manager.py |  1 -
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/tests/_test_mscolab/test_file_manager.py b/tests/_test_mscolab/test_file_manager.py
index caa6e69fd..0466ac48b 100644
--- a/tests/_test_mscolab/test_file_manager.py
+++ b/tests/_test_mscolab/test_file_manager.py
@@ -31,7 +31,7 @@
 from werkzeug.datastructures import FileStorage
 
 from mslib.mscolab.models import Operation, User
-from mslib.mscolab.seed import add_user, get_user, add_operation, add_user_to_operation
+from mslib.mscolab.seed import add_user, get_user, add_operation
 
 
 class Test_FileManager:
@@ -41,7 +41,6 @@ def setup(self, mscolab_app, mscolab_managers):
         _, _, self.fm = mscolab_managers
         self.userdata = 'UV10@uv10', 'UV10', 'uv10'
         self.anotheruserdata = 'UV20@uv20', 'UV20', 'uv20'
-        self.operation_name = "europe"
 
         assert add_user(self.userdata[0], self.userdata[1], self.userdata[2])
         self.user = get_user(self.userdata[0])
@@ -61,8 +60,6 @@ def setup(self, mscolab_app, mscolab_managers):
         assert add_user('UV80@uv80', 'UV80', 'uv80')
         self.adminuser = get_user('UV80@uv80')
         self._example_data()
-        assert add_operation(self.operation_name, "test europe")
-        assert add_user_to_operation(path=self.operation_name, emailid=self.userdata[0])
         with self.app.app_context():
             yield
 
@@ -257,11 +254,14 @@ def test_upload_chat_attachment(self):
         Tests the chat feature to upload files.
         i.e. it tests the upload_file method of file manager in case of it being used to upload a chat attachment
         '''
+        operation_name = "europe"
+        assert add_operation(operation_name, "test europe")
+        operation = Operation.query.filter_by(path=operation_name).first()
+
         sample_path = os.path.join(os.path.dirname(__file__), "..", "data")
         filename = "example.csv"
         name, _ = filename.split('.')
         open_csv = os.path.join(sample_path, "example.csv")
-        operation = Operation.query.filter_by(path=self.operation_name).first()
         with open(open_csv, 'rb') as fp:
             file = FileStorage(fp, filename=filename, content_type="text/csv")
             static_path = self.fm.upload_file(file, subfolder=str(operation.id), identifier=None)
diff --git a/tests/_test_mscolab/test_server.py b/tests/_test_mscolab/test_server.py
index 680364a4b..ab916418d 100644
--- a/tests/_test_mscolab/test_server.py
+++ b/tests/_test_mscolab/test_server.py
@@ -161,7 +161,6 @@ def test_message_attachment(self):
             assert response.status_code == 200
             data = json.loads(response.data.decode('utf-8'))
             pfn = data["path"]
-            assert "txt" in pfn
             assert "uploads" in pfn
 
     def test_uploads(self):
diff --git a/tests/_test_mscolab/test_sockets_manager.py b/tests/_test_mscolab/test_sockets_manager.py
index cdffb9303..a71a4c720 100644
--- a/tests/_test_mscolab/test_sockets_manager.py
+++ b/tests/_test_mscolab/test_sockets_manager.py
@@ -305,4 +305,3 @@ def test_upload_file(self):
         assert os.path.exists(upload_dir)
         file = os.listdir(upload_dir)[0]
         assert 'mss-logo' in file
-        assert 'png' in file