diff --git a/cms/djangoapps/contentstore/config/tests/test_models.py b/cms/djangoapps/contentstore/config/tests/test_models.py
deleted file mode 100644
index cc507a53b7..0000000000
--- a/cms/djangoapps/contentstore/config/tests/test_models.py
+++ /dev/null
@@ -1,90 +0,0 @@
-"""
-Tests for the models that control the
-persistent grading feature.
-"""
-import itertools
-
-import ddt
-from django.test import TestCase
-from opaque_keys.edx.locator import CourseLocator
-
-from contentstore.config.models import NewAssetsPageFlag
-from contentstore.config.tests.utils import new_assets_page_feature_flags
-
-
-@ddt.ddt
-class NewAssetsPageFlagTests(TestCase):
- """
- Tests the behavior of the feature flags for the new assets page.
- These are set via Django admin settings.
- """
- def setUp(self):
- super(NewAssetsPageFlagTests, self).setUp()
- self.course_id_1 = CourseLocator(org="edx", course="course", run="run")
- self.course_id_2 = CourseLocator(org="edx", course="course2", run="run")
-
- @ddt.data(*itertools.product(
- (True, False),
- (True, False),
- (True, False),
- ))
- @ddt.unpack
- def test_new_assets_page_feature_flags(self, global_flag, enabled_for_all_courses, enabled_for_course_1):
- with new_assets_page_feature_flags(
- global_flag=global_flag,
- enabled_for_all_courses=enabled_for_all_courses,
- course_id=self.course_id_1,
- enabled_for_course=enabled_for_course_1
- ):
- self.assertEqual(NewAssetsPageFlag.feature_enabled(), global_flag and enabled_for_all_courses)
- self.assertEqual(
- NewAssetsPageFlag.feature_enabled(self.course_id_1),
- global_flag and (enabled_for_all_courses or enabled_for_course_1)
- )
- self.assertEqual(
- NewAssetsPageFlag.feature_enabled(self.course_id_2),
- global_flag and enabled_for_all_courses
- )
-
- def test_enable_disable_course_flag(self):
- """
- Ensures that the flag, once enabled for a course, can also be disabled.
- """
- with new_assets_page_feature_flags(
- global_flag=True,
- enabled_for_all_courses=False,
- course_id=self.course_id_1,
- enabled_for_course=True
- ):
- self.assertTrue(NewAssetsPageFlag.feature_enabled(self.course_id_1))
- with new_assets_page_feature_flags(
- global_flag=True,
- enabled_for_all_courses=False,
- course_id=self.course_id_1,
- enabled_for_course=False
- ):
- self.assertFalse(NewAssetsPageFlag.feature_enabled(self.course_id_1))
-
- def test_enable_disable_globally(self):
- """
- Ensures that the flag, once enabled globally, can also be disabled.
- """
- with new_assets_page_feature_flags(
- global_flag=True,
- enabled_for_all_courses=True,
- ):
- self.assertTrue(NewAssetsPageFlag.feature_enabled())
- self.assertTrue(NewAssetsPageFlag.feature_enabled(self.course_id_1))
- with new_assets_page_feature_flags(
- global_flag=True,
- enabled_for_all_courses=False,
- course_id=self.course_id_1,
- enabled_for_course=True
- ):
- self.assertFalse(NewAssetsPageFlag.feature_enabled())
- self.assertTrue(NewAssetsPageFlag.feature_enabled(self.course_id_1))
- with new_assets_page_feature_flags(
- global_flag=False,
- ):
- self.assertFalse(NewAssetsPageFlag.feature_enabled())
- self.assertFalse(NewAssetsPageFlag.feature_enabled(self.course_id_1))
diff --git a/cms/djangoapps/contentstore/config/tests/utils.py b/cms/djangoapps/contentstore/config/tests/utils.py
deleted file mode 100644
index af5295e3b5..0000000000
--- a/cms/djangoapps/contentstore/config/tests/utils.py
+++ /dev/null
@@ -1,27 +0,0 @@
-"""
-Provides helper functions for tests that want
-to configure flags related to persistent grading.
-"""
-from contextlib import contextmanager
-
-from contentstore.config.models import NewAssetsPageFlag, CourseNewAssetsPageFlag
-from openedx.core.djangoapps.request_cache.middleware import RequestCache
-
-
-@contextmanager
-def new_assets_page_feature_flags(
- global_flag,
- enabled_for_all_courses=False,
- course_id=None,
- enabled_for_course=False
-):
- """
- Most test cases will use a single call to this manager,
- as they need to set the global setting and the course-specific
- setting for a single course.
- """
- RequestCache.clear_request_cache()
- NewAssetsPageFlag.objects.create(enabled=global_flag, enabled_for_all_courses=enabled_for_all_courses)
- if course_id:
- CourseNewAssetsPageFlag.objects.create(course_id=course_id, enabled=enabled_for_course)
- yield
diff --git a/cms/djangoapps/contentstore/features/transcripts.feature b/cms/djangoapps/contentstore/features/transcripts.feature
deleted file mode 100644
index 5aa6405774..0000000000
--- a/cms/djangoapps/contentstore/features/transcripts.feature
+++ /dev/null
@@ -1,84 +0,0 @@
-@shard_1 @requires_stub_youtube
-Feature: CMS Transcripts
- As a course author, I want to be able to create video components
-
- # For transcripts acceptance tests there are 3 available caption
- # files. They can be used to test various transcripts features. Two of
- # them can be imported from YouTube.
- #
- # The length of each file name is 11 characters. This is because the
- # YouTube's ID length is 11 characters. If file name is not of length 11,
- # front-end validation will not pass.
- #
- # t__eq_exist - this file exists on YouTube, and can be imported
- # via the transcripts menu; after import, this file will
- # be equal to the one stored locally
- # t_neq_exist - same as above, except local file will differ from the
- # one stored on YouTube
- # t_not_exist - this file does not exist on YouTube; it exists locally
-
- #3
- Scenario: Youtube id only: check "not found" and "import" states
- Given I have created a Video component with subtitles
- And I edit the component
-
- # Not found: w/o local or server subs
- And I remove "t_not_exist" transcripts id from store
- And I enter a "http://youtu.be/t_not_exist" source to field number 1
- Then I see status message "not found"
- And I see value "" in the field "Default Timed Transcript"
-
- # Import: w/o local but with server subs
- And I remove "t__eq_exist" transcripts id from store
- And I enter a "http://youtu.be/t__eq_exist" source to field number 1
- Then I see status message "not found on edx"
- And I see button "import"
- And I click transcript button "import"
- Then I see status message "found"
- And I see button "upload_new_timed_transcripts"
- And I see button "download_to_edit"
- And I see value "t__eq_exist" in the field "Default Timed Transcript"
-
-
- # Disabled 1/29/14 due to flakiness observed in master
- #10
- #Scenario: User sets youtube_id w/o local but with server subs and one html5 link w/o subs
- # Given I have created a Video component
- # And I edit the component
- #
- # And I enter a "http://youtu.be/t__eq_exist" source to field number 1
- # Then I see status message "not found on edx"
- # And I see button "import"
- # And I click transcript button "import"
- # Then I see status message "found"
- #
- # And I enter a "t_not_exist.mp4" source to field number 2
- # Then I see status message "found"
- # And I see value "t__eq_exist" in the field "Default Timed Transcript"
-
- # Flaky test fails occasionally in master. https://openedx.atlassian.net/browse/BLD-892
- #21
- #Scenario: Work with 1 field only: Enter HTML5 source with transcripts - save - > change it to another one HTML5 source w/o #transcripts - click on use existing - > change it to another one HTML5 source w/o transcripts - click on use existing
- # Given I have created a Video component with subtitles "t_not_exist"
- # And I edit the component
- #
- # And I enter a "t_not_exist.mp4" source to field number 1
- # Then I see status message "found"
- # And I see button "download_to_edit"
- # And I see button "upload_new_timed_transcripts"
- # And I see value "t_not_exist" in the field "Default Timed Transcript"
- #
- # And I save changes
- # And I edit the component
- #
- # And I enter a "video_name_2.mp4" source to field number 1
- # Then I see status message "use existing"
- # And I see button "use_existing"
- # And I click transcript button "use_existing"
- # And I see value "video_name_2" in the field "Default Timed Transcript"
- #
- # And I enter a "video_name_3.mp4" source to field number 1
- # Then I see status message "use existing"
- # And I see button "use_existing"
- # And I click transcript button "use_existing"
- # And I see value "video_name_3" in the field "Default Timed Transcript"
diff --git a/cms/djangoapps/contentstore/features/transcripts.py b/cms/djangoapps/contentstore/features/transcripts.py
deleted file mode 100644
index 177fe3c12d..0000000000
--- a/cms/djangoapps/contentstore/features/transcripts.py
+++ /dev/null
@@ -1,261 +0,0 @@
-# disable missing docstring
-# pylint: disable=missing-docstring
-
-import os
-
-from django.conf import settings
-from lettuce import step, world
-from splinter.request_handler.request_handler import RequestHandler
-
-from xmodule.contentstore.content import StaticContent
-from xmodule.contentstore.django import contentstore
-from xmodule.exceptions import NotFoundError
-
-TEST_ROOT = settings.COMMON_TEST_DATA_ROOT
-
-# We should wait 300 ms for event handler invocation + 200ms for safety.
-DELAY = 0.5
-
-ERROR_MESSAGES = {
- 'url_format': u'Incorrect url format.',
- 'file_type': u'Link types should be unique.',
- 'links_duplication': u'Links should be unique.',
-}
-
-STATUSES = {
- 'found': u'Timed Transcript Found',
- 'not found on edx': u'No EdX Timed Transcript',
- 'not found': u'No Timed Transcript',
- 'replace': u'Timed Transcript Conflict',
- 'uploaded_successfully': u'Timed Transcript Uploaded Successfully',
- 'use existing': u'Confirm Timed Transcript',
-}
-
-SELECTORS = {
- 'error_bar': '.transcripts-error-message',
- 'url_inputs': '.videolist-settings-item input.input',
- 'collapse_link': '.collapse-action.collapse-setting',
- 'collapse_bar': '.videolist-extra-videos',
- 'status_bar': '.transcripts-message-status',
-}
-
-# button type , button css selector, button message
-TRANSCRIPTS_BUTTONS = {
- 'import': ('.setting-import', 'Import YouTube Transcript'),
- 'download_to_edit': ('.setting-download', 'Download Transcript for Editing'),
- 'disabled_download_to_edit': ('.setting-download.is-disabled', 'Download Transcript for Editing'),
- 'upload_new_timed_transcripts': ('.setting-upload', 'Upload New Transcript'),
- 'replace': ('.setting-replace', 'Yes, replace the edX transcript with the YouTube transcript'),
- 'choose': ('.setting-choose', 'Timed Transcript from {}'),
- 'use_existing': ('.setting-use-existing', 'Use Current Transcript'),
-}
-
-
-@step('I clear fields$')
-def clear_fields(_step):
-
- # Clear the input fields and trigger an 'input' event
- script = """
- $('{selector}')
- .prop('disabled', false)
- .removeClass('is-disabled')
- .attr('aria-disabled', false)
- .val('')
- .trigger('input');
- """.format(selector=SELECTORS['url_inputs'])
- world.browser.execute_script(script)
-
- world.wait(DELAY)
- world.wait_for_ajax_complete()
-
-
-@step('I clear field number (.+)$')
-def clear_field(_step, index):
- index = int(index) - 1
- world.css_fill(SELECTORS['url_inputs'], '', index)
-
- # For some reason ChromeDriver doesn't trigger an 'input' event after filling
- # the field with an empty value. That's why we trigger it manually via jQuery.
- world.trigger_event(SELECTORS['url_inputs'], event='input', index=index)
-
- world.wait(DELAY)
- world.wait_for_ajax_complete()
-
-
-@step('I expect (.+) inputs are disabled$')
-def inputs_are_disabled(_step, indexes):
- index_list = [int(i.strip()) - 1 for i in indexes.split(',')]
- for index in index_list:
- el = world.css_find(SELECTORS['url_inputs'])[index]
-
- assert el['disabled']
-
-
-@step('I expect inputs are enabled$')
-def inputs_are_enabled(_step):
- for index in range(3):
- el = world.css_find(SELECTORS['url_inputs'])[index]
-
- assert not el['disabled']
-
-
-@step('I do not see error message$')
-def i_do_not_see_error_message(_step):
- assert not world.css_visible(SELECTORS['error_bar'])
-
-
-@step('I see error message "([^"]*)"$')
-def i_see_error_message(_step, error):
- assert world.css_has_text(SELECTORS['error_bar'], ERROR_MESSAGES[error])
-
-
-@step('I do not see status message$')
-def i_do_not_see_status_message(_step):
- assert not world.css_visible(SELECTORS['status_bar'])
-
-
-@step('I see status message "([^"]*)"$')
-def i_see_status_message(_step, status):
- assert not world.css_visible(SELECTORS['error_bar'])
- assert world.css_has_text(SELECTORS['status_bar'], STATUSES[status])
-
- DOWNLOAD_BUTTON = TRANSCRIPTS_BUTTONS["download_to_edit"][0]
- if world.is_css_present(DOWNLOAD_BUTTON, wait_time=1) and not world.css_find(DOWNLOAD_BUTTON)[0].has_class('is-disabled'):
- assert _transcripts_are_downloaded()
-
-
-@step('I (.*)see button "([^"]*)"$')
-def i_see_button(_step, not_see, button_type):
- button = button_type.strip()
-
- if not_see.strip():
- assert world.is_css_not_present(TRANSCRIPTS_BUTTONS[button][0])
- else:
- assert world.css_has_text(TRANSCRIPTS_BUTTONS[button][0], TRANSCRIPTS_BUTTONS[button][1])
-
-
-@step(r'I (.*)see (.*)button "([^"]*)" number (\d+)$')
-def i_see_button_with_custom_text(_step, not_see, button_type, custom_text, index):
- button = button_type.strip()
- custom_text = custom_text.strip()
- index = int(index.strip()) - 1
-
- if not_see.strip():
- assert world.is_css_not_present(TRANSCRIPTS_BUTTONS[button][0])
- else:
- assert world.css_has_text(TRANSCRIPTS_BUTTONS[button][0], TRANSCRIPTS_BUTTONS[button][1].format(custom_text), index)
-
-
-@step('I click transcript button "([^"]*)"$')
-def click_button_transcripts_variant(_step, button_type):
- button = button_type.strip()
- world.css_click(TRANSCRIPTS_BUTTONS[button][0])
- world.wait_for_ajax_complete()
-
-
-@step(r'I click transcript button "([^"]*)" number (\d+)$')
-def click_button_index(_step, button_type, index):
- button = button_type.strip()
- index = int(index.strip()) - 1
-
- world.css_click(TRANSCRIPTS_BUTTONS[button][0], index)
- world.wait_for_ajax_complete()
-
-
-@step('I remove "([^"]+)" transcripts id from store')
-def remove_transcripts_from_store(_step, subs_id):
- """Remove from store, if transcripts content exists."""
- filename = 'subs_{0}.srt.sjson'.format(subs_id.strip())
- content_location = StaticContent.compute_location(
- world.scenario_dict['COURSE'].id,
- filename
- )
- try:
- content = contentstore().find(content_location)
- contentstore().delete(content.location)
- print 'Transcript file was removed from store.'
- except NotFoundError:
- print 'Transcript file was NOT found and not removed.'
-
-
-@step(r'I enter a "([^"]+)" source to field number (\d+)$')
-def i_enter_a_source(_step, link, index):
- index = int(index) - 1
-
- if index is not 0 and not world.css_visible(SELECTORS['collapse_bar']):
- world.css_click(SELECTORS['collapse_link'])
-
- assert world.css_visible(SELECTORS['collapse_bar'])
-
- world.css_fill(SELECTORS['url_inputs'], link, index)
- world.wait(DELAY)
- world.wait_for_ajax_complete()
-
-
-@step('I upload the transcripts file "([^"]*)"$')
-def upload_file(_step, file_name):
- path = os.path.join(TEST_ROOT, 'uploads/', file_name.strip())
- world.browser.execute_script("$('form.file-chooser').show()")
- world.browser.attach_file('transcript-file', os.path.abspath(path))
- world.wait_for_ajax_complete()
-
-
-@step('I see "([^"]*)" text in the captions')
-def check_text_in_the_captions(_step, text):
- world.wait_for_present('.video.is-captions-rendered')
- world.wait_for(lambda _: world.css_text('.subtitles'), timeout=30)
- actual_text = world.css_text('.subtitles')
- assert text in actual_text
-
-
-@step('I see value "([^"]*)" in the field "([^"]*)"$')
-def check_transcripts_field(_step, values, field_name):
- world.select_editor_tab('Advanced')
- tab = world.css_find('#settings-tab').first
- field_id = '#' + tab.find_by_xpath('.//label[text()="%s"]' % field_name.strip())[0]['for']
- values_list = [i.strip() == world.css_value(field_id) for i in values.split('|')]
- assert any(values_list)
- world.select_editor_tab('Basic')
-
-
-@step('I save changes$')
-def save_changes(_step):
- world.save_component()
-
-
-@step('I open tab "([^"]*)"$')
-def open_tab(_step, tab_name):
- world.select_editor_tab(tab_name)
-
-
-@step('I set value "([^"]*)" to the field "([^"]*)"$')
-def set_value_transcripts_field(_step, value, field_name):
- tab = world.css_find('#settings-tab').first
- XPATH = './/label[text()="{name}"]'.format(name=field_name)
- SELECTOR = '#' + tab.find_by_xpath(XPATH)[0]['for']
- element = world.css_find(SELECTOR).first
- if element['type'] == 'text':
- SCRIPT = '$("{selector}").val("{value}").change()'.format(
- selector=SELECTOR,
- value=value
- )
- world.browser.execute_script(SCRIPT)
- assert world.css_has_value(SELECTOR, value)
- else:
- assert False, 'Incorrect element type.'
- world.wait_for_ajax_complete()
-
-
-@step('I revert the transcript field "([^"]*)"$')
-def revert_transcripts_field(_step, field_name):
- world.revert_setting_entry(field_name)
-
-
-def _transcripts_are_downloaded():
- world.wait_for_ajax_complete()
- request = RequestHandler()
- DOWNLOAD_BUTTON = world.css_find(TRANSCRIPTS_BUTTONS["download_to_edit"][0]).first
- url = DOWNLOAD_BUTTON['href']
- request.connect(url)
-
- return request.status_code.is_success()
diff --git a/cms/djangoapps/contentstore/features/upload.feature b/cms/djangoapps/contentstore/features/upload.feature
deleted file mode 100644
index 189ab287fe..0000000000
--- a/cms/djangoapps/contentstore/features/upload.feature
+++ /dev/null
@@ -1,118 +0,0 @@
-@shard_2
-Feature: CMS.Upload Files
- As a course author, I want to be able to upload files for my students
-
- # Uploading isn't working on safari with sauce labs
- @skip_safari
- Scenario: Users can upload files
- Given I am at the files and upload page of a Studio course
- When I upload the file "test" by clicking "Upload your first asset"
- Then I should see the file "test" was uploaded
- And The url for the file "test" is valid
- When I upload the file "test2"
- Then I should see the file "test2" was uploaded
- And The url for the file "test2" is valid
-
- # Uploading isn't working on safari with sauce labs
- @skip_safari
- Scenario: Users can upload multiple files
- Given I am at the files and upload page of a Studio course
- When I upload the files "test,test2"
- Then I should see the file "test" was uploaded
- And I should see the file "test2" was uploaded
- And The url for the file "test2" is valid
- And The url for the file "test" is valid
-
- # Uploading isn't working on safari with sauce labs
- @skip_safari
- Scenario: Users can update files
- Given I am at the files and upload page of a Studio course
- When I upload the file "test"
- And I upload the file "test"
- Then I should see only one "test"
-
- # Uploading isn't working on safari with sauce labs
- @skip_safari
- Scenario: Users can delete uploaded files
- Given I am at the files and upload page of a Studio course
- When I upload the file "test"
- And I delete the file "test"
- Then I should not see the file "test" was uploaded
- And I see a confirmation that the file was deleted
-
- # Uploading isn't working on safari with sauce labs
- @skip_safari
- Scenario: Users can download files
- Given I am at the files and upload page of a Studio course
- When I upload the file "test"
- Then I can download the correct "test" file
-
- # Uploading isn't working on safari with sauce labs
- @skip_safari
- Scenario: Users can download updated files
- Given I am at the files and upload page of a Studio course
- When I upload the file "test"
- And I modify "test"
- And I reload the page
- And I upload the file "test"
- Then I can download the correct "test" file
-
- # Uploading isn't working on safari with sauce labs
- @skip_safari
- Scenario: Users can lock assets through asset index
- Given I am at the files and upload page of a Studio course
- When I upload an asset
- And I lock the asset
- Then the asset is locked
- And I see a "saving" notification
- And I reload the page
- Then the asset is locked
-
- # Uploading isn't working on safari with sauce labs
- @skip_safari
- Scenario: Users can unlock assets through asset index
- Given I have created a course with a locked asset
- When I unlock the asset
- Then the asset is unlocked
- And I see a "saving" notification
- And I reload the page
- Then the asset is unlocked
-
- # Uploading isn't working on safari with sauce labs
- @skip_safari
- Scenario: Locked assets can't be viewed if logged in as an unregistered user
- Given I have created a course with a locked asset
- And the user "bob" exists
- When "bob" logs in
- Then the asset is protected
-
- # Uploading isn't working on safari with sauce labs
- @skip_safari
- Scenario: Locked assets can be viewed if logged in as a registered user
- Given I have created a course with a locked asset
- And the user "bob" exists
- And the user "bob" is enrolled in the course
- When "bob" logs in
- Then the asset is viewable
-
- # Uploading isn't working on safari with sauce labs
- @skip_safari
- Scenario: Locked assets can't be viewed if logged out
- Given I have created a course with a locked asset
- When I log out
- Then the asset is protected
-
- # Uploading isn't working on safari with sauce labs
- @skip_safari
- Scenario: Locked assets can be viewed with is_staff account
- Given I have created a course with a locked asset
- And the user "staff" exists as a course is_staff
- When "staff" logs in
- Then the asset is viewable
-
- # Uploading isn't working on safari with sauce labs
- @skip_safari
- Scenario: Unlocked assets can be viewed by anyone
- Given I have created a course with a unlocked asset
- When I log out
- Then the asset is viewable
diff --git a/cms/djangoapps/contentstore/features/upload.py b/cms/djangoapps/contentstore/features/upload.py
deleted file mode 100644
index dfa7f16601..0000000000
--- a/cms/djangoapps/contentstore/features/upload.py
+++ /dev/null
@@ -1,230 +0,0 @@
-# pylint: disable=missing-docstring
-# pylint: disable=redefined-outer-name
-
-import os
-import random
-import string
-
-import requests
-from django.conf import settings
-from django.contrib.auth.models import User
-from lettuce import step, world
-from lettuce.django import django_url
-from nose.tools import assert_equal, assert_not_equal
-
-from student.models import CourseEnrollment
-
-TEST_ROOT = settings.COMMON_TEST_DATA_ROOT
-ASSET_NAMES_CSS = 'td.name-col > span.title > a.filename'
-
-
-@step(u'I go to the files and uploads page$')
-def go_to_uploads(_step):
- menu_css = 'li.nav-course-courseware'
- uploads_css = 'li.nav-course-courseware-uploads a'
- world.css_click(menu_css)
- world.css_click(uploads_css)
-
-
-@step(u'I upload the( test)? file "([^"]*)"$')
-def upload_file(_step, is_test_file, file_name, button_text=None):
- if button_text:
- world.click_link(button_text)
- else:
- world.click_link('Upload New File')
-
- if not is_test_file:
- _write_test_file(file_name, "test file")
-
- # uploading the file itself
- path = os.path.join(TEST_ROOT, 'uploads/', file_name)
- world.browser.execute_script("$('input.file-input').css('display', 'block')")
- world.browser.attach_file('file', os.path.abspath(path))
- close_css = 'a.close-button'
- world.css_click(close_css)
-
-
-@step(u'I upload the file "([^"]*)" by clicking "([^"]*)"')
-def upload_file_on_button_press(_step, file_name, button_text=None):
- upload_file(_step, '', file_name, button_text)
-
-
-@step(u'I upload the files "([^"]*)"$')
-def upload_files(_step, files_string):
- # files_string should be comma separated with no spaces.
- files = files_string.split(",")
- upload_css = 'a.upload-button'
- world.css_click(upload_css)
-
- # uploading the files
- for filename in files:
- _write_test_file(filename, "test file")
- path = os.path.join(TEST_ROOT, 'uploads/', filename)
- world.browser.execute_script("$('input.file-input').css('display', 'block')")
- world.browser.attach_file('file', os.path.abspath(path))
-
- close_css = 'a.close-button'
- world.css_click(close_css)
-
-
-@step(u'I should not see the file "([^"]*)" was uploaded$')
-def check_not_there(_step, file_name):
- # Either there are no files, or there are files but
- # not the one I expect not to exist.
-
- # Since our only test for deletion right now deletes
- # the only file that was uploaded, our success criteria
- # will be that there are no files.
- # In the future we can refactor if necessary.
- assert world.is_css_not_present(ASSET_NAMES_CSS)
-
-
-@step(u'I should see the file "([^"]*)" was uploaded$')
-def check_upload(_step, file_name):
- index = get_index(file_name)
- assert_not_equal(index, -1)
-
-
-@step(u'The url for the file "([^"]*)" is valid$')
-def check_url(_step, file_name):
- r = get_file(file_name)
- assert_equal(r.status_code, 200)
-
-
-@step(u'I delete the file "([^"]*)"$')
-def delete_file(_step, file_name):
- index = get_index(file_name)
- assert index != -1
- delete_css = "a.remove-asset-button"
- world.css_click(delete_css, index=index)
- world.confirm_studio_prompt()
-
-
-@step(u'I should see only one "([^"]*)"$')
-def no_duplicate(_step, file_name):
- all_names = world.css_find(ASSET_NAMES_CSS)
- only_one = False
- for i in range(len(all_names)):
- if file_name == world.css_html(ASSET_NAMES_CSS, index=i):
- only_one = not only_one
- assert only_one
-
-
-@step(u'I can download the correct "([^"]*)" file$')
-def check_download(_step, file_name):
- path = os.path.join(TEST_ROOT, 'uploads/', file_name)
- with open(os.path.abspath(path), 'r') as cur_file:
- cur_text = cur_file.read()
- r = get_file(file_name)
- downloaded_text = r.text
- assert cur_text == downloaded_text
- # resetting the file back to its original state
- _write_test_file(file_name, "This is an arbitrary file for testing uploads")
-
-
-def _write_test_file(file_name, text):
- path = os.path.join(TEST_ROOT, 'uploads/', file_name)
- # resetting the file back to its original state
- with open(os.path.abspath(path), 'w') as cur_file:
- cur_file.write(text)
-
-
-@step(u'I modify "([^"]*)"$')
-def modify_upload(_step, file_name):
- new_text = ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(10))
- _write_test_file(file_name, new_text)
-
-
-@step(u'I upload an asset$')
-def upload_an_asset(step):
- step.given('I upload the file "asset.html"')
-
-
-@step(u'I (lock|unlock) the asset$')
-def lock_unlock_file(_step, _lock_state):
- index = get_index('asset.html')
- assert index != -1, 'Expected to find an asset but could not.'
-
- # Warning: this is a misnomer, it really only toggles the
- # lock state. TODO: fix it.
- lock_css = "input.lock-checkbox"
- world.css_find(lock_css)[index].click()
-
-
-@step(u'the user "([^"]*)" is enrolled in the course$')
-def user_foo_is_enrolled_in_the_course(step, name):
- world.create_user(name, 'test')
- user = User.objects.get(username=name)
-
- course_id = world.scenario_dict['COURSE'].id
- CourseEnrollment.enroll(user, course_id)
-
-
-@step(u'Then the asset is (locked|unlocked)$')
-def verify_lock_unlock_file(_step, lock_state):
- index = get_index('asset.html')
- assert index != -1, 'Expected to find an asset but could not.'
- lock_css = "input.lock-checkbox"
- checked = world.css_find(lock_css)[index]._element.get_attribute('checked')
- assert_equal(lock_state == "locked", bool(checked))
-
-
-@step(u'I am at the files and upload page of a Studio course')
-def at_upload_page(step):
- step.given('I have opened a new course in studio')
- step.given('I go to the files and uploads page')
-
-
-@step(u'I have created a course with a (locked|unlocked) asset$')
-def open_course_with_locked(step, lock_state):
- step.given('I am at the files and upload page of a Studio course')
- step.given('I upload the file "asset.html"')
-
- if lock_state == "locked":
- step.given('I lock the asset')
- step.given('I reload the page')
-
-
-@step(u'Then the asset is (viewable|protected)$')
-def view_asset(_step, status):
- asset_loc = world.scenario_dict['COURSE'].id.make_asset_key(asset_type='asset', path='asset.html')
- svr_loc = django_url()
- asset_url = unicode(asset_loc)
- divider = '/'
- if asset_url[0] == '/':
- divider = ''
- url = '{}{}{}'.format(svr_loc, divider, asset_url)
- if status == 'viewable':
- expected_text = 'test file'
- else:
- expected_text = 'Unauthorized'
-
- # Note that world.visit would trigger a 403 error instead of displaying "Unauthorized"
- # Instead, we can drop back into the selenium driver get command.
- world.browser.driver.get(url)
- assert_equal(world.css_text('body'), expected_text)
-
-
-@step('I see a confirmation that the file was deleted$')
-def i_see_a_delete_confirmation(_step):
- alert_css = '#notification-confirmation'
- assert world.is_css_present(alert_css)
-
-
-def get_index(file_name):
- all_names = world.css_find(ASSET_NAMES_CSS)
- for i in range(len(all_names)):
- if file_name == world.css_html(ASSET_NAMES_CSS, index=i):
- return i
- return -1
-
-
-def get_file(file_name):
- index = get_index(file_name)
- assert index != -1
- url_css = 'a.filename'
-
- def get_url():
- return world.css_find(url_css)[index]._element.get_attribute('href')
- url = world.retry_on_exception(get_url)
- return requests.get(url)
diff --git a/cms/djangoapps/contentstore/features/video.py b/cms/djangoapps/contentstore/features/video.py
deleted file mode 100644
index e8d9e1fe35..0000000000
--- a/cms/djangoapps/contentstore/features/video.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# pylint: disable=missing-docstring
-
-from lettuce import step, world
-
-SELECTORS = {
- 'spinner': '.video-wrapper .spinner',
- 'controls': '.video-controls',
-}
-
-# We should wait 300 ms for event handler invocation + 200ms for safety.
-DELAY = 0.5
-
-
-@step('I have uploaded subtitles "([^"]*)"$')
-def i_have_uploaded_subtitles(_step, sub_id):
- _step.given('I go to the files and uploads page')
- _step.given('I upload the test file "subs_{}.srt.sjson"'.format(sub_id.strip()))
-
-
-@step('I have created a Video component$')
-def i_created_a_video_component(step):
- step.given('I am in Studio editing a new unit')
- world.create_component_instance(
- step=step,
- category='video',
- )
-
- world.wait_for_xmodule()
- world.disable_jquery_animations()
-
- world.wait_for_present('.is-initialized')
- world.wait(DELAY)
- world.wait_for_invisible(SELECTORS['spinner'])
- if not world.youtube.config.get('youtube_api_blocked'):
- world.wait_for_visible(SELECTORS['controls'])
-
-
-@step('I have created a Video component with subtitles$')
-def i_created_a_video_with_subs(_step):
- _step.given('I have created a Video component with subtitles "3_yD_cEKoCk"')
-
-
-@step('I have created a Video component with subtitles "([^"]*)"$')
-def i_created_a_video_with_subs_with_name(_step, sub_id):
- _step.given('I have created a Video component')
-
- # Store the current URL so we can return here
- video_url = world.browser.url
-
- # Upload subtitles for the video using the upload interface
- _step.given('I have uploaded subtitles "{}"'.format(sub_id))
-
- # Return to the video
- world.visit(video_url)
-
- world.wait_for_xmodule()
-
- # update .sub filed with proper subs name (which mimics real Studio/XML behavior)
- # this is needed only for that videos which are created in acceptance tests.
- _step.given('I edit the component')
- world.wait_for_ajax_complete()
- _step.given('I save changes')
-
- world.disable_jquery_animations()
-
- world.wait_for_present('.is-initialized')
- world.wait_for_invisible(SELECTORS['spinner'])
diff --git a/cms/djangoapps/contentstore/views/assets.py b/cms/djangoapps/contentstore/views/assets.py
index 4fd56f3cbf..773d4d9f90 100644
--- a/cms/djangoapps/contentstore/views/assets.py
+++ b/cms/djangoapps/contentstore/views/assets.py
@@ -20,7 +20,6 @@ from xmodule.exceptions import NotFoundError
from xmodule.modulestore.django import modulestore
from xmodule.modulestore.exceptions import ItemNotFoundError
-from contentstore.config.models import NewAssetsPageFlag
from contentstore.utils import reverse_course_url
from contentstore.views.exception import AssetNotFoundException, AssetSizeTooLargeException
from edxmako.shortcuts import render_to_response
@@ -102,7 +101,6 @@ def _asset_index(request, course_key):
return render_to_response('asset_index.html', {
'language_code': request.LANGUAGE_CODE,
- 'waffle_flag_enabled': NewAssetsPageFlag.feature_enabled(course_key),
'context_course': course_module,
'max_file_size_in_mbs': settings.MAX_ASSET_UPLOAD_FILE_SIZE_IN_MB,
'chunk_size_in_mbs': settings.UPLOAD_CHUNK_SIZE_IN_MB,
diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html
index 8d323b7a4a..d31d844419 100644
--- a/cms/templates/asset_index.html
+++ b/cms/templates/asset_index.html
@@ -14,31 +14,8 @@
<%namespace name='static' file='static_content.html'/>
<%block name="header_extras">
- % if waffle_flag_enabled:
- % if not settings.STUDIO_FRONTEND_CONTAINER_URL:
-
-
- % endif
- % else:
- % for template_name in ["asset"]:
-
- % endfor
- % endif
-
-
-<%block name="requirejs">
- % if not waffle_flag_enabled:
- require(["js/factories/asset_index"], function (AssetIndexFactory) {
- AssetIndexFactory({
- assetCallbackUrl: "${asset_callback_url|n, js_escaped_string}",
- uploadChunkSizeInMBs: ${chunk_size_in_mbs|n, dump_js_escaped_json},
- maxFileSizeInMBs: ${max_file_size_in_mbs|n, dump_js_escaped_json},
- maxFileSizeRedirectUrl: "${max_file_size_redirect_url|n, js_escaped_string}"
- });
- });
- % endif
+
+
<%block name="content">
@@ -49,122 +26,36 @@
${_("Content")}
- ${_("Files & Uploads")}
-
- % if not waffle_flag_enabled:
-