nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-20 10:34:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backups, remote repository: adapt functional tests

Browse Source 
- fix functional tests of backups
- rename export-and-download url to download

Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Michael Pimmer 2018-11-30 18:30:38 +00:00 committed by James Valleroy
parent 3c24c9d63b
commit 13e8ae1bb2
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functional_tests/step_definitions/system.py
View File

@ -183,7 +183,7 @@ def backup_create(browser, app_name):
@when(parsers.parse('I download the {app_name:w} app data backup')) @when(parsers.parse('I download the {app_name:w} app data backup'))
def backup_download(browser, app_name, downloaded_file_info): def backup_download(browser, app_name, downloaded_file_info):
url = '/plinth/sys/backups/export-and-download/_functional_test_%s/' % \ url = '/plinth/sys/backups/download/root/_functional_test_%s/' % \
app_name app_name
file_path = system.download_file_logged_in(browser, url, app_name, file_path = system.download_file_logged_in(browser, url, app_name,
suffix='.tar.gz') suffix='.tar.gz')

6
functional_tests/support/system.py
View File

@ -191,7 +191,7 @@ def backup_create(browser, app_name):
browser.visit(default_url) browser.visit(default_url)
application.install(browser, 'backups') application.install(browser, 'backups')
delete = browser.find_link_by_href( delete = browser.find_link_by_href(
'/plinth/sys/backups/delete/_functional_test_' + app_name + '/') '/plinth/sys/backups/delete/root/_functional_test_' + app_name + '/')
if delete: if delete:
delete.first.click() delete.first.click()
submit(browser) submit(browser)
@ -211,7 +211,7 @@ def backup_restore(browser, app_name):
browser.visit(default_url) browser.visit(default_url)
nav_to_module(browser, 'backups') nav_to_module(browser, 'backups')
browser.find_link_by_href( browser.find_link_by_href(
'/plinth/sys/backups/restore-archive/_functional_test_' + '/plinth/sys/backups/restore-archive/root/_functional_test_' +
app_name + '/').first.click() app_name + '/').first.click()
with wait_for_page_update(browser, expected_url='/plinth/sys/backups/'): with wait_for_page_update(browser, expected_url='/plinth/sys/backups/'):
submit(browser) submit(browser)
@ -270,7 +270,7 @@ def pagekite_configure(browser, host, port, kite_name, kite_secret):
"""Configure pagekite basic parameters.""" """Configure pagekite basic parameters."""
nav_to_module(browser, 'pagekite') nav_to_module(browser, 'pagekite')
browser.find_link_by_href('/plinth/sys/pagekite/configure/').first.click() browser.find_link_by_href('/plinth/sys/pagekite/configure/').first.click()
#time.sleep(0.250) # Wait for 200ms show animation to complete # time.sleep(0.250) # Wait for 200ms show animation to complete
browser.fill('pagekite-server_domain', host) browser.fill('pagekite-server_domain', host)
browser.fill('pagekite-server_port', str(port)) browser.fill('pagekite-server_port', str(port))
browser.fill('pagekite-kite_name', kite_name) browser.fill('pagekite-kite_name', kite_name)

2
plinth/modules/backups/templates/backups_repository.inc
View File

@ -82,7 +82,7 @@
<td class="archive-name">{{ archive.name }}</td> <td class="archive-name">{{ archive.name }}</td>
<td class="archive-operations"> <td class="archive-operations">
<a class="archive-export btn btn-sm btn-default" target="_blank" <a class="archive-export btn btn-sm btn-default" target="_blank"
href="{% url 'backups:export-and-download' uuid archive.name %}"> href="{% url 'backups:download' uuid archive.name %}">
{% trans "Download" %} {% trans "Download" %}
</a> </a>
<a class="archive-export btn btn-sm btn-default" <a class="archive-export btn btn-sm btn-default"

6
plinth/modules/backups/urls.py
View File

@ -21,15 +21,15 @@ URLs for the backups module.
from django.conf.urls import url from django.conf.urls import url
from .views import IndexView, CreateArchiveView, AddRepositoryView, \ from .views import IndexView, CreateArchiveView, AddRepositoryView, \
DeleteArchiveView, ExportAndDownloadView, RemoveRepositoryView, \ DeleteArchiveView, DownloadArchiveView, RemoveRepositoryView, \
mount_repository, umount_repository, UploadArchiveView, \ mount_repository, umount_repository, UploadArchiveView, \
RestoreArchiveView, RestoreFromUploadView, TestRepositoryView RestoreArchiveView, RestoreFromUploadView, TestRepositoryView
urlpatterns = [ urlpatterns = [
url(r'^sys/backups/$', IndexView.as_view(), name='index'), url(r'^sys/backups/$', IndexView.as_view(), name='index'),
url(r'^sys/backups/create/$', CreateArchiveView.as_view(), name='create'), url(r'^sys/backups/create/$', CreateArchiveView.as_view(), name='create'),
url(r'^sys/backups/export-and-download/(?P<uuid>[^/]+)/(?P<name>[^/]+)/$', url(r'^sys/backups/download/(?P<uuid>[^/]+)/(?P<name>[^/]+)/$',
ExportAndDownloadView.as_view(), name='export-and-download'), DownloadArchiveView.as_view(), name='download'),
url(r'^sys/backups/delete/(?P<uuid>[^/]+)/(?P<name>[^/]+)/$', url(r'^sys/backups/delete/(?P<uuid>[^/]+)/(?P<name>[^/]+)/$',
DeleteArchiveView.as_view(), name='delete'), DeleteArchiveView.as_view(), name='delete'),
url(r'^sys/backups/upload/$', UploadArchiveView.as_view(), name='upload'), url(r'^sys/backups/upload/$', UploadArchiveView.as_view(), name='upload'),

2
plinth/modules/backups/views.py
View File

@ -250,7 +250,7 @@ class RestoreArchiveView(BaseRestoreView):
return super().form_valid(form) return super().form_valid(form)
class ExportAndDownloadView(View): class DownloadArchiveView(View):
"""View to export and download an archive as stream.""" """View to export and download an archive as stream."""
def get(self, request, uuid, name): def get(self, request, uuid, name):
repository = get_repository(uuid) repository = get_repository(uuid)