Gherkin scenarios updates and corrections

.dockerignore

@@ -6,4 +6,4 @@ __pycache__
 *.pyc
 *.swp
 k8s/templates/
-cloudbuild-*.yaml
+cloudbuild-*.yaml

LICENSE

@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

bin/run_minio.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-
 import os
 import pathlib
 import subprocess
@@ -36,5 +35,3 @@
         raise Exception("Unhandled run_type type: {}".format(run_type))
 
     subprocess.check_call(cmd)
-
-

contentcuration/contentcuration/__init__.py

@@ -1,5 +1,5 @@
 from __future__ import absolute_import
 
+from .celery import app as celery_app  # noqa
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
-from .celery import app as celery_app  # noqa

contentcuration/contentcuration/collectstatic_settings.py

@@ -1,6 +1,5 @@
 # Settings  used by containers running collectstatic. Scope our services
 # to the only ones needed to run collectstatic.
-
 from .settings import *
 
 CACHES['default']['BACKEND'] = "django_prometheus.cache.backends.locmem.LocMemCache"

contentcuration/contentcuration/management/commands/setup_perftest_data.py

@@ -3,8 +3,8 @@
 
 from contentcuration.models import ContentNode
 from contentcuration.utils.db_tools import create_channel
-from contentcuration.utils.db_tools import TreeBuilder
 from contentcuration.utils.db_tools import create_user
+from contentcuration.utils.db_tools import TreeBuilder
 
 LICENSE = licenses.SPECIAL_PERMISSIONS
 

contentcuration/contentcuration/migration_production_settings.py

@@ -1,5 +1,4 @@
 # Settings used by migrations. This removes the need for Redis during migration jobs
-
 from .production_settings import *
 
 CACHES['default']['BACKEND'] = "django_prometheus.cache.backends.locmem.LocMemCache"

contentcuration/contentcuration/migrations/0003_copy_data.py

@@ -2,11 +2,11 @@
 # Generated by Django 1.11.15 on 2018-12-20 17:34
 from __future__ import unicode_literals
 
-from django.db import migrations
-
 import ast
 import json
 
+from django.db import migrations
+
 
 def forwards(apps, schema_editor):
     Channel = apps.get_model('contentcuration', 'channel')

contentcuration/contentcuration/migrations/0112_auto_20200613_0050.py

@@ -2,7 +2,8 @@
 # Generated by Django 1.11.20 on 2020-06-13 00:50
 from __future__ import unicode_literals
 
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

contentcuration/contentcuration/migrations/0113_channel_tagline.py

@@ -2,7 +2,8 @@
 # Generated by Django 1.11.20 on 2020-06-13 01:02
 from __future__ import unicode_literals
 
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

contentcuration/contentcuration/migrations/0120_auto_20210128_1646.py

@@ -2,9 +2,11 @@
 # Generated by Django 1.11.29 on 2021-01-28 16:46
 from __future__ import unicode_literals
 
-import contentcuration.models
-from django.db import migrations, models
 import django.db.models.functions.text
+from django.db import migrations
+from django.db import models
+
+import contentcuration.models
 
 
 class Migration(migrations.Migration):

contentcuration/contentcuration/migrations/0129_auto_20210519_2213.py

@@ -1,7 +1,7 @@
 # Generated by Django 3.2.3 on 2021-05-19 22:13
-
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

contentcuration/contentcuration/perftools/objective.py

@@ -1,8 +1,10 @@
 import sys
-# TODO: Investigate more precise timing libraries
 import time
 
-from contentcuration.models import ContentKind, ContentNode, File
+from contentcuration.models import ContentKind
+from contentcuration.models import ContentNode
+from contentcuration.models import File
+# TODO: Investigate more precise timing libraries
 
 def print_progress(text):
     sys.stdout.write("\r" + text)

contentcuration/contentcuration/statistics.py

@@ -1,6 +1,7 @@
 # Functions for recording various statistics
