hotfix/Adam/disable accounts 2

.gitignore

@@ -51,6 +51,8 @@ node_modules
 *.scssc
 lms/static/sass/*.css
 lms/static/sass/application.scss
+lms/static/sass/application-extend1.scss
+lms/static/sass/application-extend2.scss
 lms/static/sass/course.scss
 cms/static/sass/*.css
 

AUTHORS

@@ -89,3 +89,4 @@ Akshay Jagadeesh <akjags@gmail.com>
 Nick Parlante <nick.parlante@cs.stanford.edu>
 Marko Seric <marko.seric@math.uzh.ch>
 Felipe Montoya <felipe.montoya@edunext.co>
+Julia Hansbrough <julia@edx.org>

CHANGELOG.rst

@@ -5,7 +5,14 @@ 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: Fix issue with CourseMode expiration dates
+
+LMS: Ported bulk emailing to the beta instructor dashboard.
+
+LMS: Add monitoring of bulk email subtasks to display progress on instructor dash.
+
+LMS: Add PaidCourseRegistration mode, where payment is required before course
+registration.
 
 LMS: Add split testing functionality for internal use.
 

cms/djangoapps/contentstore/features/video.feature

@@ -2,35 +2,69 @@
 Feature: CMS.Video Component
   As a course author, I want to be able to view my created videos in Studio.
 
+  # 1
   # Video Alpha Features will work in Firefox only when Firefox is the active window
   Scenario: Autoplay is disabled in Studio
     Given I have created a Video component
     Then when I view the video it does not have autoplay enabled
 
+  # 2
   Scenario: Creating a video takes a single click
     Given I have clicked the new unit button
     Then creating a video takes a single click
 
+  # 3
   # Sauce Labs cannot delete cookies
   @skip_sauce
   Scenario: Captions are hidden correctly
     Given I have created a Video component with subtitles
     And I have hidden captions
     Then when I view the video it does not show the captions
 
+  # 4
   # Sauce Labs cannot delete cookies
   @skip_sauce
   Scenario: Captions are shown correctly
     Given I have created a Video component with subtitles
     Then when I view the video it does show the captions
 
+  # 5
   # Sauce Labs cannot delete cookies
   @skip_sauce
   Scenario: Captions are toggled correctly
     Given I have created a Video component with subtitles
     And I have toggled captions
     Then when I view the video it does show the captions
 
+  # 6
   Scenario: Video data is shown correctly
     Given I have created a video with only XML data
     Then the correct Youtube video is shown
+
+  # 7
+  Scenario: Closed captions become visible when the mouse hovers over CC button
+    Given I have created a Video component with subtitles
+    And Make sure captions are closed
+    Then Captions become "invisible" after 3 seconds
+    And I hover over button "CC"
+    Then Captions become "visible"
+    And I hover over button "volume"
+    Then Captions become "invisible" after 3 seconds
+
+  # 8
+  Scenario: Open captions never become invisible
+    Given I have created a Video component with subtitles
+    And Make sure captions are open
+    Then Captions are "visible"
+    And I hover over button "CC"
+    Then Captions are "visible"
+    And I hover over button "volume"
+    Then Captions are "visible"
+
+  # 9
+  Scenario: Closed captions are invisible when mouse doesn't hover on CC button
+    Given I have created a Video component with subtitles
+    And Make sure captions are closed
+    Then Captions become "invisible" after 3 seconds
+    And I hover over button "volume"
+    Then Captions are "invisible"

cms/djangoapps/contentstore/features/video.py

@@ -5,6 +5,11 @@
 from xmodule.modulestore import Location
 from contentstore.utils import get_modulestore
 
+BUTTONS = {
+    'CC': '.hide-subtitles',
+    'volume': '.volume',
+}
+
 
 @step('I have created a Video component$')
 def i_created_a_video_component(step):
@@ -17,8 +22,13 @@ def i_created_a_video_component(step):
 
 
 @step('I have created a Video component with subtitles$')
-def i_created_a_video_component_subtitles(step):
-    step.given('I have created a Video component')
+def i_created_a_video_with_subs(_step):
+    _step.given('I have created a Video component with subtitles "OEoXaMPEzfM"')
+
+
+@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
@@ -108,3 +118,37 @@ def the_youtube_video_is_shown(_step):
     ele = world.css_find('.video').first
     assert ele['data-streams'].split(':')[1] == world.scenario_dict['YOUTUBE_ID']
 
+
+@step('Make sure captions are (.+)$')
+def set_captions_visibility_state(_step, captions_state):
+    if captions_state == 'closed':
+        if world.css_visible('.subtitles'):
+            world.browser.find_by_css('.hide-subtitles').click()
+    else:
+        if not world.css_visible('.subtitles'):
+            world.browser.find_by_css('.hide-subtitles').click()
+
+
+@step('I hover over button "([^"]*)"$')
+def hover_over_button(_step, button):
+    world.css_find(BUTTONS[button.strip()]).mouse_over()
+
+
+@step('Captions (?:are|become) "([^"]*)"$')
+def are_captions_visibile(_step, visibility_state):
+    _step.given('Captions become "{0}" after 0 seconds'.format(visibility_state))
+
+
+@step('Captions (?:are|become) "([^"]*)" after (.+) seconds$')
+def check_captions_visibility_state(_step, visibility_state, timeout):
+    timeout = int(timeout.strip())
+
+    # Captions become invisible by fading out. We must wait by a specified
+    # time.
+    world.wait(timeout)
+
+    if visibility_state == 'visible':
+        assert world.css_visible('.subtitles')
+    else:
+        assert not world.css_visible('.subtitles')
+

cms/envs/common.py

@@ -150,6 +150,7 @@
 
     # Instead of AuthenticationMiddleware, we use a cache-backed version
     'cache_toolbox.middleware.CacheBackedAuthenticationMiddleware',
+    'student.middleware.UserStandingMiddleware',
     'contentserver.middleware.StaticContentServer',
 
     'django.contrib.messages.middleware.MessageMiddleware',

common/djangoapps/course_modes/models.py

@@ -55,8 +55,8 @@ def modes_for_course(cls, course_id):
         """
         now = datetime.now(pytz.UTC)
         found_course_modes = cls.objects.filter(Q(course_id=course_id) &
-                                                Q(expiration_date__isnull=True) |
-                                                Q(expiration_date__gte=now))
+                                                (Q(expiration_date__isnull=True) |
+                                                Q(expiration_date__gte=now)))
         modes = ([Mode(mode.mode_slug, mode.mode_display_name, mode.min_price, mode.suggested_prices, mode.currency)
                   for mode in found_course_modes])
         if not modes:

common/djangoapps/course_modes/tests/test_models.py

@@ -102,3 +102,12 @@ def test_modes_for_course_expired(self):
         self.create_mode(mode1.slug, mode1.name, mode1.min_price, mode1.suggested_prices)
         modes = CourseMode.modes_for_course(self.course_id)
         self.assertEqual([mode1], modes)
+
+        expired_mode.expiration_date = datetime.now(pytz.UTC) + timedelta(days=1)
+        expired_mode.save()
+        expired_mode_value = Mode(u'verified', u'Verified Certificate', 0, '', 'usd')
+        modes = CourseMode.modes_for_course(self.course_id)
+        self.assertEqual([expired_mode_value, mode1], modes)
+
+        modes = CourseMode.modes_for_course('second_test_course')
+        self.assertEqual([CourseMode.DEFAULT_MODE], modes)

common/djangoapps/student/middleware.py

@@ -0,0 +1,37 @@
+"""
+Middleware that checks user standing for the purpose of keeping users with
+disabled accounts from accessing the site.
+"""
+from django.http import HttpResponseForbidden
+from django.utils.translation import ugettext as _
+from django.conf import settings
+from student.models import UserStanding
+
+class UserStandingMiddleware(object):
+    """
+    Checks a user's standing on request. Returns a 403 if the user's
+    status is 'disabled'.
+    """
+    def process_request(self, request):
+        user = request.user
+        try:
+            user_account = UserStanding.objects.get(user=user.id)
+            # because user is a unique field in UserStanding, there will either be
+            # one or zero user_accounts associated with a UserStanding
+        except UserStanding.DoesNotExist:
+            pass
+        else:
+            if user_account.account_status == UserStanding.ACCOUNT_DISABLED:
+                msg = _(
+                            'Your account has been disabled. If you believe '
+                            'this was done in error, please contact us at '
+                            '{link_start}{support_email}{link_end}'
+                        ).format(
+                            support_email=settings.DEFAULT_FEEDBACK_EMAIL,
+                            link_start=u'<a href="mailto:{address}?subject={subject_line}">'.format(
+                                address=settings.DEFAULT_FEEDBACK_EMAIL,
+                                subject_line=_('Disabled Account'),
+                            ),
+                            link_end=u'</a>'
+                        )
+                return HttpResponseForbidden(msg)