Merge branch 'master' into dependabot/npm_and_yarn/tests/e2e/npm_and_yarn-47ce2aa328

Author: odeimaiz

services/web/server/src/simcore_service_webserver/application_settings.py

@@ -303,7 +303,6 @@ class ApplicationSettings(BaseApplicationSettings, MixinLoggingSettings):
             description="Enables real-time collaboration features",
             json_schema_extra={
                 "auto_default_from_env": True,
-                _X_FEATURE_UNDER_DEVELOPMENT: True,
             },
         ),
     ]

services/web/server/tests/unit/with_dbs/02/conftest.py

@@ -493,10 +493,20 @@ def max_number_of_user_sessions(faker: Faker) -> int:
     return faker.pyint(min_value=1, max_value=5)
 
 
+@pytest.fixture
+def with_disabled_rtc_collaboration(
+    app_environment: EnvVarsDict,  # ensure pre-app startup envs
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    setenvs_from_dict(
+        monkeypatch,
+        {"WEBSERVER_REALTIME_COLLABORATION": "null"},
+    )
+
+
 @pytest.fixture
 def with_enabled_rtc_collaboration(
-    app_environment: EnvVarsDict,
-    with_dev_features_enabled: None,
+    app_environment: EnvVarsDict,  # ensure pre-app startup envs
     monkeypatch: pytest.MonkeyPatch,
     max_number_of_user_sessions: int,
 ) -> None:
@@ -512,8 +522,7 @@ def with_enabled_rtc_collaboration(
 
 @pytest.fixture
 def with_enabled_rtc_collaboration_limited_to_1_user(
-    app_environment: EnvVarsDict,
-    with_dev_features_enabled: None,
+    app_environment: EnvVarsDict,  # ensure pre-app startup envs
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     setenvs_from_dict(

services/web/server/tests/unit/with_dbs/02/test_projects_states_handlers.py

@@ -1151,6 +1151,7 @@ async def test_close_project(
     ],
 )
 async def test_get_active_project(
+    with_disabled_rtc_collaboration: None,
     client: TestClient,
     logged_user: UserInfoDict,
     user_project: ProjectDict,
@@ -1171,6 +1172,7 @@ async def test_get_active_project(
         if expected == status.HTTP_200_OK:
             pytest.fail("socket io connection should not fail")
     assert client.app
+
     # get active projects -> empty
     get_active_projects_url = (
         client.app.router["get_active_project"]
@@ -1795,6 +1797,7 @@ async def test_closing_and_reopening_tab_of_opened_project_multiple_users(
 
 @pytest.mark.parametrize(*standard_user_role_response())
 async def test_open_shared_project_2_users_locked_remove_once_rtc_collaboration_is_defaulted(
+    with_disabled_rtc_collaboration: None,
     client: TestClient,
     client_on_running_server_factory: Callable[[], TestClient],
     logged_user: dict,
@@ -2035,6 +2038,7 @@ async def test_open_shared_project_2_users_locked_remove_once_rtc_collaboration_
 
 @pytest.mark.parametrize(*standard_user_role_response())
 async def test_open_shared_project_at_same_time(
+    with_disabled_rtc_collaboration: None,
     client: TestClient,
     client_on_running_server_factory: Callable[[], TestClient],
     logged_user: dict,