Commit 45e32107 by Vasyl Nakvasiuk

video module: remove old methods

parent 68716f99
# pylint: disable=W0223
"""Video is ungraded Xmodule for support video content.""" """Video is ungraded Xmodule for support video content."""
import json import json
...@@ -94,28 +95,11 @@ class VideoModule(VideoFields, XModule): ...@@ -94,28 +95,11 @@ class VideoModule(VideoFields, XModule):
return parse_time(xmltree.get('from')), parse_time(xmltree.get('to')) return parse_time(xmltree.get('from')), parse_time(xmltree.get('to'))
def handle_ajax(self, dispatch, get): def handle_ajax(self, dispatch, get):
"""Handle ajax calls to this video. """This is not being called right now and we raise 404 error."""
TODO (vshnayder): This is not being called right now, so the position
is not being saved.
"""
log.debug(u"GET {0}".format(get)) log.debug(u"GET {0}".format(get))
log.debug(u"DISPATCH {0}".format(dispatch)) log.debug(u"DISPATCH {0}".format(dispatch))
if dispatch == 'goto_position':
self.position = int(float(get['position']))
log.info(u"NEW POSITION {0}".format(self.position))
return json.dumps({'success': True})
raise Http404() raise Http404()
def get_progress(self):
"""TODO (vshnayder): Get and save duration of youtube video, then return
fraction watched.
(Be careful to notice when video link changes and update)
For now, we have no way of knowing if the video has even been watched, so
just return None.
"""
return None
def get_instance_state(self): def get_instance_state(self):
"""Return information about state (position).""" """Return information about state (position)."""
return json.dumps({'position': self.position}) return json.dumps({'position': self.position})
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
"""Video xmodule tests in mongo.""" """Video xmodule tests in mongo."""
import json
from . import BaseTestXmodule from . import BaseTestXmodule
...@@ -12,27 +10,7 @@ class TestVideo(BaseTestXmodule): ...@@ -12,27 +10,7 @@ class TestVideo(BaseTestXmodule):
TEMPLATE_NAME = "i4x://edx/templates/video/default" TEMPLATE_NAME = "i4x://edx/templates/video/default"
DATA = '<video youtube="0.75:JMD_ifUUfsU,1.0:OEoXaMPEzfM,1.25:AKqURZnYqpk,1.50:DYpADpL7jAY"/>' DATA = '<video youtube="0.75:JMD_ifUUfsU,1.0:OEoXaMPEzfM,1.25:AKqURZnYqpk,1.50:DYpADpL7jAY"/>'
def test_handle_ajax_correct_dispatch(self): def test_handle_ajax_dispatch(self):
responses = {
user.username: self.clients[user.username].post(
self.get_url('goto_position'),
{'position': 10},
HTTP_X_REQUESTED_WITH='XMLHttpRequest')
for user in self.users
}
response_contents = {
username: json.loads(response.content) for username, response in
responses.items()
}
self.assertTrue(
all([
content['success']
for _, content in response_contents.items()
]))
def test_handle_ajax_incorrect_dispatch(self):
responses = { responses = {
user.username: self.clients[user.username].post( user.username: self.clients[user.username].post(
self.get_url('whatever'), self.get_url('whatever'),
......
...@@ -133,5 +133,3 @@ class VideoModuleUnitTest(unittest.TestCase): ...@@ -133,5 +133,3 @@ class VideoModuleUnitTest(unittest.TestCase):
self.assertDictEqual( self.assertDictEqual(
json.loads(module.get_instance_state()), json.loads(module.get_instance_state()),
{'position': 0}) {'position': 0})
self.assertIsNone(module.get_progress())
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment