|
67 | 67 | from simcore_postgres_database.models.products import products |
68 | 68 | from simcore_postgres_database.models.wallets import wallets |
69 | 69 | from simcore_service_webserver._meta import API_VTAG |
70 | | -from simcore_service_webserver.application_settings import get_application_settings |
71 | 70 | from simcore_service_webserver.db.models import UserRole |
72 | 71 | from simcore_service_webserver.projects.models import ProjectDict |
73 | 72 | from simcore_service_webserver.socketio.messages import SOCKET_IO_PROJECT_UPDATED_EVENT |
@@ -1152,6 +1151,7 @@ async def test_close_project( |
1152 | 1151 | ], |
1153 | 1152 | ) |
1154 | 1153 | async def test_get_active_project( |
| 1154 | + with_disabled_rtc_collaboration: None, |
1155 | 1155 | client: TestClient, |
1156 | 1156 | logged_user: UserInfoDict, |
1157 | 1157 | user_project: ProjectDict, |
@@ -1199,25 +1199,7 @@ async def test_get_active_project( |
1199 | 1199 | client.app, ProjectID(user_project["uuid"]) |
1200 | 1200 | ) |
1201 | 1201 | assert not error |
1202 | | - |
1203 | | - # The realtime collaboration feature unlocks the projects since they can be edited by multiple users simultaneously |
1204 | | - realtime_collaboration_settings = get_application_settings( |
1205 | | - client.app |
1206 | | - ).WEBSERVER_REALTIME_COLLABORATION |
1207 | | - realtime_collaboration_enabled = ( |
1208 | | - realtime_collaboration_settings |
1209 | | - and realtime_collaboration_settings.RTC_MAX_NUMBER_OF_USERS |
1210 | | - and realtime_collaboration_settings.RTC_MAX_NUMBER_OF_USERS > 1 |
1211 | | - ) |
1212 | | - |
1213 | | - share_state_locked = ProjectStateOutputSchema( |
1214 | | - **data.pop("state") |
1215 | | - ).share_state.locked |
1216 | | - assert ( |
1217 | | - not share_state_locked |
1218 | | - if realtime_collaboration_enabled |
1219 | | - else share_state_locked |
1220 | | - ) |
| 1202 | + assert ProjectStateOutputSchema(**data.pop("state")).share_state.locked |
1221 | 1203 | data.pop("folderId") |
1222 | 1204 |
|
1223 | 1205 | user_project_last_change_date = user_project.pop("lastChangeDate") |
@@ -1815,6 +1797,7 @@ async def test_closing_and_reopening_tab_of_opened_project_multiple_users( |
1815 | 1797 |
|
1816 | 1798 | @pytest.mark.parametrize(*standard_user_role_response()) |
1817 | 1799 | async def test_open_shared_project_2_users_locked_remove_once_rtc_collaboration_is_defaulted( |
| 1800 | + with_disabled_rtc_collaboration: None, |
1818 | 1801 | client: TestClient, |
1819 | 1802 | client_on_running_server_factory: Callable[[], TestClient], |
1820 | 1803 | logged_user: dict, |
|
0 commit comments