Page MenuHomeSoftware Heritage

D2660.id9569.diff
No OneTemporary

D2660.id9569.diff

diff --git a/swh/web/browse/views/directory.py b/swh/web/browse/views/directory.py
--- a/swh/web/browse/views/directory.py
+++ b/swh/web/browse/views/directory.py
@@ -129,8 +129,10 @@
'revision_id': None
}
- swh_ids = get_swh_persistent_ids([{'type': 'directory',
- 'id': sha1_git}])
+ swh_objects = [{'type': 'directory', 'id': sha1_git}]
+
+ swh_ids = get_swh_persistent_ids(
+ swh_objects=swh_objects, snapshot_context=snapshot_context)
heading = 'Directory - %s' % sha1_git
if breadcrumbs:
@@ -155,7 +157,7 @@
'swh_ids': swh_ids})
-@browse_route(r'directory/resolve/content-path/(?P<sha1_git>[0-9a-f]+)/(?P<path>.+)/', # noqa
+@browse_route(r'directory/resolve/content-path/(?P<sha1_git>[0-9a-f]+)/(?P<path>.+)/', # noqa
view_name='browse-directory-resolve-content-path',
checksum_args=['sha1_git'])
def _directory_resolve_content_path(request, sha1_git, path):
diff --git a/swh/web/tests/browse/views/test_directory.py b/swh/web/tests/browse/views/test_directory.py
--- a/swh/web/tests/browse/views/test_directory.py
+++ b/swh/web/tests/browse/views/test_directory.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2019 The Software Heritage developers
+# Copyright (C) 2017-2020 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution
# License: GNU Affero General Public License version 3, or any later version
# See top-level LICENSE file for more information
@@ -60,6 +60,19 @@
assert resp['location'] == redirect_url
+@given(directory())
+def test_permalink_box_context(client, tests_data, directory):
+ origin_url = random.choice(tests_data['origins'])['url']
+ url = reverse('browse-directory',
+ url_args={'sha1_git': directory},
+ query_params={'origin': origin_url})
+
+ resp = client.get(url)
+
+ assert resp.status_code == 200
+ assert_contains(resp, 'id="swh-id-option-origin-directory"')
+
+
def _directory_view(client, root_directory_sha1, directory_entries,
path=None):
dirs = [e for e in directory_entries if e['type'] in ('dir', 'rev')]

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 3, 3:34 PM (1 w, 2 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3214207

Event Timeline