-import newrelic.agent
 from builtins import next
+
+import newrelic.agent
 from le_utils.constants import content_kinds
 
 

contentcuration/contentcuration/templates/permissions/permissions_email_subject.txt

@@ -1 +1 @@
-{% load i18n %}{% if share_mode == 'edit' %}{% blocktrans with channel=channel %}You've been invited to edit {{ channel }}{% endblocktrans %}{% else %}{% blocktrans with channel=channel %}You've been invited to view {{ channel }}{% endblocktrans %}{% endif %}
+{% load i18n %}{% if share_mode == 'edit' %}{% blocktrans with channel=channel %}You've been invited to edit {{ channel }}{% endblocktrans %}{% else %}{% blocktrans with channel=channel %}You've been invited to view {{ channel }}{% endblocktrans %}{% endif %}

contentcuration/contentcuration/templates/perseus/exercise.json

@@ -1 +1 @@
-{{exercise | safe}}
+{{exercise | safe}}

contentcuration/contentcuration/templates/registration/custom_email_subject.txt

@@ -1 +1 @@
-{% load i18n %} {{ subject }}
+{% load i18n %} {{ subject }}

contentcuration/contentcuration/templates/registration/registration_information_email.txt

@@ -11,4 +11,4 @@ Storage Needed: {{information.space_needed}}{% endif %}
 Location(s): {{information.locations | join:", "}}
 Heard about us from: {{information.heard_from}}
 
-{% endautoescape %}
+{% endautoescape %}

contentcuration/contentcuration/templatetags/perseus_tags.py

@@ -1,4 +1,5 @@
 import json
+
 from django import template
 from django.template.defaultfilters import stringfilter
 

contentcuration/contentcuration/tests/test_secrettoken_model.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-
 from django.test import TestCase
 from le_utils import proquint
 

contentcuration/contentcuration/tests/utils/__init__.py

@@ -1,8 +1,10 @@
 #!/usr/bin/env python
 import sys
-from .migration_test_case import *  # noqa
+
 import pytest
 from mixer.backend.django import mixer
+
+from .migration_test_case import *  # noqa
 from contentcuration.models import ContentNode
 
 # Mark the test class or function as a slow test, where we avoid running it

contentcuration/contentcuration/tests/utils/migration_test_case.py

@@ -1,5 +1,5 @@
-from django.db import connection
 from django.core import management
+from django.db import connection
 from django.db.migrations.executor import MigrationExecutor
 from django.test import TransactionTestCase
 

contentcuration/contentcuration/views/json_dump.py

@@ -1,4 +1,5 @@
 import json
