Rc/2013 09 30

CHANGELOG.rst

@@ -5,6 +5,10 @@ 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 split testing functionality for internal use.
+
+Studio and LMS: add ability to lock assets (cannot be viewed unless registered for class).
+
 LMS: Improved accessibility of parts of forum navigation sidebar.
 
 LMS: enhanced accessibility labeling and aria support for the discussion forum new post dropdown as well as response and comment area labeling.

CONTRIBUTING.md

@@ -0,0 +1,22 @@
+Contributions are very welcome. The easiest way is to fork the repo and then
+make a pull request from your fork. Before your pull request is merged, it will
+be reviewed by at least one person. There may be feedback so expect comments on
+the pull request. Add yourself to the AUTHORS file in your first pull request.
+
+Please review:
+
+* [Python Guidelines](https://github.com/edx/edx-platform/wiki/Python-Guidelines)
+* [Javascript Guidelines](https://github.com/edx/edx-platform/wiki/Javascript-Guidelines)
+* [Testing](https://github.com/edx/edx-platform/blob/master/docs/internal/testing.md)
+
+Coding conventions should be followed and your commit should *increase* test
+coverage, not decrease it. For more involved contributions, you may want to
+discuss your intentions on the mailing list *before* you start coding.
+
+Before your first pull request is merged, you'll need to sign the
+[individual contributor agreement](http://code.edx.org/individual-contributor-agreement.pdf)
+and send it in. This confirms you have the authority to contribute the code in
+the pull request and ensures we can relicense it.
+
+If you have any questions, please ask on the
+[mailing list](https://groups.google.com/forum/#!forum/edx-code).

README.md

@@ -345,9 +345,9 @@ with `overview.md` to get an introduction to the architecture of the system.
 How to Contribute
 -----------------
 
-Contributions are very welcome. The easiest way is to fork this repo, and then
-make a pull request from your fork. The first time you make a pull request, you
-may be asked to sign a Contributor Agreement.
+Contributions are very welcome.
+
+Please read [How To Contribute](https://github.com/edx/edx-platform/wiki/How-To-Contribute) for details.
 
 Reporting Security Issues
 -------------------------

cms/djangoapps/contentstore/features/advanced-settings.feature

@@ -1,4 +1,5 @@
-Feature: Advanced (manual) course policy
+@shard_1
+Feature: CMS.Advanced (manual) course policy
   In order to specify course policy settings for which no custom user interface exists
   I want to be able to manually enter JSON key /value pairs
 

cms/djangoapps/contentstore/features/checklists.feature

@@ -1,4 +1,5 @@
-Feature: Course checklists
+@shard_1
+Feature: CMS.Course checklists
 
   Scenario: A course author sees checklists defined by edX
     Given I have opened a new course in Studio

cms/djangoapps/contentstore/features/common.py

@@ -300,3 +300,48 @@ def upload_file(filename):
     world.browser.attach_file('file', os.path.abspath(path))
     button_css = '.upload-dialog .action-upload'
     world.css_click(button_css)
+
+
+@step(u'"([^"]*)" logs in$')
+def other_user_login(step, name):
+    step.given('I log out')
+    world.visit('/')
+
+    signin_css = 'a.action-signin'
+    world.is_css_present(signin_css)
+    world.css_click(signin_css)
+
+    def fill_login_form():
+        login_form = world.browser.find_by_css('form#login_form')
+        login_form.find_by_name('email').fill(name + '@edx.org')
+        login_form.find_by_name('password').fill("test")
+        login_form.find_by_name('submit').click()
+    world.retry_on_exception(fill_login_form)
+    assert_true(world.is_css_present('.new-course-button'))
+    world.scenario_dict['USER'] = get_user_by_email(name + '@edx.org')
+
+
+@step(u'the user "([^"]*)" exists( as a course (admin|staff member|is_staff))?$')
+def create_other_user(_step, name, has_extra_perms, role_name):
+    email = name + '@edx.org'
+    user = create_studio_user(uname=name, password="test", email=email)
+    if has_extra_perms:
+        if role_name == "is_staff":
+            user.is_staff = True
+        else:
+            if role_name == "admin":
+                # admins get staff privileges, as well
+                roles = ("staff", "instructor")
+            else:
+                roles = ("staff",)
+            location = world.scenario_dict["COURSE"].location
+            for role in roles:
+                groupname = get_course_groupname_for_role(location, role)
+                group, __ = Group.objects.get_or_create(name=groupname)
+                user.groups.add(group)
+        user.save()
+
+
+@step('I log out')
+def log_out(_step):
+    world.visit('logout')

cms/djangoapps/contentstore/features/component.feature

@@ -1,72 +1,71 @@
-Feature: Component Adding
+@shard_1
+Feature: CMS.Component Adding
     As a course author, I want to be able to add a wide variety of components
 
-    @skip
-    Scenario: I can add components
-        Given I have opened a new course in studio
-        And I am editing a new unit
-        When I add the following components:
-            | Component    |
-            | Discussion   |
-            | Blank HTML   |
-            | LaTex        |
-            | Blank Problem|
-            | Dropdown     |
-            | Multi Choice |
-            | Numerical    |
-            | Text Input   |
-            | Advanced     |
-            | Circuit      |
-            | Custom Python|
-            | Image Mapped |
-            | Math Input   |
-            | Problem LaTex|
-            | Adaptive Hint|
-            | Video        |
-        Then I see the following components:
-            | Component    |
-            | Discussion   |
-            | Blank HTML   |
-            | LaTex        |
-            | Blank Problem|
-            | Dropdown     |
-            | Multi Choice |
-            | Numerical    |
-            | Text Input   |
-            | Advanced     |
-            | Circuit      |
-            | Custom Python|
-            | Image Mapped |
-            | Math Input   |
-            | Problem LaTex|
-            | Adaptive Hint|
-            | Video        |
+    #Scenario: I can add components
+    #    Given I have opened a new course in studio
+    #    And I am editing a new unit
+    #    When I add the following components:
+    #        | Component    |
+    #        | Discussion   |
+    #        | Blank HTML   |
+    #        | LaTex        |
+    #        | Blank Problem|
+    #        | Dropdown     |
+    #        | Multi Choice |
+    #        | Numerical    |
+    #        | Text Input   |
+    #        | Advanced     |
+    #        | Circuit      |
+    #        | Custom Python|
+    #        | Image Mapped |
+    #        | Math Input   |
+    #        | Problem LaTex|
+    #        | Adaptive Hint|
+    #        | Video        |
+    #    Then I see the following components:
+    #        | Component    |
+    #        | Discussion   |
+    #        | Blank HTML   |
+    #        | LaTex        |
+    #        | Blank Problem|
+    #        | Dropdown     |
+    #        | Multi Choice |
+    #        | Numerical    |
+    #        | Text Input   |
+    #        | Advanced     |
+    #        | Circuit      |
+    #        | Custom Python|
+    #        | Image Mapped |
+    #        | Math Input   |
+    #        | Problem LaTex|
+    #        | Adaptive Hint|
+    #        | Video        |
 
-    @skip
-    Scenario: I can delete Components
-        Given I have opened a new course in studio
-        And I am editing a new unit
-        And I add the following components:
-            | Component    |
-            | Discussion   |
-            | Blank HTML   |
-            | LaTex        |
-            | Blank Problem|
-            | Dropdown     |
-            | Multi Choice |
-            | Numerical    |
-            | Text Input   |
-            | Advanced     |
-            | Circuit      |
-            | Custom Python|
-            | Image Mapped |
-            | Math Input   |
-            | Problem LaTex|
-            | Adaptive Hint|
-            | Video        |
-        When I will confirm all alerts
-        And I delete all components
-        Then I see no components
+    #Scenario: I can delete Components
+    #    Given I have opened a new course in studio
+    #    And I am editing a new unit
+    #    And I add the following components:
+    #        | Component    |
+    #        | Discussion   |
+    #        | Blank HTML   |
+    #        | LaTex        |
+    #        | Blank Problem|
+    #        | Dropdown     |
+    #        | Multi Choice |
+    #        | Numerical    |
+    #        | Text Input   |
+    #        | Advanced     |
+    #        | Circuit      |
+    #        | Custom Python|
+    #        | Image Mapped |
+    #        | Math Input   |
+    #        | Problem LaTex|
+    #        | Adaptive Hint|
+    #        | Video        |
+    #    When I will confirm all alerts
+    #    And I delete all components
+    #    Then I see no components
 
     Scenario: I see a prompt on delete
         Given I have opened a new course in studio

cms/djangoapps/contentstore/features/course-overview.feature

@@ -1,4 +1,5 @@
-Feature: Course Overview
+@shard_1
+Feature: CMS.Course Overview
     In order to quickly view the details of a course's section and set release dates and grading
     As a course author
     I want to use the course overview page
@@ -68,7 +69,7 @@ Feature: Course Overview
     # Safari does not have moveMouseTo implemented
     @skip_internetexplorer
     @skip_safari
-   Scenario: Notification is shown on subsection reorder
+    Scenario: Notification is shown on subsection reorder
         Given I have opened a new course section in Studio
         And I have added a new subsection
         And I have added a new subsection

cms/djangoapps/contentstore/features/course-settings.feature

@@ -1,4 +1,5 @@
-Feature: Course Settings
+@shard_2
+Feature: CMS.Course Settings
   As a course author, I want to be able to configure my course settings.
 
   # Safari has trouble keeps dates on refresh

cms/djangoapps/contentstore/features/course-team.feature

@@ -1,4 +1,5 @@
-Feature: Course Team
+@shard_2
+Feature: CMS.Course Team
     As a course author, I want to be able to add others to my team
 
     Scenario: Admins can add other users

cms/djangoapps/contentstore/features/course-team.py

@@ -2,14 +2,9 @@
 #pylint: disable=W0621
 
 from lettuce import world, step
-from common import create_studio_user
-from django.contrib.auth.models import Group
 from auth.authz import get_course_groupname_for_role, get_user_by_email
 from nose.tools import assert_true, assert_in  # pylint: disable=E0611
 
-PASSWORD = 'test'
-EMAIL_EXTENSION = '@edx.org'
-
 
 @step(u'(I am viewing|s?he views) the course team settings')
 def view_grading_settings(_step, whom):
@@ -18,32 +13,14 @@ def view_grading_settings(_step, whom):
     world.css_click(link_css)
 
 
-@step(u'the user "([^"]*)" exists( as a course (admin|staff member))?$')
-def create_other_user(_step, name, has_extra_perms, role_name):
-    email = name + EMAIL_EXTENSION
-    user = create_studio_user(uname=name, password=PASSWORD, email=email)
-    if has_extra_perms:
-        location = world.scenario_dict["COURSE"].location
-        if role_name == "admin":
-            # admins get staff privileges, as well
-            roles = ("staff", "instructor")
-        else:
-            roles = ("staff",)
-        for role in roles:
-            groupname = get_course_groupname_for_role(location, role)
-            group, __ = Group.objects.get_or_create(name=groupname)
-            user.groups.add(group)
-        user.save()
-
-
 @step(u'I add "([^"]*)" to the course team')
 def add_other_user(_step, name):
     new_user_css = 'a.create-user-button'
     world.css_click(new_user_css)
     world.wait(0.5)
 
     email_css = 'input#user-email-input'
-    world.css_fill(email_css, name + EMAIL_EXTENSION)
+    world.css_fill(email_css, name + '@edx.org')
     if world.is_firefox():
         world.trigger_event(email_css)
     confirm_css = 'form.create-user button.action-primary'
@@ -53,7 +30,7 @@ def add_other_user(_step, name):
 @step(u'I delete "([^"]*)" from the course team')
 def delete_other_user(_step, name):
     to_delete_css = '.user-item .item-actions a.remove-user[data-id="{email}"]'.format(
-        email="{0}{1}".format(name, EMAIL_EXTENSION))
+        email="{0}{1}".format(name, '@edx.org'))
     world.css_click(to_delete_css)
     # confirm prompt
     # need to wait for the animation to be done, there isn't a good success condition that won't work both on latest chrome and jenkins
@@ -74,7 +51,7 @@ def other_delete_self(_step):
 @step(u'I make "([^"]*)" a course team admin')
 def make_course_team_admin(_step, name):
     admin_btn_css = '.user-item[data-email="{email}"] .user-actions .add-admin-role'.format(
-        email=name+EMAIL_EXTENSION)
+        email=name+'@edx.org')
     world.css_click(admin_btn_css)
 
 
@@ -83,31 +60,12 @@ def remove_course_team_admin(_step, outer_capture, name):
     if outer_capture == "myself":
         email = world.scenario_dict["USER"].email
     else:
-        email = name + EMAIL_EXTENSION
+        email = name + '@edx.org'
     admin_btn_css = '.user-item[data-email="{email}"] .user-actions .remove-admin-role'.format(
         email=email)
     world.css_click(admin_btn_css)
 
 
-@step(u'"([^"]*)" logs in$')
-def other_user_login(_step, name):
-    world.visit('logout')
-    world.visit('/')
-
-    signin_css = 'a.action-signin'
-    world.is_css_present(signin_css)
-    world.css_click(signin_css)
-
-    def fill_login_form():
-        login_form = world.browser.find_by_css('form#login_form')
-        login_form.find_by_name('email').fill(name + EMAIL_EXTENSION)
-        login_form.find_by_name('password').fill(PASSWORD)
-        login_form.find_by_name('submit').click()
-    world.retry_on_exception(fill_login_form)
-    assert_true(world.is_css_present('.new-course-button'))
-    world.scenario_dict['USER'] = get_user_by_email(name + EMAIL_EXTENSION)
-
-
 @step(u'I( do not)? see the course on my page')
 @step(u's?he does( not)? see the course on (his|her) page')
 def see_course(_step, do_not_see, gender='self'):
@@ -123,7 +81,7 @@ def see_course(_step, do_not_see, gender='self'):
 @step(u'"([^"]*)" should( not)? be marked as an admin')
 def marked_as_admin(_step, name, not_marked_admin):
     flag_css = '.user-item[data-email="{email}"] .flag-role.flag-role-admin'.format(
-        email=name+EMAIL_EXTENSION)
+        email=name+'@edx.org')
     if not_marked_admin:
         assert world.is_css_not_present(flag_css)
     else:
@@ -161,7 +119,7 @@ def can_make_course_admin(_step, can_not_make_admin, outer_capture, name):
     if outer_capture == "myself":
         email = world.scenario_dict["USER"].email
     else:
-        email = name + EMAIL_EXTENSION
+        email = name + '@edx.org'
     add_button_css = '.user-item[data-email="{email}"] .add-admin-role'.format(email=email)
     if can_not_make_admin:
         assert world.is_css_not_present(add_button_css)