merge main

cancervariants · Oct 2, 2024 · e0785dc · e0785dc
2 parents bda641b + 1a25af3
commit e0785dc
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 21 deletions.
diff --git a/client/src/components/Pages/Summary/Main/Summary.tsx b/client/src/components/Pages/Summary/Main/Summary.tsx
@@ -156,6 +156,8 @@ export const Summary: React.FC<Props> = ({ setVisibleTab }) => {
     setFormattedFusion(formattedFusion);
   }, [fusion]);
 
+  console.log(formattedFusion);
+
   return (
     <>
       {(!validationErrors || validationErrors.length === 0) &&

diff --git a/client/yarn.lock b/client/yarn.lock
@@ -2232,6 +2232,7 @@
     "@types/react-is" "^16.7.1 || ^17.0.0"
     prop-types "^15.8.1"
     react-is "^18.2.0"
+
 "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
   version "5.1.1-v1"
   resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
@@ -11025,9 +11026,9 @@ webidl-conversions@^6.1.0:
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
 webpack-dev-middleware@^5.3.1:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f"
-  integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
+  version "5.3.4"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517"
+  integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==
   dependencies:
     colorette "^2.0.10"
     memfs "^3.4.3"

diff --git a/server/tests/conftest.py b/server/tests/conftest.py
@@ -9,7 +9,7 @@
 from httpx import ASGITransport, AsyncClient
 
 
-@pytest_asyncio.fixture(scope="session")
+@pytest_asyncio.fixture
 def event_loop():
     """Create an instance of the event loop with session scope."""
     loop = asyncio.get_event_loop_policy().new_event_loop()
@@ -31,7 +31,7 @@ async def async_client():
 response_callback_type = Callable[[dict, dict], None]
 
 
-@pytest_asyncio.fixture(scope="session")
+@pytest_asyncio.fixture
 async def check_response(async_client):
     """Provide base response check function. Use in individual tests."""
 

diff --git a/server/tests/integration/test_constructors.py b/server/tests/integration/test_constructors.py
@@ -155,9 +155,18 @@ async def test_build_tx_segment_ec(
 
 
 @pytest.mark.asyncio()
-async def test_build_segment_gct(
-    check_response, check_tx_element_response, tpm3_tx_t_element
+async def test_build_segment_gc(
+    check_response, check_tx_element_response, tpm3_tx_g_element, tpm3_tx_t_element
 ):
+    """Test correct functioning of transcript segment element construction using
+    genomic coordinates and gene name.
+    """
+    await check_response(
+        "/api/construct/structural_element/tx_segment_gc?gene=TPM3&chromosome=NC_000001.11&start=154171416&end=154171417",
+        {"element": tpm3_tx_g_element},
+        check_tx_element_response,
+    )
+
     """Test correct functioning of transcript segment element construction using
     genomic coordinates and transcript.
     """
@@ -173,20 +182,6 @@ async def test_build_segment_gct(
     )
 
 
-@pytest.mark.asyncio()
-async def test_build_segment_gc(
-    check_response, check_tx_element_response, tpm3_tx_g_element
-):
-    """Test correct functioning of transcript segment element construction using
-    genomic coordinates and gene name.
-    """
-    await check_response(
-        "/api/construct/structural_element/tx_segment_gc?gene=TPM3&chromosome=NC_000001.11&start=154171416&end=154171417",
-        {"element": tpm3_tx_g_element},
-        check_tx_element_response,
-    )
-
-
 @pytest.mark.asyncio()
 async def test_build_reg_element(check_response, check_reg_element_response):
     """Test correctness of regulatory element constructor endpoint."""