opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-19 10:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix `test_page_encoding` test

Browse Source 
Don't assume that the history has unencoded id 1.

Broken by commit 85630e2ca9 .

Fix the following error:

```
______________ TestPageJsonEncodingIntegration.test_page_encoding ______________

self = <integration.test_page_revision_json_encoding.TestPageJsonEncodingIntegration object at 0x7fe178521190>
history_id = '529fd61ab1c6cc36'

    def test_page_encoding(self, history_id: str):
        request = dict(
            slug="mypage",
            title="MY PAGE",
            content=f"""<p>Page!<div class="embedded-item" id="History-{history_id}"></div></p>""",
        )
        page_response = self._post("pages", request, json=True)
        api_asserts.assert_status_code_is_ok(page_response)
        sa_session = self._app.model.session
        page_revision = sa_session.scalars(select(model.PageRevision).filter_by(content_format="html")).all()[0]
>       assert '''id="History-1"''' in page_revision.content, page_revision.content
E       AssertionError: <p>Page!</p><div class="embedded-item history placeholder" id="History-2"><p class="title">Embedded Galaxy History - 'test_history'</p><p class="content">[Do not edit this block; Galaxy will fill it in with the annotated History when it is displayed]</p></div><p></p>
E       assert 'id="History-1"' in '<p>Page!</p><div class="embedded-item history placeholder" id="History-2"><p class="title">Embedded Galaxy History - \'test_history\'</p><p class="content">[Do not edit this block; Galaxy will fill it in with the annotated History when it is displayed]</p></div><p></p>'
E        +  where '<p>Page!</p><div class="embedded-item history placeholder" id="History-2"><p class="title">Embedded Galaxy History - \'test_history\'</p><p class="content">[Do not edit this block; Galaxy will fill it in with the annotated History when it is displayed]</p></div><p></p>' = <galaxy.model.PageRevision(1) at 0x7fe0d74d81d0>.content

test/integration/test_page_revision_json_encoding.py:33: AssertionError
```
This commit is contained in:
Nicola Soranzo
2024-03-04 14:40:11 +00:00
parent 73d5032d1b
commit 031a8599ae
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/integration/test_page_revision_json_encoding.py
+5 -2
View File
@@ -5,6 +5,8 @@ the security parameter to encode IDs may be changed by admins). Test case also v
exported API values are encoded though.
"""
import re
from sqlalchemy import select
from galaxy import model
@@ -21,6 +23,7 @@ class TestPageJsonEncodingIntegration(integration_util.IntegrationTestCase):
self.dataset_populator = DatasetPopulator(self.galaxy_interactor)
def test_page_encoding(self, history_id: str):
history_num_re = re.compile(r'id="History-\d+"')
request = dict(
slug="mypage",
title="MY PAGE",
@@ -30,13 +33,13 @@ class TestPageJsonEncodingIntegration(integration_util.IntegrationTestCase):
api_asserts.assert_status_code_is_ok(page_response)
sa_session = self._app.model.session
page_revision = sa_session.scalars(select(model.PageRevision).filter_by(content_format="html")).all()[0]
assert '''id="History-1"''' in page_revision.content, page_revision.content
assert history_num_re.search(page_revision.content), page_revision.content
assert f'''id="History-{history_id}"''' not in page_revision.content, page_revision.content
show_page_response = self._get("pages/{}".format(page_response.json()["id"]))
api_asserts.assert_status_code_is_ok(show_page_response)
content = show_page_response.json()["content"]
assert '''id="History-1"''' not in content, content
assert not history_num_re.search(content), content
assert f'''id="History-{history_id}"''' in content, content
def test_page_encoding_markdown(self, history_id: str):