Bug fix video player controls a11y

.gitignore

@@ -1,49 +1,73 @@
+# .gitignore for edx-platform.
+# There's a lot here, please try to keep it organized.
+
+### Files private to developers
+
+requirements/private.txt
+lms/envs/private.py
+cms/envs/private.py
+
+### Python artifacts
 *.pyc
+
+### Editor and IDE artifacts
 *~
-*.scssc
 *.swp
 *.orig
+/nbproject
+.idea/
+.redcar/
+
+### OS X artifacts
 *.DS_Store
-*.mo
+.AppleDouble
 :2e_*
 :2e#
-.AppleDouble
-database.sqlite
-requirements/private.txt
-lms/envs/private.py
-cms/envs/private.py
-courseware/static/js/mathjax/*
-flushdb.sh
-build
+
+### Internationalization artifacts
+*.mo
+conf/locale/en/LC_MESSAGES/*.po
+!messages.po
+
+### Testing artifacts
+.testids/
+.noseids
+nosetests.xml
 .coverage
 coverage.xml
 cover/
-log/
+cover_html/
 reports/
-/src/
-\#*\#
+
+### Installation artifacts
 *.egg-info
 Gemfile.lock
-.env/
-conf/locale/en/LC_MESSAGES/*.po
-!messages.po
+.pip_download_cache/
+.prereqs_cache
+.vagrant/
+node_modules
+
+### Static assets pipeline artifacts
+*.scssc
 lms/static/sass/*.css
 lms/static/sass/application.scss
 lms/static/sass/course.scss
 cms/static/sass/*.css
-lms/lib/comment_client/python
-nosetests.xml
-cover_html/
-.idea/
-.redcar/
+
+### Logging artifacts
+log/
+logs
 chromedriver.log
-/nbproject
 ghostdriver.log
-node_modules
-.pip_download_cache/
-.prereqs_cache
+
+### Unknown artifacts
+database.sqlite
+courseware/static/js/mathjax/*
+flushdb.sh
+build
+/src/
+\#*\#
+.env/
+lms/lib/comment_client/python
 autodeploy.properties
 .ws_migrations_complete
-.vagrant/
-logs
-.testids/

CHANGELOG.rst

@@ -5,8 +5,13 @@ These are notable changes in edx-platform.  This is a rolling list of changes,
 in roughly chronological order, most recent first.  Add your entries at or near
 the top.  Include a label indicating the component affected.
 
+LMS: Add PaidCourseRegistration mode, where payment is required before course registration.
+
 LMS: Add split testing functionality for internal use.
 
+CMS: Add edit_course_tabs management command, providing a primitive
+editing capability for a course's list of tabs.
+
 Studio and LMS: add ability to lock assets (cannot be viewed unless registered for class).
 
 LMS: Improved accessibility of parts of forum navigation sidebar.
@@ -311,3 +316,6 @@ Common: Updated CodeJail.
 Common: Allow setting of authentication session cookie name.
 
 LMS: Option to email students when enroll/un-enroll them.
+
+Blades: Added WAI-ARIA markup to the video player controls. These are now fully
+accessible by screen readers. 

cms/djangoapps/contentstore/features/upload.feature

@@ -5,17 +5,16 @@ Feature: CMS.Upload Files
     # Uploading isn't working on safari with sauce labs
     @skip_safari
     Scenario: Users can upload files
-        Given I have opened a new course in Studio
-        And I go to the files and uploads page
+        Given I am at the files and upload page of a Studio course
         When I upload the file "test"
         Then I should see the file "test" was uploaded
         And The url for the file "test" is valid
 
+    # Uploading isn't working on safari with sauce labs
     @skip_safari
     Scenario: Users can upload multiple files
-        Given I have opened a new course in studio
-        And I go to the files and uploads page
-        When I upload the files "test","test2"
+        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
@@ -24,17 +23,15 @@ Feature: CMS.Upload Files
     # Uploading isn't working on safari with sauce labs
     @skip_safari
     Scenario: Users can update files
-        Given I have opened a new course in studio
-        And I go to the files and uploads page
+        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 have opened a new course in studio
-        And I go to the files and uploads page
+        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
@@ -43,16 +40,14 @@ Feature: CMS.Upload Files
     # Uploading isn't working on safari with sauce labs
     @skip_safari
     Scenario: Users can download files
-        Given I have opened a new course in studio
-        And I go to the files and uploads page
+        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 have opened a new course in studio
-        And I go to the files and uploads page
+        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
@@ -62,57 +57,59 @@ Feature: CMS.Upload Files
     # Uploading isn't working on safari with sauce labs
     @skip_safari
     Scenario: Users can lock assets through asset index
-        Given I have opened a new course in studio
-        And I go to the files and uploads page
-        When I upload the file "test"
-        And I lock "test"
-        Then "test" is locked
+        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 "test" is locked
+        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 opened a course with a locked asset "test"
-        And I unlock "test"
-        Then "test" is unlocked
+        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 "test" is unlocked
+        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
-    # TODO: work with Jay
-#    @skip_safari
-#    Scenario: Locked assets can't be viewed if logged in as unregistered user
-#        Given I have opened a course with a locked asset "locked.html"
-#        Then the asset "locked.html" can be clicked from the asset index
-#        And the user "bob" exists
-#        And "bob" logs in
-#        Then the asset "locked.html" is protected
+    @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 opened a course with a locked asset "locked.html"
-        # Note that logging out doesn't really matter at the moment-
-        # the asset will be protected because the user sent to middleware is the anonymous user.
-        # Need to work with Jay.
-        And I log out
-        Then the asset "locked.html" is protected
+        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 opened a course with a locked asset "locked.html"
+        Given I have created a course with a locked asset
         And the user "staff" exists as a course is_staff
-        And "staff" logs in
-        Then the asset "locked.html" can be clicked from the asset index
+        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 opened a course with a unlocked asset "unlocked.html"
-        Then the asset "unlocked.html" can be clicked from the asset index
-        And I log out
-        Then the asset "unlocked.html" is viewable
+        Given I have created a course with a unlocked asset
+        When I log out
+        Then the asset is viewable