',
count=len(origin_branches))
url_args['path'] = content_path
for branch in origin_branches:
root_dir_branch_url = \
reverse('browse-origin-content',
kwargs=url_args,
query_params={'branch': branch['name']})
self.assertContains(resp, '%s' %
(root_dir_branch_url, branch['name']))
@patch('swh.web.browse.views.origin.get_origin_visits')
@patch('swh.web.browse.views.origin.get_origin_visit_branches')
@patch('swh.web.browse.views.origin.service')
@patch('swh.web.browse.views.origin.request_content')
@istest
def origin_content_view(self, mock_request_content, mock_service,
mock_get_origin_visit_branches,
mock_get_origin_visits):
mock_get_origin_visits.return_value = stub_content_origin_visits
mock_get_origin_visit_branches.return_value = stub_content_origin_branches # noqa
mock_service.lookup_directory_with_path.return_value = \
{'target': stub_content_text_sha1}
mock_request_content.return_value = stub_content_text_data, 'text/x-c++' # noqa
self.origin_content_view_test(stub_content_origin_id,
stub_content_origin_visits,
stub_content_origin_branches,
stub_content_origin_branch,
stub_content_root_dir,
stub_content_text_sha1,
stub_content_text_path,
stub_content_text_data, 'cpp')
self.origin_content_view_test(stub_content_origin_id,
stub_content_origin_visits,
stub_content_origin_branches,
stub_content_origin_branch,
stub_content_root_dir,
stub_content_text_sha1,
stub_content_text_path,
stub_content_text_data, 'cpp',
visit_id=stub_content_origin_visit_id)
self.origin_content_view_test(stub_content_origin_id,
stub_content_origin_visits,
stub_content_origin_branches,
stub_content_origin_branch,
stub_content_root_dir,
stub_content_text_sha1,
stub_content_text_path,
stub_content_text_data, 'cpp',
ts=stub_content_origin_visit_ts)
@nottest
def origin_directory_view(self, origin_id, origin_visits,
origin_branches, origin_branch,
root_directory_sha1, directory_entries,
visit_id=None, ts=None, path=None):
dirs = [e for e in directory_entries
if e['type'] == 'dir']
files = [e for e in directory_entries
if e['type'] == 'file']
if not visit_id:
visit_id = origin_visits[-1]['visit']
url_args = {'origin_id': origin_id}
if ts:
- url_args['ts'] = ts
+ url_args['timestamp'] = ts
else:
url_args['visit_id'] = visit_id
if path:
url_args['path'] = path
url = reverse('browse-origin-directory',
kwargs=url_args)
resp = self.client.get(url)
self.assertEquals(resp.status_code, 200)
self.assertTemplateUsed('directory.html')
self.assertContains(resp, '| ',
count=len(dirs))
self.assertContains(resp, ' | ',
count=len(files))
for d in dirs:
dir_path = d['name']
if path:
dir_path = "%s/%s" % (path, d['name'])
dir_url_args = dict(url_args)
dir_url_args['path'] = dir_path
dir_url = reverse('browse-origin-directory',
kwargs=dir_url_args,
query_params={'branch': origin_branch}) # noqa
self.assertContains(resp, dir_url)
for f in files:
file_path = f['name']
if path:
file_path = "%s/%s" % (path, f['name'])
file_url_args = dict(url_args)
file_url_args['path'] = file_path
file_url = reverse('browse-origin-content',
kwargs=file_url_args,
query_params={'branch': origin_branch}) # noqa
self.assertContains(resp, file_url)
if 'path' in url_args:
del url_args['path']
root_dir_branch_url = \
reverse('browse-origin-directory',
kwargs=url_args,
query_params={'branch': origin_branch})
nb_bc_paths = 1
if path:
nb_bc_paths = len(path.split('/')) + 1
self.assertContains(resp, '', count=nb_bc_paths)
self.assertContains(resp, '%s' %
(root_dir_branch_url,
root_directory_sha1[:7]))
self.assertContains(resp, '',
count=len(origin_branches))
if path:
url_args['path'] = path
for branch in origin_branches:
root_dir_branch_url = \
reverse('browse-origin-directory',
kwargs=url_args,
query_params={'branch': branch['name']})
self.assertContains(resp, '%s' %
(root_dir_branch_url, branch['name']))
@patch('swh.web.browse.views.origin.get_origin_visits')
@patch('swh.web.browse.views.origin.get_origin_visit_branches')
@patch('swh.web.browse.utils.service')
@istest
def origin_root_directory_view(self, mock_service,
mock_get_origin_visit_branches,
mock_get_origin_visits):
mock_get_origin_visits.return_value = stub_origin_visits
mock_get_origin_visit_branches.return_value = stub_origin_branches
mock_service.lookup_directory.return_value = \
stub_origin_root_directory_entries
self.origin_directory_view(stub_origin_id, stub_origin_visits,
stub_origin_branches,
stub_origin_master_branch,
stub_origin_root_directory_sha1,
stub_origin_root_directory_entries)
self.origin_directory_view(stub_origin_id, stub_origin_visits,
stub_origin_branches,
stub_origin_master_branch,
stub_origin_root_directory_sha1,
stub_origin_root_directory_entries,
visit_id=stub_visit_id)
self.origin_directory_view(stub_origin_id, stub_origin_visits,
stub_origin_branches,
stub_origin_master_branch,
stub_origin_root_directory_sha1,
stub_origin_root_directory_entries,
ts=stub_visit_ts)
@patch('swh.web.browse.views.origin.get_origin_visits')
@patch('swh.web.browse.views.origin.get_origin_visit_branches')
@patch('swh.web.browse.utils.service')
@patch('swh.web.browse.views.origin.service')
@istest
def origin_sub_directory_view(self, mock_origin_service,
mock_utils_service,
mock_get_origin_visit_branches,
mock_get_origin_visits):
mock_get_origin_visits.return_value = stub_origin_visits
mock_get_origin_visit_branches.return_value = stub_origin_branches
mock_utils_service.lookup_directory.return_value = \
stub_origin_sub_directory_entries
mock_origin_service.lookup_directory_with_path.return_value = \
{'target': '120c39eeb566c66a77ce0e904d29dfde42228adb'}
self.origin_directory_view(stub_origin_id, stub_origin_visits,
stub_origin_branches,
stub_origin_master_branch,
stub_origin_root_directory_sha1,
stub_origin_sub_directory_entries,
path=stub_origin_sub_directory_path)
self.origin_directory_view(stub_origin_id, stub_origin_visits,
stub_origin_branches,
stub_origin_master_branch,
stub_origin_root_directory_sha1,
stub_origin_sub_directory_entries,
visit_id=stub_visit_id,
path=stub_origin_sub_directory_path)
self.origin_directory_view(stub_origin_id, stub_origin_visits,
stub_origin_branches,
stub_origin_master_branch,
stub_origin_root_directory_sha1,
stub_origin_sub_directory_entries,
ts=stub_visit_ts,
path=stub_origin_sub_directory_path)
diff --git a/swh/web/urls.py b/swh/web/urls.py
index 62654233..3cda50e7 100644
--- a/swh/web/urls.py
+++ b/swh/web/urls.py
@@ -1,50 +1,27 @@
# Copyright (C) 2017 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution
# License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information
-"""swhweb URL Configuration
-
-The :data:`urlpatterns` list routes URLs to views. For more information please
- see: https://docs.djangoproject.com/en/1.11/topics/http/urls/
-
-Examples:
-
-- Function views:
-
- 1. Add an import: ``from my_app import views``
- 2. Add a URL to urlpatterns: ``url(r'^$', views.home, name='home')``
-
-- Class-based views:
-
- 1. Add an import: ``from other_app.views import Home``
- 2. Add a URL to urlpatterns: ``url(r'^$', Home.as_view(), name='home')``
-
-- Including another URLconf:
-
- 1. Import the include function: ``from django.conf.urls import url, include``
- 2. Add a URL to urlpatterns: ``url(r'^blog/', include('blog.urls'))``
-
-"""
from django.conf.urls import url, include
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from django.shortcuts import redirect
from django.views.generic.base import RedirectView
favicon_view = RedirectView.as_view(url='/static/img/icons/swh-logo-32x32.png',
permanent=True)
def default_view(request):
return redirect('api_homepage')
urlpatterns = [
url(r'^favicon\.ico$', favicon_view),
url(r'^api/', include('swh.web.api.urls')),
url(r'^browse/', include('swh.web.browse.urls')),
url(r'^$', default_view),
]
urlpatterns += staticfiles_urlpatterns()
diff --git a/swh/web/wsgi.py b/swh/web/wsgi.py
index 5177b9ac..9eee6ac1 100644
--- a/swh/web/wsgi.py
+++ b/swh/web/wsgi.py
@@ -1,21 +1,12 @@
# Copyright (C) 2017 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution
# License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information
-"""
-WSGI config for swhweb project.
-
-It exposes the WSGI callable as a module-level variable named ``application``.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/
-"""
-
import os
from django.core.wsgi import get_wsgi_application
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "swh.web.settings.production")
application = get_wsgi_application()
|