Backups, remote repository: adapt functional tests

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

Reviewed-by: James Valleroy <jvalleroy@mailbox.org>

functional_tests/step_definitions/system.py

@@ -183,7 +183,7 @@ def backup_create(browser, app_name):
 
 @when(parsers.parse('I download the {app_name:w} app data backup'))
 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
     file_path = system.download_file_logged_in(browser, url, app_name,
                                                suffix='.tar.gz')

functional_tests/support/system.py

@@ -191,7 +191,7 @@ def backup_create(browser, app_name):
     browser.visit(default_url)
     application.install(browser, 'backups')
     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:
         delete.first.click()
         submit(browser)
@@ -211,7 +211,7 @@ def backup_restore(browser, app_name):
     browser.visit(default_url)
     nav_to_module(browser, 'backups')
     browser.find_link_by_href(
-        '/plinth/sys/backups/restore-archive/_functional_test_' +
+        '/plinth/sys/backups/restore-archive/root/_functional_test_' +
         app_name + '/').first.click()
     with wait_for_page_update(browser, expected_url='/plinth/sys/backups/'):
         submit(browser)
@@ -270,7 +270,7 @@ def pagekite_configure(browser, host, port, kite_name, kite_secret):
     """Configure pagekite basic parameters."""
     nav_to_module(browser, 'pagekite')
     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_port', str(port))
     browser.fill('pagekite-kite_name', kite_name)

plinth/modules/backups/templates/backups_repository.inc

@@ -82,7 +82,7 @@
           <td class="archive-name">{{ archive.name }}</td>
           <td class="archive-operations">
             <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" %}
             </a>
             <a class="archive-export btn btn-sm btn-default"

plinth/modules/backups/urls.py

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

plinth/modules/backups/views.py

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