+
 from rest_framework.renderers import JSONRenderer
 
 """

contentcuration/kolibri_content/migrations/0003_contentnode_coach_content.py

@@ -2,7 +2,8 @@
 # Generated by Django 1.9.13 on 2018-03-28 00:14
 from __future__ import unicode_literals
 
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

contentcuration/kolibri_content/migrations/0007_auto_20200613_0050.py

@@ -2,7 +2,8 @@
 # Generated by Django 1.11.20 on 2020-06-13 00:50
 from __future__ import unicode_literals
 
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

contentcuration/kolibri_content/migrations/0008_channelmetadata_tagline.py

@@ -2,7 +2,8 @@
 # Generated by Django 1.11.20 on 2020-06-13 01:02
 from __future__ import unicode_literals
 
-from django.db import migrations, models
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

contentcuration/kolibri_content/migrations/0009_contentnode_options.py

@@ -2,8 +2,8 @@
 # Generated by Django 1.11.20 on 2020-04-11 19:07
 from __future__ import unicode_literals
 
-from django.db import migrations
 import jsonfield.fields
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

contentcuration/kolibri_content/migrations/0013_auto_20210519_1759.py

@@ -1,7 +1,7 @@
 # Generated by Django 2.2.17 on 2021-05-19 17:59
-
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations
+from django.db import models
 
 
 class Migration(migrations.Migration):

contentcuration/locale/ar/LC_MESSAGES/contentcuration-messages.csv

@@ -4448,14 +4448,14 @@ Heading for the section in the resource editing window","الاستكمال"
 ","ملفات غير مدعومة"
 "Uploader.unsupportedFilesText","{count, plural,
  =1 {# file will not be uploaded.}
- other {# files will not be uploaded.}} 
+ other {# files will not be uploaded.}}
  {extensionCount, plural,
  =1 {Supported file type is}
  other {Supported file types are}} {extensions}","
 -- CONTEXT --
 ","{count, plural, zero {# ملفات لن يتم تحميلها} one {# ملفات لن يتم تحميلها.} two {# ملفان لن يتم تحميلهما.} few {# ملفات لن يتم تحميلها.} many {# ملفاً لن يتم تحميله.}
  =1 {# ملفاً لن يتم تحميله.}
- other {# ملفات لن يتم تحميلها.}} 
+ other {# ملفات لن يتم تحميلها.}}
  {extensionCount, plural,
  =1 {نوع الملف المدعوم هو}
  other {أنواع الملفات المدعومة هي}} {extensions}"

contentcuration/locale/ar/LC_MESSAGES/django.po

@@ -938,4 +938,3 @@ msgstr "الإبلاغ عن مشكلة في استوديو كوليبري"
 #: contentcuration/views/settings.py:144
 msgid "Kolibri Studio account deleted"
 msgstr "تم حذف حساب استوديو كوليبري"
-

contentcuration/locale/es_ES/LC_MESSAGES/contentcuration-messages.csv

@@ -4415,14 +4415,14 @@ Heading for the section in the resource editing window","Tipo de finalización"
 ","Ficheros no permitidos"
 "Uploader.unsupportedFilesText","{count, plural,
  =1 {# file will not be uploaded.}
- other {# files will not be uploaded.}} 
+ other {# files will not be uploaded.}}
  {extensionCount, plural,
  =1 {Supported file type is}
  other {Supported file types are}} {extensions}","
 -- CONTEXT --
 ","{count, plural,
  =1 {# fichero no será subido.}
- other {# ficheros no serán subidos.}} 
+ other {# ficheros no serán subidos.}}
  {extensionCount, plural,
  =1 {Tipo de fichero permitido es}
  other {Tipos de fichero permitido son}} {extensions}"

contentcuration/locale/es_ES/LC_MESSAGES/django.po

@@ -934,4 +934,3 @@ msgstr "Informe de incidencias de Kolibri Studio"
 #: contentcuration/views/settings.py:144
 msgid "Kolibri Studio account deleted"
 msgstr "Cuenta de Kolibri Studio eliminada"
-

contentcuration/locale/fr_FR/LC_MESSAGES/contentcuration-messages.csv

@@ -4415,14 +4415,14 @@ Heading for the section in the resource editing window","Achèvement"
 ","Fichiers non supportés"
 "Uploader.unsupportedFilesText","{count, plural,
  =1 {# file will not be uploaded.}
- other {# files will not be uploaded.}} 
+ other {# files will not be uploaded.}}
  {extensionCount, plural,
  =1 {Supported file type is}
  other {Supported file types are}} {extensions}","
 -- CONTEXT --
 ","{count, plural, one {}
  =1 {# fichier ne sera pas téléversé.}
- other {# fichiers ne seront pas téléversés.}} 
+ other {# fichiers ne seront pas téléversés.}}
  {extensionCount, plural,
  =1 {Le type de fichier supporté est}
  other {Les types de fichiers supportés sont}} {extensions}"

contentcuration/locale/fr_FR/LC_MESSAGES/django.po

@@ -934,4 +934,3 @@ msgstr "Rapport d'erreurs de Kolibri Studio"
 #: contentcuration/views/settings.py:144
 msgid "Kolibri Studio account deleted"
 msgstr "Compte Kolibri Studio supprimé"
-

contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.csv

@@ -4415,14 +4415,14 @@ Heading for the section in the resource editing window","Completion"
 ","Unsupported files"
 "Uploader.unsupportedFilesText","{count, plural,
  =1 {# file will not be uploaded.}
- other {# files will not be uploaded.}} 
+ other {# files will not be uploaded.}}
  {extensionCount, plural,
  =1 {Supported file type is}
  other {Supported file types are}} {extensions}","
 -- CONTEXT --
 ","{count, plural,
  =1 {# file will not be uploaded.}
- other {# files will not be uploaded.}} 
+ other {# files will not be uploaded.}}
  {extensionCount, plural,
  =1 {Supported file type is}
  other {Supported file types are}} {extensions}"

contentcuration/locale/hi_IN/LC_MESSAGES/django.po

@@ -928,4 +928,3 @@ msgstr ""
 #: contentcuration/views/settings.py:144
 msgid "Kolibri Studio account deleted"
 msgstr ""
-

contentcuration/locale/pt_BR/LC_MESSAGES/contentcuration-messages.csv

@@ -4279,7 +4279,7 @@ Heading for the section in the resource editing window","Conclusão"
 ","Excluír {topicCount, plural,
  one {}=1 {# pasta}
  other {# pastas}} e {resourceCount, plural,
- one {}=1 {# conteúdo} 
+ one {}=1 {# conteúdo}
  other {# conteúdos}}?"
 "TrashModal.deleteConfirmationText","You cannot undo this action. Are you sure you want to continue?","
 -- CONTEXT --
@@ -4415,14 +4415,14 @@ Heading for the section in the resource editing window","Conclusão"
 ","Arquivos não suportados"
 "Uploader.unsupportedFilesText","{count, plural,
  =1 {# file will not be uploaded.}
- other {# files will not be uploaded.}} 
+ other {# files will not be uploaded.}}
  {extensionCount, plural,
  =1 {Supported file type is}
  other {Supported file types are}} {extensions}","
 -- CONTEXT --
 ","{count, plural, one {}
  =1 {# arquivo não será enviado.}
- other {# arquivos não serão enviados.}} 
+ other {# arquivos não serão enviados.}}
  {extensionCount, plural,
  =1 {O tipo suportado de arquivo é}
  other {Os tipos suportados de arquivo são}} {extensions}"

contentcuration/locale/pt_BR/LC_MESSAGES/django.po

@@ -934,4 +934,3 @@ msgstr "Relatório de problemas do Kolibri Studio"
 #: contentcuration/views/settings.py:144
 msgid "Kolibri Studio account deleted"
 msgstr "Conta do Kolibri Studio excluída"
-

deploy/mime.types

@@ -86,4 +86,4 @@ types {
     video/x-ms-asf                        asx asf;
     video/x-ms-wmv                        wmv;
     video/x-msvideo                       avi;
-}
+}

integration_testing/features/access-kolibri-studio/create-account.feature

@@ -1,6 +1,6 @@
 Feature: Create account on Studio
 
-	Background: 
+	Background:
 		Given I am signed in to Studio
 			And I am on Studio home page
 			And I do not have an account registered with my <email>
@@ -27,4 +27,4 @@ Feature: Create account on Studio
 			Then I am able to sign in
 
 		Examples:
-		| email |
+		| email |

integration_testing/features/access-kolibri-studio/explore-without-an-account.feature

@@ -8,4 +8,4 @@ Feature: Explore without an account
 		When I click the *Explore without an account* link
 		Then I see the *Content Library* page with available public channels
 			And I can filter the search results
-			And I can view or download the channel summary
+			And I can view or download the channel summary

integration_testing/features/access-kolibri-studio/reset-your-password.feature

@@ -39,4 +39,3 @@ Feature: Reset your password
 		When I click the link in the email again
 		Then I see a page with the following message: Reset link expired
 			And I see a *Request a new password reset link* button
-