diff --git a/.dockerignore b/.dockerignore index f5772ce6bb..233f6836f8 100644 --- a/.dockerignore +++ b/.dockerignore @@ -6,4 +6,4 @@ __pycache__ *.pyc *.swp k8s/templates/ -cloudbuild-*.yaml \ No newline at end of file +cloudbuild-*.yaml diff --git a/LICENSE b/LICENSE index b10a6fd5cb..c0688ab8ea 100644 --- a/LICENSE +++ b/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. - diff --git a/bin/run_minio.py b/bin/run_minio.py index 42adf31562..63f7928edf 100755 --- a/bin/run_minio.py +++ b/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) - - diff --git a/contentcuration/contentcuration/__init__.py b/contentcuration/contentcuration/__init__.py index d13e951393..61c79e025c 100644 --- a/contentcuration/contentcuration/__init__.py +++ b/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 diff --git a/contentcuration/contentcuration/collectstatic_settings.py b/contentcuration/contentcuration/collectstatic_settings.py index dae329577e..573e868f8c 100644 --- a/contentcuration/contentcuration/collectstatic_settings.py +++ b/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" diff --git a/contentcuration/contentcuration/management/commands/setup_perftest_data.py b/contentcuration/contentcuration/management/commands/setup_perftest_data.py index da67679cd4..70007862fa 100644 --- a/contentcuration/contentcuration/management/commands/setup_perftest_data.py +++ b/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 diff --git a/contentcuration/contentcuration/migration_production_settings.py b/contentcuration/contentcuration/migration_production_settings.py index e4b948c5c7..4ef3a327d2 100644 --- a/contentcuration/contentcuration/migration_production_settings.py +++ b/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" diff --git a/contentcuration/contentcuration/migrations/0003_copy_data.py b/contentcuration/contentcuration/migrations/0003_copy_data.py index 402b993dd8..ae3967f6c8 100644 --- a/contentcuration/contentcuration/migrations/0003_copy_data.py +++ b/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') diff --git a/contentcuration/contentcuration/migrations/0112_auto_20200613_0050.py b/contentcuration/contentcuration/migrations/0112_auto_20200613_0050.py index 9d352e0e84..f352511944 100644 --- a/contentcuration/contentcuration/migrations/0112_auto_20200613_0050.py +++ b/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): diff --git a/contentcuration/contentcuration/migrations/0113_channel_tagline.py b/contentcuration/contentcuration/migrations/0113_channel_tagline.py index bd2bde0014..6f11785270 100644 --- a/contentcuration/contentcuration/migrations/0113_channel_tagline.py +++ b/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): diff --git a/contentcuration/contentcuration/migrations/0120_auto_20210128_1646.py b/contentcuration/contentcuration/migrations/0120_auto_20210128_1646.py index 6ce83097b8..23a5bafa0a 100644 --- a/contentcuration/contentcuration/migrations/0120_auto_20210128_1646.py +++ b/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): diff --git a/contentcuration/contentcuration/migrations/0129_auto_20210519_2213.py b/contentcuration/contentcuration/migrations/0129_auto_20210519_2213.py index e46b0d2cac..37252e8ef3 100644 --- a/contentcuration/contentcuration/migrations/0129_auto_20210519_2213.py +++ b/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): diff --git a/contentcuration/contentcuration/perftools/objective.py b/contentcuration/contentcuration/perftools/objective.py index 8777e5a089..d9703283b4 100644 --- a/contentcuration/contentcuration/perftools/objective.py +++ b/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) diff --git a/contentcuration/contentcuration/statistics.py b/contentcuration/contentcuration/statistics.py index ff222c5153..267687a0fc 100644 --- a/contentcuration/contentcuration/statistics.py +++ b/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 diff --git a/contentcuration/contentcuration/templates/permissions/permissions_email_subject.txt b/contentcuration/contentcuration/templates/permissions/permissions_email_subject.txt index 7304527c22..4c20de29f0 100644 --- a/contentcuration/contentcuration/templates/permissions/permissions_email_subject.txt +++ b/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 %} \ No newline at end of file +{% 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 %} diff --git a/contentcuration/contentcuration/templates/perseus/exercise.json b/contentcuration/contentcuration/templates/perseus/exercise.json index 44e287e571..4408a80bb1 100644 --- a/contentcuration/contentcuration/templates/perseus/exercise.json +++ b/contentcuration/contentcuration/templates/perseus/exercise.json @@ -1 +1 @@ -{{exercise | safe}} \ No newline at end of file +{{exercise | safe}} diff --git a/contentcuration/contentcuration/templates/registration/custom_email_subject.txt b/contentcuration/contentcuration/templates/registration/custom_email_subject.txt index ad591957af..82fd21ed2a 100644 --- a/contentcuration/contentcuration/templates/registration/custom_email_subject.txt +++ b/contentcuration/contentcuration/templates/registration/custom_email_subject.txt @@ -1 +1 @@ -{% load i18n %} {{ subject }} \ No newline at end of file +{% load i18n %} {{ subject }} diff --git a/contentcuration/contentcuration/templates/registration/registration_information_email.txt b/contentcuration/contentcuration/templates/registration/registration_information_email.txt index 314ec38ae2..b165e8a93e 100644 --- a/contentcuration/contentcuration/templates/registration/registration_information_email.txt +++ b/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 %} \ No newline at end of file +{% endautoescape %} diff --git a/contentcuration/contentcuration/templatetags/perseus_tags.py b/contentcuration/contentcuration/templatetags/perseus_tags.py index 3f3c223aec..24cea74df3 100644 --- a/contentcuration/contentcuration/templatetags/perseus_tags.py +++ b/contentcuration/contentcuration/templatetags/perseus_tags.py @@ -1,4 +1,5 @@ import json + from django import template from django.template.defaultfilters import stringfilter diff --git a/contentcuration/contentcuration/tests/test_secrettoken_model.py b/contentcuration/contentcuration/tests/test_secrettoken_model.py index c799b1a42e..fa0ecfadf3 100755 --- a/contentcuration/contentcuration/tests/test_secrettoken_model.py +++ b/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 diff --git a/contentcuration/contentcuration/tests/utils/__init__.py b/contentcuration/contentcuration/tests/utils/__init__.py index c9d7c65893..79ff5337f3 100644 --- a/contentcuration/contentcuration/tests/utils/__init__.py +++ b/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 diff --git a/contentcuration/contentcuration/tests/utils/migration_test_case.py b/contentcuration/contentcuration/tests/utils/migration_test_case.py index c330fdada7..539099d581 100644 --- a/contentcuration/contentcuration/tests/utils/migration_test_case.py +++ b/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 diff --git a/contentcuration/contentcuration/views/json_dump.py b/contentcuration/contentcuration/views/json_dump.py index b3502e7a9e..0678420ecd 100644 --- a/contentcuration/contentcuration/views/json_dump.py +++ b/contentcuration/contentcuration/views/json_dump.py @@ -1,4 +1,5 @@ import json + from rest_framework.renderers import JSONRenderer """ diff --git a/contentcuration/kolibri_content/migrations/0003_contentnode_coach_content.py b/contentcuration/kolibri_content/migrations/0003_contentnode_coach_content.py index d887392a3c..7b99e8aa1d 100644 --- a/contentcuration/kolibri_content/migrations/0003_contentnode_coach_content.py +++ b/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): diff --git a/contentcuration/kolibri_content/migrations/0007_auto_20200613_0050.py b/contentcuration/kolibri_content/migrations/0007_auto_20200613_0050.py index e902d18c54..761aefd2ce 100644 --- a/contentcuration/kolibri_content/migrations/0007_auto_20200613_0050.py +++ b/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): diff --git a/contentcuration/kolibri_content/migrations/0008_channelmetadata_tagline.py b/contentcuration/kolibri_content/migrations/0008_channelmetadata_tagline.py index cf3f6bf34d..138735321f 100644 --- a/contentcuration/kolibri_content/migrations/0008_channelmetadata_tagline.py +++ b/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): diff --git a/contentcuration/kolibri_content/migrations/0009_contentnode_options.py b/contentcuration/kolibri_content/migrations/0009_contentnode_options.py index 5644d7a44e..67b4f6e51d 100644 --- a/contentcuration/kolibri_content/migrations/0009_contentnode_options.py +++ b/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): diff --git a/contentcuration/kolibri_content/migrations/0013_auto_20210519_1759.py b/contentcuration/kolibri_content/migrations/0013_auto_20210519_1759.py index 1617a522bf..002f8de29e 100644 --- a/contentcuration/kolibri_content/migrations/0013_auto_20210519_1759.py +++ b/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): diff --git a/contentcuration/locale/ar/LC_MESSAGES/contentcuration-messages.csv b/contentcuration/locale/ar/LC_MESSAGES/contentcuration-messages.csv index d7b2742295..1849dd6bbb 100644 --- a/contentcuration/locale/ar/LC_MESSAGES/contentcuration-messages.csv +++ b/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}" diff --git a/contentcuration/locale/ar/LC_MESSAGES/django.po b/contentcuration/locale/ar/LC_MESSAGES/django.po index 5eb82393c6..b6ba519a71 100644 --- a/contentcuration/locale/ar/LC_MESSAGES/django.po +++ b/contentcuration/locale/ar/LC_MESSAGES/django.po @@ -938,4 +938,3 @@ msgstr "الإبلاغ عن مشكلة في استوديو كوليبري" #: contentcuration/views/settings.py:144 msgid "Kolibri Studio account deleted" msgstr "تم حذف حساب استوديو كوليبري" - diff --git a/contentcuration/locale/es_ES/LC_MESSAGES/contentcuration-messages.csv b/contentcuration/locale/es_ES/LC_MESSAGES/contentcuration-messages.csv index 198d0f6c38..15ea38760c 100644 --- a/contentcuration/locale/es_ES/LC_MESSAGES/contentcuration-messages.csv +++ b/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}" diff --git a/contentcuration/locale/es_ES/LC_MESSAGES/django.po b/contentcuration/locale/es_ES/LC_MESSAGES/django.po index f8646e3270..2b835b99f4 100644 --- a/contentcuration/locale/es_ES/LC_MESSAGES/django.po +++ b/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" - diff --git a/contentcuration/locale/fr_FR/LC_MESSAGES/contentcuration-messages.csv b/contentcuration/locale/fr_FR/LC_MESSAGES/contentcuration-messages.csv index 227998b024..b1ec93c1ad 100644 --- a/contentcuration/locale/fr_FR/LC_MESSAGES/contentcuration-messages.csv +++ b/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}" diff --git a/contentcuration/locale/fr_FR/LC_MESSAGES/django.po b/contentcuration/locale/fr_FR/LC_MESSAGES/django.po index 32e421da65..d81206aaed 100644 --- a/contentcuration/locale/fr_FR/LC_MESSAGES/django.po +++ b/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é" - diff --git a/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.csv b/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.csv index 12a9bfef65..2e6c393bca 100644 --- a/contentcuration/locale/hi_IN/LC_MESSAGES/contentcuration-messages.csv +++ b/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}" diff --git a/contentcuration/locale/hi_IN/LC_MESSAGES/django.po b/contentcuration/locale/hi_IN/LC_MESSAGES/django.po index 213a2436b5..6afbbebda7 100644 --- a/contentcuration/locale/hi_IN/LC_MESSAGES/django.po +++ b/contentcuration/locale/hi_IN/LC_MESSAGES/django.po @@ -928,4 +928,3 @@ msgstr "" #: contentcuration/views/settings.py:144 msgid "Kolibri Studio account deleted" msgstr "" - diff --git a/contentcuration/locale/pt_BR/LC_MESSAGES/contentcuration-messages.csv b/contentcuration/locale/pt_BR/LC_MESSAGES/contentcuration-messages.csv index 36e910ecd1..c32292c8d3 100644 --- a/contentcuration/locale/pt_BR/LC_MESSAGES/contentcuration-messages.csv +++ b/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}" diff --git a/contentcuration/locale/pt_BR/LC_MESSAGES/django.po b/contentcuration/locale/pt_BR/LC_MESSAGES/django.po index 9501c759a6..bcaaa471d3 100644 --- a/contentcuration/locale/pt_BR/LC_MESSAGES/django.po +++ b/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" - diff --git a/deploy/mime.types b/deploy/mime.types index 3437f2f474..89be9a4cd6 100644 --- a/deploy/mime.types +++ b/deploy/mime.types @@ -86,4 +86,4 @@ types { video/x-ms-asf asx asf; video/x-ms-wmv wmv; video/x-msvideo avi; -} \ No newline at end of file +} diff --git a/integration_testing/features/access-kolibri-studio/create-account.feature b/integration_testing/features/access-kolibri-studio/create-account.feature index 84038a2a02..7b52e97df5 100755 --- a/integration_testing/features/access-kolibri-studio/create-account.feature +++ b/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 @@ -27,4 +27,4 @@ Feature: Create account on Studio Then I am able to sign in Examples: - | email | \ No newline at end of file + | email | diff --git a/integration_testing/features/access-kolibri-studio/explore-without-an-account.feature b/integration_testing/features/access-kolibri-studio/explore-without-an-account.feature index 46e5572ac6..a1bd0c0457 100755 --- a/integration_testing/features/access-kolibri-studio/explore-without-an-account.feature +++ b/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 \ No newline at end of file + And I can view or download the channel summary diff --git a/integration_testing/features/access-kolibri-studio/reset-your-password.feature b/integration_testing/features/access-kolibri-studio/reset-your-password.feature index 4e8b9274df..46bb82b954 100755 --- a/integration_testing/features/access-kolibri-studio/reset-your-password.feature +++ b/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 - diff --git a/integration_testing/features/access-kolibri-studio/url-updates.feature b/integration_testing/features/access-kolibri-studio/url-updates.feature index 86f441dee6..6e379d509a 100755 --- a/integration_testing/features/access-kolibri-studio/url-updates.feature +++ b/integration_testing/features/access-kolibri-studio/url-updates.feature @@ -1,25 +1,25 @@ Feature: URL update when the user switches between channel list User can see changes at the URL when they switch between channel list - Background: + Background: Given I am signed in to Studio Scenario: URL update at the *My Channels* nav - When I click *My Channels* nav + When I click *My Channels* nav Then I see that the URL changes Scenario: URL update at the *Starred* nav - When I click *Starred* nav + When I click *Starred* nav Then I see that the URL changes Scenario: URL update at the *View-Only* nav - When I click *View-Only* nav + When I click *View-Only* nav Then I see that the URL changes Scenario: URL update at the *Content Library* nav - When I click *Content Library* nav + When I click *Content Library* nav Then I see that the URL changes - + Scenario: URL update at the *Collections* nav When I click *Collections* nav - Then I see that the URL changes \ No newline at end of file + Then I see that the URL changes diff --git a/integration_testing/features/manage-account/delete-account.feature b/integration_testing/features/manage-account/delete-account.feature index 917214450d..3ce1047fcb 100755 --- a/integration_testing/features/manage-account/delete-account.feature +++ b/integration_testing/features/manage-account/delete-account.feature @@ -1,6 +1,6 @@ Feature: Delete account - Background: + Background: Given I am signed in to Studio And I am on the *Settings > Account* page @@ -17,4 +17,4 @@ Feature: Delete account Given my account still has active channels for which I am an admin When I look under the *Delete account* heading Then I don't see the *Delete account* button - And I need to delete my active channels or invite other admins in order to see the *Delete account* button \ No newline at end of file + And I need to delete my active channels or invite other admins in order to see the *Delete account* button diff --git a/integration_testing/features/manage-account/edit-account-information.feature b/integration_testing/features/manage-account/edit-account-information.feature index cfc8ce4bfe..fa9ecb46de 100755 --- a/integration_testing/features/manage-account/edit-account-information.feature +++ b/integration_testing/features/manage-account/edit-account-information.feature @@ -1,6 +1,6 @@ Feature: Edit account information - Background: + Background: Given I am signed in to Studio And I am on Studio *Settings > Account* page @@ -10,7 +10,7 @@ Feature: Edit account information And I press *Save changes* button in the modal Then I see a snackbar appears to confirm my password was updated And the modal is dismissed - + Scenario: Editing full name When I click the *Edit* hyperlink near my username And I make changes to my full name @@ -20,4 +20,4 @@ Feature: Edit account information Scenario: Copying API token When I click the copy button in the token text field - Then a snackbar appears to confirm the code is copied \ No newline at end of file + Then a snackbar appears to confirm the code is copied diff --git a/integration_testing/features/manage-account/export-account-information.feature b/integration_testing/features/manage-account/export-account-information.feature index a497529897..95d3b9c2b4 100755 --- a/integration_testing/features/manage-account/export-account-information.feature +++ b/integration_testing/features/manage-account/export-account-information.feature @@ -1,6 +1,6 @@ Feature: Export account information - Background: + Background: Given I have a Studio account And I am signed in to Studio And I have interacted with various data and channels @@ -14,4 +14,4 @@ Feature: Export account information Scenario: Viewing the exported data When I check the Inbox of my email account registered at Studio - Then I see an email with an attachment that contains my account data \ No newline at end of file + Then I see an email with an attachment that contains my account data diff --git a/integration_testing/features/manage-account/open-sidebar-and-user-menus.feature b/integration_testing/features/manage-account/open-sidebar-and-user-menus.feature index 9de7b076ee..f52112570f 100755 --- a/integration_testing/features/manage-account/open-sidebar-and-user-menus.feature +++ b/integration_testing/features/manage-account/open-sidebar-and-user-menus.feature @@ -1,7 +1,7 @@ Feature: Open and close sidebar and user menus -User needs to be able to open and close the sidebar menu and the user menu +User needs to be able to open and close the sidebar menu and the user menu - Background: + Background: Given I am signed in to Studio And I am on any of the tabs (*My Channels*, *Starred*, *View only*, *Content Library*, or *Collections*) @@ -17,4 +17,4 @@ User needs to be able to open and close the sidebar menu and the user menu Then I see the user menu And I can select any of the options inside When I click the user menu button again, or anywhere on the browser screen - Then I don't see the user menu anymore \ No newline at end of file + Then I don't see the user menu anymore diff --git a/integration_testing/features/manage-account/report-issue.feature b/integration_testing/features/manage-account/report-issue.feature index 91d7f95fe8..27ee5105bb 100755 --- a/integration_testing/features/manage-account/report-issue.feature +++ b/integration_testing/features/manage-account/report-issue.feature @@ -20,4 +20,4 @@ Feature: Report an issue When I resolve those errors And click the *Submit* button Then I see the modal disappears - And a snackbar appears to confirm the submission \ No newline at end of file + And a snackbar appears to confirm the submission diff --git a/integration_testing/features/manage-account/request-more-storage-space.feature b/integration_testing/features/manage-account/request-more-storage-space.feature index 8e1f8c4bc3..bac9d32f63 100755 --- a/integration_testing/features/manage-account/request-more-storage-space.feature +++ b/integration_testing/features/manage-account/request-more-storage-space.feature @@ -1,7 +1,7 @@ Feature: Request more storage space Background: - Given I am signed in to Studio + Given I am signed in to Studio And I am on Studio *Settings > Storage* page And I click *Show form* on the page @@ -16,4 +16,4 @@ Feature: Request more storage space And I click the *Send request* submit button Then I see a system error message above the form And I see my text field inputs still intact - And I see error validation text near fields that need input \ No newline at end of file + And I see error validation text near fields that need input diff --git a/integration_testing/features/manage-account/review-used-storage.feature b/integration_testing/features/manage-account/review-used-storage.feature index ef0d9fccc8..743b36c1ac 100755 --- a/integration_testing/features/manage-account/review-used-storage.feature +++ b/integration_testing/features/manage-account/review-used-storage.feature @@ -1,6 +1,6 @@ Feature: Review used storage - Background: + Background: Given I am signed in to Studio And I am on the *Settings > Storage* page @@ -12,4 +12,4 @@ Feature: Review used storage Scenario: No storage used Given that I have not uploaded any resources in my channels When I look under the *% storage used* heading - Then I see that there is 0% storage used \ No newline at end of file + Then I see that there is 0% storage used diff --git a/integration_testing/features/manage-account/view-support-links.feature b/integration_testing/features/manage-account/view-support-links.feature index 795e5c4c08..8013621f30 100755 --- a/integration_testing/features/manage-account/view-support-links.feature +++ b/integration_testing/features/manage-account/view-support-links.feature @@ -1,4 +1,4 @@ -Feature: View support links +Feature: View support links Background: Given I am signed in to Studio @@ -8,7 +8,7 @@ Feature: View support links When I click the *Kolibri Studio User Guide* link Then a new browser tab opens with the ReadTheDocs page # Privacy Policy page not yet implemented - + Scenario: View notable issues When I click one of the notable issue hyperlinks - Then a new browser tab opens with the GitHub issue in question \ No newline at end of file + Then a new browser tab opens with the GitHub issue in question diff --git a/integration_testing/features/manage-channels/add-channel-to-starred.feature b/integration_testing/features/manage-channels/add-channel-to-starred.feature index 00b6c9aabd..91da946562 100755 --- a/integration_testing/features/manage-channels/add-channel-to-starred.feature +++ b/integration_testing/features/manage-channels/add-channel-to-starred.feature @@ -1,7 +1,7 @@ Feature: Add a channel to the *Starred* tab A user needs to be able to mark channels with a star to label them as favorite for easy access - Background: + Background: Given I am signed in to Studio And I am on any of the tabs (*My Channels*, *Starred*, *View-only*, or *Content Library*) And I see a channel that is not starred (white star) @@ -9,8 +9,8 @@ Feature: Add a channel to the *Starred* tab Scenario: Add channel to the *Starred* tab When I click the *Add to starred channels* button for the desired channel Then I see that the channel's *Add to starred channels* button is now black - And I see a message that the channel was added to the starred channels - When I click and open the *Starred* tab + And I see a message that the channel was added to the starred channels + When I click and open the *Starred* tab Then I see that the channel is displayed among the starred channels Scenario: Unstar a channel @@ -19,11 +19,11 @@ Feature: Add a channel to the *Starred* tab When I click the *Remove from starred channels* button for the channel Then I see that the channel's *Remove from starred channels* button is now white And I see a message that the channel was removed from the starred channels - When I click and open the *Starred* tab + When I click and open the *Starred* tab Then I see the list of starred channels But I don't see the unstarred channel on the list - Scenario: Remove channel directly from the *Starred* tab + Scenario: Remove channel directly from the *Starred* tab Given I am on the *Starred* tab And I see a starred channel When I click the *Remove from starred channels* button for the channel @@ -34,4 +34,4 @@ Feature: Add a channel to the *Starred* tab And I've selected the *Starred* checkbox When I click on the star button of a starred channel. Then I should see a message that the channel was removed from the starred channels - And the channel should no longer be displayed in the list with the filtered channels \ No newline at end of file + And the channel should no longer be displayed in the list with the filtered channels diff --git a/integration_testing/features/manage-channels/create-a-channel.feature b/integration_testing/features/manage-channels/create-a-channel.feature index a14a694bb3..5e4b357fd0 100755 --- a/integration_testing/features/manage-channels/create-a-channel.feature +++ b/integration_testing/features/manage-channels/create-a-channel.feature @@ -1,6 +1,6 @@ Feature: Create a channel - Background: + Background: Given I am signed in to Studio And I am on the *My Channels* tab @@ -16,4 +16,4 @@ Feature: Create a channel Examples: | channel_name | channel_description | language | - | ck-12 | sample channel | english | + | ck-12 | sample channel | english | diff --git a/integration_testing/features/manage-channels/create-a-collection.feature b/integration_testing/features/manage-channels/create-a-collection.feature index 1c8a2b2b01..1c3096f61c 100755 --- a/integration_testing/features/manage-channels/create-a-collection.feature +++ b/integration_testing/features/manage-channels/create-a-collection.feature @@ -1,6 +1,6 @@ Feature: Create a collection - Background: + Background: Given I am signed in to Studio And I am on the *Collections* tab diff --git a/integration_testing/features/manage-channels/delete-a-collection.feature b/integration_testing/features/manage-channels/delete-a-collection.feature index d506601d7d..361b2a907d 100755 --- a/integration_testing/features/manage-channels/delete-a-collection.feature +++ b/integration_testing/features/manage-channels/delete-a-collection.feature @@ -1,6 +1,6 @@ Feature: Delete a collection - Background: + Background: Given I am signed in to Studio And I am on the *Collections* tab And there is at least one collection @@ -8,7 +8,7 @@ Feature: Delete a collection Scenario: Delete a collection When I click the *Options* drop-down for the collection I want to edit And I select the *Delete collection* option - Then I see the *Delete collection* modal window + Then I see the *Delete collection* modal window When I click the *Delete collection* button Then I see the *Collections* tab And I see that the deleted collection is no longer displayed diff --git a/integration_testing/features/manage-channels/delete-channel.feature b/integration_testing/features/manage-channels/delete-channel.feature index 512eacc2fd..8e774a2cd7 100755 --- a/integration_testing/features/manage-channels/delete-channel.feature +++ b/integration_testing/features/manage-channels/delete-channel.feature @@ -1,6 +1,6 @@ -Feature: Delete channel +Feature: Delete channel - Background: + Background: Given I am signed in to Studio And I have permissions to edit And I am on *My Channels* tab @@ -30,4 +30,4 @@ Feature: Delete channel And I click the *Delete channel* button Then I see a message that the channel is deleted And I am brought back on *My channels* tab - And the deleted channel is no longer displayed on *My Channels* tab \ No newline at end of file + And the deleted channel is no longer displayed on *My Channels* tab diff --git a/integration_testing/features/manage-channels/deploy-channel.feature b/integration_testing/features/manage-channels/deploy-channel.feature index fe2445616e..98753933b0 100755 --- a/integration_testing/features/manage-channels/deploy-channel.feature +++ b/integration_testing/features/manage-channels/deploy-channel.feature @@ -1,6 +1,6 @@ Feature: Deploy Channel - Background: + Background: Given I am signed in to Studio as And I have uploaded content to the staging tree for @@ -11,5 +11,5 @@ Feature: Deploy Channel When I click the *Deploy* button Then I get redirected to https://api.studio.learningequality.org/channels//edit/ - Examples: - | username | channel_id | \ No newline at end of file + Examples: + | username | channel_id | diff --git a/integration_testing/features/manage-channels/edit-a-collection.feature b/integration_testing/features/manage-channels/edit-a-collection.feature index 6991827989..b0ba1680ca 100755 --- a/integration_testing/features/manage-channels/edit-a-collection.feature +++ b/integration_testing/features/manage-channels/edit-a-collection.feature @@ -1,6 +1,6 @@ Feature: Edit a collection - Background: + Background: Given I am signed in to Studio And I am on the *Collections* tab And there is at least one collection diff --git a/integration_testing/features/manage-channels/edit-channel-details.feature b/integration_testing/features/manage-channels/edit-channel-details.feature index b527f3ea28..53dbf8a136 100755 --- a/integration_testing/features/manage-channels/edit-channel-details.feature +++ b/integration_testing/features/manage-channels/edit-channel-details.feature @@ -1,6 +1,6 @@ -Feature: Edit channel details +Feature: Edit channel details - Background: + Background: Given I am signed in to Studio And I am on the channel editor view diff --git a/integration_testing/features/manage-channels/get-channel-token-after-publishing.feature b/integration_testing/features/manage-channels/get-channel-token-after-publishing.feature index 6f5fdd47fe..68701049fc 100755 --- a/integration_testing/features/manage-channels/get-channel-token-after-publishing.feature +++ b/integration_testing/features/manage-channels/get-channel-token-after-publishing.feature @@ -13,4 +13,4 @@ Feature: Get channel token after publishing the channel Then a snackbar appears to confirm the code is copied to the clipboard Examples: - | channel | \ No newline at end of file + | channel | diff --git a/integration_testing/features/manage-channels/manage-additional-channel-options.feature b/integration_testing/features/manage-channels/manage-additional-channel-options.feature index ab249a52d5..d0578dfc3c 100755 --- a/integration_testing/features/manage-channels/manage-additional-channel-options.feature +++ b/integration_testing/features/manage-channels/manage-additional-channel-options.feature @@ -1,7 +1,7 @@ Feature: Access and use additional options on channel list User needs to be able to access additional options to manage channels from the channel list - Background: + Background: Given I am signed in to Studio And I am at *My Channels* tab diff --git a/integration_testing/features/manage-channels/open-a-channel-in-a-new-tab.feature b/integration_testing/features/manage-channels/open-a-channel-in-a-new-tab.feature index cc566cf714..5afb28ba91 100755 --- a/integration_testing/features/manage-channels/open-a-channel-in-a-new-tab.feature +++ b/integration_testing/features/manage-channels/open-a-channel-in-a-new-tab.feature @@ -9,4 +9,4 @@ Feature: Open channel in new tab Then the clipboard opens up When I right click a channel item on the clipboard And click *Open in new tab* on the dropdown menu that appears - Then a tab opens with the view-only or editable channel in question \ No newline at end of file + Then a tab opens with the view-only or editable channel in question diff --git a/integration_testing/features/manage-channels/share-channels.feature b/integration_testing/features/manage-channels/share-channels.feature index 9cc7f1dd39..7798d299f4 100755 --- a/integration_testing/features/manage-channels/share-channels.feature +++ b/integration_testing/features/manage-channels/share-channels.feature @@ -1,7 +1,7 @@ Feature: Share channels A user needs to be able to invite collaborators to view or edit channels - Background: + Background: Given I am signed in to Studio And I am on the channel editor page When I click the *...* (options) button in the topbar diff --git a/integration_testing/features/manage-channels/stop-channel-publish.feature b/integration_testing/features/manage-channels/stop-channel-publish.feature index 87c35e3b89..5e68344c78 100755 --- a/integration_testing/features/manage-channels/stop-channel-publish.feature +++ b/integration_testing/features/manage-channels/stop-channel-publish.feature @@ -1,6 +1,6 @@ Feature: Stop the publish of a channel - Background: + Background: Given there's a channel publish task in-progress Scenario: Stop the publish of a channel @@ -8,4 +8,4 @@ Feature: Stop the publish of a channel Then a confirmation message appears When I click *Yes, stop task* Then the publish task stops - And I am back in the channel editor page \ No newline at end of file + And I am back in the channel editor page diff --git a/integration_testing/features/manage-channels/sync-channel.feature b/integration_testing/features/manage-channels/sync-channel.feature index b607a9f97a..ec33919b39 100755 --- a/integration_testing/features/manage-channels/sync-channel.feature +++ b/integration_testing/features/manage-channels/sync-channel.feature @@ -1,10 +1,10 @@ -Feature: Sync resources +Feature: Sync resources Studio users need to be able to sync and update the resources in their channels that have been imported from other channels, but have been modified since the original import. Background: Given I am signed in to Studio And I am on the editor page - And there is a in the that has been imported from + And there is a in the that has been imported from Scenario: Sync resource file information Given there is new version of the file in the @@ -21,7 +21,7 @@ Feature: Sync resources When I see the *Operation complete!* message And I click the *Refresh button* Then I see the new file version of the - Or I see the new thumbnail + Or I see the new thumbnail Scenario: Sync resource tags Given the in the has a new tag @@ -84,5 +84,5 @@ Feature: Sync resources And I click the *Refresh button* Then I see that my edits of title, description or tags for the have been reverted to reflect those on the - Examples: - | channel_a | channel_b | resource | \ No newline at end of file + Examples: + | channel_a | channel_b | resource | diff --git a/integration_testing/features/manage-channels/use-channels-with-view-only-access.feature b/integration_testing/features/manage-channels/use-channels-with-view-only-access.feature index d7415fd9b7..1d1c190a04 100755 --- a/integration_testing/features/manage-channels/use-channels-with-view-only-access.feature +++ b/integration_testing/features/manage-channels/use-channels-with-view-only-access.feature @@ -1,6 +1,6 @@ Feature: Use channels with view-only access - Background: + Background: Given I am signed in to Studio And I am on the editor page And I have view-only permissions for @@ -23,14 +23,14 @@ Feature: Use channels with view-only access And I click on a *···* button for more options Then I can see the *View details* option When I select the *View details* option - Then I can see the *Topic* pane open on the right + Then I can see the *Topic* pane open on the right And I can see all the details for the topic Scenario: View details for a resource When I hover over a type of resource And I click on a *···* button for more options And I select the *View details* option - Then I can see the pane for the resource opens on the right + Then I can see the pane for the resource opens on the right And I can see all the details for the resource Scenario: Copy topic or resource to the clipboard from *···* options @@ -41,4 +41,4 @@ Feature: Use channels with view-only access And I see the *Cancel* button Examples: - | topic | kind | resource | \ No newline at end of file + | topic | kind | resource | diff --git a/integration_testing/features/manage-channels/view-channel-details.feature b/integration_testing/features/manage-channels/view-channel-details.feature index 3a3aeda641..1109f8f971 100755 --- a/integration_testing/features/manage-channels/view-channel-details.feature +++ b/integration_testing/features/manage-channels/view-channel-details.feature @@ -1,6 +1,6 @@ -Feature: View channel details +Feature: View channel details - Background: + Background: Given I am signed in to Studio And I am on any of the tabs (*My Channels*, *Starred*, *View only*, or *Content Library*) @@ -11,7 +11,7 @@ Feature: View channel details Scenario: Copy channel token Given I am on channel details page - And I see the channel token + And I see the channel token And I see the token *Copy* button When I click the *Copy* button Then I see the snackbar notification that the token is copied in to the clipboard @@ -30,7 +30,7 @@ Feature: View channel details Scenario: Close channel details page When I click the *X* button in the top bar - Then I don't see the channel details page any more + Then I don't see the channel details page any more And I see the channel list on the tab where I initially opened it Examples: diff --git a/integration_testing/features/manage-resources/cancel-copy.feature b/integration_testing/features/manage-resources/cancel-copy.feature index 99fce69b6d..0552020ba8 100755 --- a/integration_testing/features/manage-resources/cancel-copy.feature +++ b/integration_testing/features/manage-resources/cancel-copy.feature @@ -1,5 +1,5 @@ Feature: Cancel copy - + Background: Given I am signed in to Studio And I am on the channel editor view @@ -18,4 +18,4 @@ Feature: Cancel copy When there is a copy creation of multiple selections in progress And I click on the *Cancel* text on the snackbar Then the operation ceases and the snackbar disappears - And I don't see any copies made on the clipboard \ No newline at end of file + And I don't see any copies made on the clipboard diff --git a/integration_testing/features/manage-resources/cancel-sync.feature b/integration_testing/features/manage-resources/cancel-sync.feature index 9d2981836d..f18d8b66cd 100755 --- a/integration_testing/features/manage-resources/cancel-sync.feature +++ b/integration_testing/features/manage-resources/cancel-sync.feature @@ -16,4 +16,4 @@ Feature: Cancel sync When the sync progress bar finishes Then the progress dialog disappears And I am back in the channel editor page - And a snackbar appears to confirm the sync completion \ No newline at end of file + And a snackbar appears to confirm the sync completion diff --git a/integration_testing/features/manage-resources/copy-resource-via-right-click.feature b/integration_testing/features/manage-resources/copy-resource-via-right-click.feature index 63819337f8..851a97069b 100755 --- a/integration_testing/features/manage-resources/copy-resource-via-right-click.feature +++ b/integration_testing/features/manage-resources/copy-resource-via-right-click.feature @@ -1,5 +1,5 @@ Feature: Copy resource via right click - + Background: Given I am signed in to Studio And I am on the channel editor view @@ -13,4 +13,4 @@ Feature: Copy resource via right click When the copy creation is finished Then the *Creating copy* snackbar disappears And I see another snackbar appears to confirm *Copy created* - And I see the newly made copy appearss in the clipboard below the original \ No newline at end of file + And I see the newly made copy appearss in the clipboard below the original diff --git a/integration_testing/features/manage-resources/copy-resource-via-selection-bar.feature b/integration_testing/features/manage-resources/copy-resource-via-selection-bar.feature index 7a8d8aabd4..c2fe376b92 100755 --- a/integration_testing/features/manage-resources/copy-resource-via-selection-bar.feature +++ b/integration_testing/features/manage-resources/copy-resource-via-selection-bar.feature @@ -14,4 +14,4 @@ Feature: Copy resource via selection bar When the copy creation is finished Then the *Copying* loader disappears And I see another snackbar appears to confirm *Copy created* - And I see the newly made copy appears in the clipboard below the original \ No newline at end of file + And I see the newly made copy appears in the clipboard below the original diff --git a/integration_testing/features/manage-resources/copy-to-clipboard.feature b/integration_testing/features/manage-resources/copy-to-clipboard.feature index ec378942d5..e29157d74c 100755 --- a/integration_testing/features/manage-resources/copy-to-clipboard.feature +++ b/integration_testing/features/manage-resources/copy-to-clipboard.feature @@ -1,6 +1,6 @@ Feature: Copy to clipboard - Background: + Background: Given I am signed in to Studio And I am on the editor page And I have edit permissions for @@ -10,10 +10,10 @@ Feature: Copy to clipboard And I click on a *···* button for more options Then I can see the *Copy to clipboard* option When I select the *Copy to clipboard* option - Then I can see the snackbar notification + Then I can see the snackbar notification And I see the *Undo* button When I click the *Undo* button - Then I don't see the snackbar notification any more + Then I don't see the snackbar notification any more And I don't see the topic in the clipboard Scenario: Copy a resource to clipboard from *···* (more options) @@ -21,27 +21,27 @@ Feature: Copy to clipboard And I click on a *···* button for more options Then I can see the *Copy to clipboard* option When I select the *Copy to clipboard* option - Then I can see the snackbar notification + Then I can see the snackbar notification And I see the *Undo* button When I click the *Undo* button - Then I don't see the snackbar notification any more + Then I don't see the snackbar notification any more And I don't see the resource in the clipboard Scenario: Copy a topic to clipboard from toolbar When I check the topic checkbox - Then I see the toolbar options for topic + Then I see the toolbar options for topic When I click the *Copy selected items to clipboard* toolbar button - Then I can see the snackbar notification + Then I can see the snackbar notification And I see the *Undo* button When I click the *Undo* button - Then I don't see the snackbar notification any more + Then I don't see the snackbar notification any more And I don't see the topic in the clipboard Scenario: Copy a resource to clipboard from toolbar When I check the resource checkbox - Then I see the toolbar options for resource + Then I see the toolbar options for resource When I click the *Copy selected items to clipboard* toolbar button - Then I can see the snackbar notification + Then I can see the snackbar notification And I see the *Undo* button When I click the *Undo* buttons Then I don't see the snackbar notification any more diff --git a/integration_testing/features/manage-resources/delete-resources.feature b/integration_testing/features/manage-resources/delete-resources.feature index 15ef0dc307..586ed11033 100755 --- a/integration_testing/features/manage-resources/delete-resources.feature +++ b/integration_testing/features/manage-resources/delete-resources.feature @@ -1,6 +1,6 @@ Feature: Delete resources permanently - Background: + Background: Given I am signed in to Studio And I am on the channel editor page And I have one removed resource from my channel editor tree @@ -24,4 +24,4 @@ Feature: Delete resources permanently Then I see a warning message appear When I click the *Delete permanently* button Then the selections disappear from the list - And a snackbar appears to confirm the deletion of multiple resources \ No newline at end of file + And a snackbar appears to confirm the deletion of multiple resources diff --git a/integration_testing/features/manage-resources/drag-drop-out-of-clipboard.feature b/integration_testing/features/manage-resources/drag-drop-out-of-clipboard.feature index f5ea12c8b9..891a422093 100755 --- a/integration_testing/features/manage-resources/drag-drop-out-of-clipboard.feature +++ b/integration_testing/features/manage-resources/drag-drop-out-of-clipboard.feature @@ -11,4 +11,4 @@ Feature: Drag-drop resources out of the clipboard And I drop the items on the channel editor Then clipboard stays open And the items disappear from the clipboard - And I see the items appear on the channel editor node at the very bottom \ No newline at end of file + And I see the items appear on the channel editor node at the very bottom diff --git a/integration_testing/features/manage-resources/drag-drop-to-clipboard.feature b/integration_testing/features/manage-resources/drag-drop-to-clipboard.feature index f01b4402fb..13b5837219 100755 --- a/integration_testing/features/manage-resources/drag-drop-to-clipboard.feature +++ b/integration_testing/features/manage-resources/drag-drop-to-clipboard.feature @@ -20,4 +20,4 @@ Feature: Drag-drop to clipboard Then I see the clipboard button changes color styling and move slightly up and down When I drop the content into the clipboard button Then the clipboard button styling gets back to normal - And I see a snackbar appears to confirm the resources were moved to clipboard \ No newline at end of file + And I see a snackbar appears to confirm the resources were moved to clipboard diff --git a/integration_testing/features/wip-studio-edit-modal/allow-marking-as-complete.feature b/integration_testing/features/manage-resources/edit-modal/allow-marking-as-complete.feature similarity index 68% rename from integration_testing/features/wip-studio-edit-modal/allow-marking-as-complete.feature rename to integration_testing/features/manage-resources/edit-modal/allow-marking-as-complete.feature index 18540109c8..118aa25f49 100755 --- a/integration_testing/features/wip-studio-edit-modal/allow-marking-as-complete.feature +++ b/integration_testing/features/manage-resources/edit-modal/allow-marking-as-complete.feature @@ -1,7 +1,7 @@ Feature: Allow marking as complete This feature allows learners to manually mark a resource as complete in the learning platform. This option is available on all file types. - Background: + Background: Given I am signed into Studio And I am in an editable channel with all resource types And I see the *Edit details* modal for the @@ -10,7 +10,13 @@ Feature: Allow marking as complete Scenario: Toggle *Allow learners to mark as complete* setting When I click the *Allow marking as complete* checkbox Then I see the *Allow marking as complete* is selected - When I click the selected *Allow marking as complete* checkbox + When I click *FINISH* + Then I see the in the topic tree + And I do not see an error icon + + Scenario: Uncheck the *Allow learners to mark as complete* setting + Given the *Allow marking as complete* checkbox is checked + When I uncheck the selected *Allow marking as complete* checkbox Then I see the *Allow marking as complete* is empty When I click *FINISH* Then I see the in the topic tree diff --git a/integration_testing/features/manage-resources/edit-modal/edit-accessibility-options.feature b/integration_testing/features/manage-resources/edit-modal/edit-accessibility-options.feature new file mode 100755 index 0000000000..848f1f7b98 --- /dev/null +++ b/integration_testing/features/manage-resources/edit-modal/edit-accessibility-options.feature @@ -0,0 +1,86 @@ +Feature: Edit *Accessibility* options + Across all file types + +# Comment here + + Background: + Given I am signed into Studio + And I am in an editable channel + When I right click + When I click *Edit details* + Then I see the edit modal for the + And I see the *Accessibility* section underneath the *Audience* section + + Scenario: View options for .MP4 + Given I am viewing an .MP4 in the edit modal + Then I see a checkbox that says *Includes captions or subtitles* + And I see a checkbox that says *Includes audio descriptions* + And I see a checkbox that says *Includes sign language captions* + + Scenario: View tooltips for .MP4 + Given I am viewing an .MP4 in the edit modal + When I hover my mouse over the info icon for *Includes sign language captions* + Then I see *Synchronized sign language interpretation is available for audio and video content* + When I hover my mouse over the info icon for *Includes audio descriptions* + Then I see *The resource contains a second narration audio track that provides additional information for the benefit of blind users and those with low vision* + + Scenario: View options for .PDF or .EPUB + Given I am viewing a .PDF or .EPUB in the edit modal + Then I see a checkbox that says *Includes alternative text description for images* + And I see a checkbox that says *Includes high contrast text for learners with low vision* + And I see a checkbox that says *Tagged PDF* + + Scenario: View tooltips for .PDF or .EPUB + Given I am viewing a .PDF or .EPUB in the edit modal + When I hover my mouse over the info icon for *Includes alternative text descriptions for images* + Then I see *Visual elements in the resource have descriptions that can be accessed by screen readers for the benefit of blind learners* + When I hover my mouse over the info icon for *Includes high contrast text for learners with low vision* + Then I see *The resource text and visual elements are displayed with high contrast for the benefit of users with low vision* + When I hover my mouse over the info icon for *Tagged PDF* + Then I see *The document contains PDF tags that can be accessed by screen readers for the benefits of blind learners* + + Scenario: View options for .MP3 + Given I am viewing a .MP3 in the edit modal + Then I see a *Captions and subtitles* section underneath the *Source* section + + Scenario: View tooltips for .MP3 + Given I am viewing an .MP3 in the edit modal + When I hover my mouse over the info icon for *Captions and subtitles* + Then I see *Supported formats: vtt* + + Scenario: View options for .ZIP + Given I am viewing a .ZIP in the edit modal + Then I see a checkbox that says *Includes alternative text description for images* + And I see a checkbox that says *Includes high contrast text for learners with low vision* + + Scenario: View tooltips for .ZIP + Given I am viewing a .ZIP in the edit modal + When I hover my mouse over the info icon for *Includes alternative text description for images* + Then I see *Visual elements in the resource have descriptions that can be accessed by screen readers for the benefit of blind learners* + When I hover my mouse over the info icon for *Includes high contrast display for low vision* + Then I see *The resource text and visual elements are displayed with high contrast for the benefit of users with low vision* + + Scenario: View options for Exercises + Given I am viewing an Exercise in the edit modal + Then I see a checkbox that says *Includes alternative text description for images* + + Scenario: View tooltips for Practice resources + Given I am viewing an Exercise in the edit modal + When I hover my mouse over the info icon for *Includes alternative text description for images* + Then I see *Visual elements in the resource have descriptions that can be accessed by screen readers for the benefit of blind learners* + + Scenario: Select and deselect accessibility options + Given that for any there are some checkbox options in the *Accessibility* section + When I select a checkbox for an