From 90bcd273a029f7d78d7ec568e7678d37519c6a17 Mon Sep 17 00:00:00 2001 From: Michael Roytman Date: Wed, 14 Feb 2018 15:09:37 -0500 Subject: [PATCH] add ConfigurationModelFixture for Studio Frontend Assets Page and add Bok Choy tests for Studio Frontend Assets Page --- cms/djangoapps/contentstore/config/models.py | 6 +- cms/urls.py | 9 +- common/test/acceptance/fixtures/config.py | 9 +- .../acceptance/pages/studio/asset_index.py | 378 +++- .../tests/studio/test_studio_asset.py | 247 +- .../data/uploads/studio-uploads/file-0.png | 0 .../data/uploads/studio-uploads/file-1.png | 0 .../data/uploads/studio-uploads/file-10.png | 0 .../data/uploads/studio-uploads/file-11.png | 0 .../data/uploads/studio-uploads/file-12.png | 0 .../data/uploads/studio-uploads/file-13.pdf | 0 .../data/uploads/studio-uploads/file-14.pdf | 0 .../data/uploads/studio-uploads/file-15.pdf | 0 .../data/uploads/studio-uploads/file-16.pdf | 0 .../data/uploads/studio-uploads/file-17.pdf | 0 .../data/uploads/studio-uploads/file-18.pdf | 0 .../data/uploads/studio-uploads/file-19.pdf | 0 .../data/uploads/studio-uploads/file-2.png | 0 .../data/uploads/studio-uploads/file-20.pdf | 0 .../data/uploads/studio-uploads/file-21.pdf | 0 .../data/uploads/studio-uploads/file-22.pdf | 0 .../data/uploads/studio-uploads/file-23.pdf | 0 .../data/uploads/studio-uploads/file-24.pdf | 0 .../data/uploads/studio-uploads/file-25.pdf | 0 .../data/uploads/studio-uploads/file-26.js | 0 .../data/uploads/studio-uploads/file-27.js | 0 .../data/uploads/studio-uploads/file-28.js | 0 .../data/uploads/studio-uploads/file-29.js | 0 .../data/uploads/studio-uploads/file-3.png | 0 .../data/uploads/studio-uploads/file-30.js | 0 .../data/uploads/studio-uploads/file-31.js | 0 .../data/uploads/studio-uploads/file-32.js | 0 .../data/uploads/studio-uploads/file-33.js | 0 .../data/uploads/studio-uploads/file-34.js | 0 .../data/uploads/studio-uploads/file-35.js | 0 .../data/uploads/studio-uploads/file-36.js | 0 .../data/uploads/studio-uploads/file-37.js | 0 .../data/uploads/studio-uploads/file-38.js | 0 .../data/uploads/studio-uploads/file-39.txt | 0 .../data/uploads/studio-uploads/file-4.png | 0 .../data/uploads/studio-uploads/file-40.txt | 0 .../data/uploads/studio-uploads/file-41.txt | 0 .../data/uploads/studio-uploads/file-42.txt | 0 .../data/uploads/studio-uploads/file-43.txt | 0 .../data/uploads/studio-uploads/file-44.txt | 0 .../data/uploads/studio-uploads/file-45.txt | 0 .../data/uploads/studio-uploads/file-46.txt | 0 .../data/uploads/studio-uploads/file-47.txt | 0 .../data/uploads/studio-uploads/file-48.txt | 0 .../data/uploads/studio-uploads/file-49.txt | 0 .../data/uploads/studio-uploads/file-5.png | 0 .../data/uploads/studio-uploads/file-50.txt | 0 .../data/uploads/studio-uploads/file-6.png | 0 .../data/uploads/studio-uploads/file-7.png | 0 .../data/uploads/studio-uploads/file-8.png | 0 .../data/uploads/studio-uploads/file-9.png | 0 package-lock.json | 1993 +++++++---------- 57 files changed, 1455 insertions(+), 1187 deletions(-) create mode 100644 common/test/data/uploads/studio-uploads/file-0.png create mode 100644 common/test/data/uploads/studio-uploads/file-1.png create mode 100644 common/test/data/uploads/studio-uploads/file-10.png create mode 100644 common/test/data/uploads/studio-uploads/file-11.png create mode 100644 common/test/data/uploads/studio-uploads/file-12.png create mode 100644 common/test/data/uploads/studio-uploads/file-13.pdf create mode 100644 common/test/data/uploads/studio-uploads/file-14.pdf create mode 100644 common/test/data/uploads/studio-uploads/file-15.pdf create mode 100644 common/test/data/uploads/studio-uploads/file-16.pdf create mode 100644 common/test/data/uploads/studio-uploads/file-17.pdf create mode 100644 common/test/data/uploads/studio-uploads/file-18.pdf create mode 100644 common/test/data/uploads/studio-uploads/file-19.pdf create mode 100644 common/test/data/uploads/studio-uploads/file-2.png create mode 100644 common/test/data/uploads/studio-uploads/file-20.pdf create mode 100644 common/test/data/uploads/studio-uploads/file-21.pdf create mode 100644 common/test/data/uploads/studio-uploads/file-22.pdf create mode 100644 common/test/data/uploads/studio-uploads/file-23.pdf create mode 100644 common/test/data/uploads/studio-uploads/file-24.pdf create mode 100644 common/test/data/uploads/studio-uploads/file-25.pdf create mode 100644 common/test/data/uploads/studio-uploads/file-26.js create mode 100644 common/test/data/uploads/studio-uploads/file-27.js create mode 100644 common/test/data/uploads/studio-uploads/file-28.js create mode 100644 common/test/data/uploads/studio-uploads/file-29.js create mode 100644 common/test/data/uploads/studio-uploads/file-3.png create mode 100644 common/test/data/uploads/studio-uploads/file-30.js create mode 100644 common/test/data/uploads/studio-uploads/file-31.js create mode 100644 common/test/data/uploads/studio-uploads/file-32.js create mode 100644 common/test/data/uploads/studio-uploads/file-33.js create mode 100644 common/test/data/uploads/studio-uploads/file-34.js create mode 100644 common/test/data/uploads/studio-uploads/file-35.js create mode 100644 common/test/data/uploads/studio-uploads/file-36.js create mode 100644 common/test/data/uploads/studio-uploads/file-37.js create mode 100644 common/test/data/uploads/studio-uploads/file-38.js create mode 100644 common/test/data/uploads/studio-uploads/file-39.txt create mode 100644 common/test/data/uploads/studio-uploads/file-4.png create mode 100644 common/test/data/uploads/studio-uploads/file-40.txt create mode 100644 common/test/data/uploads/studio-uploads/file-41.txt create mode 100644 common/test/data/uploads/studio-uploads/file-42.txt create mode 100644 common/test/data/uploads/studio-uploads/file-43.txt create mode 100644 common/test/data/uploads/studio-uploads/file-44.txt create mode 100644 common/test/data/uploads/studio-uploads/file-45.txt create mode 100644 common/test/data/uploads/studio-uploads/file-46.txt create mode 100644 common/test/data/uploads/studio-uploads/file-47.txt create mode 100644 common/test/data/uploads/studio-uploads/file-48.txt create mode 100644 common/test/data/uploads/studio-uploads/file-49.txt create mode 100644 common/test/data/uploads/studio-uploads/file-5.png create mode 100644 common/test/data/uploads/studio-uploads/file-50.txt create mode 100644 common/test/data/uploads/studio-uploads/file-6.png create mode 100644 common/test/data/uploads/studio-uploads/file-7.png create mode 100644 common/test/data/uploads/studio-uploads/file-8.png create mode 100644 common/test/data/uploads/studio-uploads/file-9.png diff --git a/cms/djangoapps/contentstore/config/models.py b/cms/djangoapps/contentstore/config/models.py index 5335a503f2..7eb060866d 100644 --- a/cms/djangoapps/contentstore/config/models.py +++ b/cms/djangoapps/contentstore/config/models.py @@ -27,12 +27,12 @@ class NewAssetsPageFlag(ConfigurationModel): There are 2 booleans to be concerned with - enabled_for_all_courses, and the implicit is_enabled(). They interact in the following ways: - - is_enabled: False, enabled_for_all_courses: True or False + - is_enabled(): False, enabled_for_all_courses: True or False - no one can use the feature. - - is_enabled: True, enabled_for_all_courses: False + - is_enabled(): True, enabled_for_all_courses: False - check for a CourseNewAssetsPageFlag, use that value (default False) - if no course_id provided, return False - - is_enabled: True, enabled_for_all_courses: True + - is_enabled(): True, enabled_for_all_courses: True - everyone can use the feature """ if not NewAssetsPageFlag.is_enabled(): diff --git a/cms/urls.py b/cms/urls.py index 4bf756f9d3..da45d2441b 100644 --- a/cms/urls.py +++ b/cms/urls.py @@ -5,11 +5,14 @@ from django.contrib.admin import autodiscover as django_autodiscover from django.utils.translation import ugettext_lazy as _ import contentstore.views +from contentstore.config.models import NewAssetsPageFlag +from cms.djangoapps.contentstore.views.organization import OrganizationListView import openedx.core.djangoapps.common_views.xblock import openedx.core.djangoapps.debug.views import openedx.core.djangoapps.external_auth.views import openedx.core.djangoapps.lang_pref.views -from cms.djangoapps.contentstore.views.organization import OrganizationListView + +from config_models.views import ConfigurationModelCurrentAPIView from ratelimitbackend import admin django_autodiscover() @@ -247,6 +250,10 @@ if 'debug_toolbar' in settings.INSTALLED_APPS: urlpatterns.append(url(r'^template/(?P