Commit Graph

9300 Commits

Author SHA1 Message Date
Ned Batchelder
de7d2cd08c Properly convert files from Webob to pure files.
Webob represents uploaded files as cgi.FieldStorage objects.  The
XModule code expects pure Python file objects.  Each FieldStorage object
is wrapped to present the proper file interface, with file names.

LMS-1492
2013-11-22 11:09:11 -05:00
Ned Batchelder
4ace4f98cc Add two tests of problems-with-files
One test passes already, the other fails.  Fix in next commit.
2013-11-22 11:09:11 -05:00
Don Mitchell
17864353a5 Restful course settings
STUD-946
STUD-947
2013-11-22 10:55:35 -05:00
polesye
83c5e8b8bf BLD-126: Code response improvements. 2013-11-22 16:15:11 +02:00
Ned Batchelder
d1f511e14b Clean up test files, no substantive changes.
These changes prepare for the changes to the tests that are coming, but
make no change to the behavior themselves.
2013-11-21 21:06:18 -05:00
Don Mitchell
3ab17d7523 Allow colons in Locator fields. 2013-11-21 10:41:49 -05:00
polesye
7bab863c22 Merge pull request #1698 from edx/anton/multiple-answers-string-response
Allow multiple answers for string response.
2013-11-21 07:14:29 -08:00
Don Mitchell
e150207232 Merge pull request #1740 from edx/bug/locator_parse
Allow colons in Locator fields.
2013-11-21 06:40:52 -08:00
polesye
77c208a1cf BLD-474: Allow multiple answers for string response. 2013-11-21 16:23:33 +02:00
Don Mitchell
e8beb4d19b Allow colons in Locator fields. 2013-11-21 08:41:26 -05:00
Valera Rozuvan
6910ac9535 Addressing reviewer's comments.
Updated Change Log.

BLD-488
2013-11-21 10:07:18 +02:00
Valera Rozuvan
752851744c Adding tests.
Disabled Jasmine test due to flakiness on dev machine.
Added test for endTime in update().
Enabled updatePlayTime() tests. Will see on Jenkins.
Adding test for updatePlayTime() method.
Adding ProgressSlider notifyThroughHandleEnd() Jasmine tests.
Fixing Jasmine coverage problems.
Removed cover logs.
Fixing flaky test.
Removed code coverage logs.

BLD-488
2013-11-21 10:06:39 +02:00
Valera Rozuvan
062c3b45a2 Initial commit.
Adding focus on slider handle when video ends.
Removing unnecessary debug console.log() calls.
Change back to original code.
Adding comments.
Also undid tabindex=-1 for the slider knob. It is unnecessary, and prevents
the user from tabbing onto the slider.
Adding minor details.
startTime and endTime proper reset.

BLD-488
2013-11-21 10:06:39 +02:00
Valera Rozuvan
f0bbd34ad6 Merge pull request #1715 from robertjmarks/master
changes to allow multiple choicetextresponses in one problem

@adampalay will do!
2013-11-20 21:39:21 -08:00
Calen Pennington
b4a1840344 Move xmodule_runtime.xmodule_instance registration earlier
This allows XModules (specifically CombinedOpenEnded) to use ajax_url
during their init functions (which would, before, have thrown an
exception).

[LMS-1493]
2013-11-20 10:15:09 -05:00
Calen Pennington
6c9ad30ee1 Update open-ended tests to load the module between 'requests'
Under normal operation, XModules are reloaded on each request from a
student. CombinedOpenEnded modules have code that runs at initialization
that validates the students state. These changes makes that code run
during several long-form unit tests (testing CombinedOpenEnded across
multiple 'requests').

These tests are marked as expectedFailure because they now exhibit the
same failures as observed in [LMS-1493] (namely, the students state gets
reset, because CombinedOpenEnded interprets system.ajax_url raising an
error as meaning that the problem definition and the student answers are
in conflict)
2013-11-20 10:15:09 -05:00
Don Mitchell
cb113deade Separate all db ops from modulestore ops 2013-11-19 17:31:10 -05:00
Giulio Gratta
745f45090f Merge pull request #1702 from edx/giulio/anon-user-id-yml
Adding a YAML file to demonstrate how to include anonymized user IDs in Studio elements.
2013-11-19 11:29:26 -08:00
Christina Roberts
d4082859f8 Merge pull request #1714 from edx/christina/fix-children
The forcing of IDs to non-draft must happen in base.py instead of draft....
2013-11-19 11:18:54 -08:00
RobertMarks
e3b8ce708f changes to allow multiple choicetextresponses in one problem 2013-11-19 09:55:35 -08:00
cahrens
ed9a61e2d9 The forcing of IDs to non-draft must happen in base.py instead of draft.py.
The draft.py solution only worked when the parent was also in the draft store.
2013-11-19 12:08:29 -05:00
Sarina Canelake
69ef753195 Merge pull request #1641 from manuel-freire/master
298.15 K is 25 C, not 0 (0 is defined to be at 273.15)

#os
2013-11-19 08:25:49 -08:00
Jim Abramson
57cb983308 Merge pull request #1704 from edx/release-hotfix-2013-11-15
merge 2013-11-15 hotfix branch to master
2013-11-19 07:56:12 -08:00
polesye
38163cf942 BLD-410: Add tests. 2013-11-19 14:37:14 +02:00
Manuel Freire
cdc3ad1cc4 298.15 K is 25 C, not 0 (0 is defined to be at 273.15)
Signed-off-by:  <manuel.freire@fdi.ucm.es>
2013-11-19 12:52:13 +01:00
Giulio Gratta
f125a604a4 Adding a YAML file to demonstrate how to include anonymized user IDs in Studio elements. 2013-11-18 14:44:46 -08:00
polesye
4b87237825 BLD-193: Add template for checkboxes to studio. 2013-11-18 09:50:53 +02:00
Calen Pennington
43c0210889 Use correct set of OpenEndedChild states 2013-11-16 11:04:00 -05:00
Calen Pennington
e47e60f68b Assign a score of 0 to tasks with no attempts 2013-11-16 10:30:05 -05:00
Calen Pennington
347f0c7508 Centralize to a single GradingServiceError, so that it's caught when expected 2013-11-15 15:42:22 -05:00
Calen Pennington
4c21cb200f Teach OEE to consider old task_states when trying to recover from an xml mismatch 2013-11-15 14:13:19 -05:00
polesye
153bc25d8c BLD-502: Add improvements to Video player. 2013-11-15 18:12:51 +02:00
polesye
50250d82d0 Merge pull request #1653 from edx/anton/video-add-test
Video: tests to check speed change
2013-11-15 07:12:49 -08:00
Christina Roberts
e2926a94e0 Merge pull request #1621 from edx/christina/item-create
Change save_item and create_item to be RESTful.
2013-11-15 06:16:54 -08:00
polesye
526f791800 BLD-424: Add test to check speed change. 2013-11-15 13:39:49 +02:00
cahrens
569c86de74 Code review feedback. 2013-11-14 17:09:24 -05:00
David Baumgold
81e1d18de3 Merge pull request #1670 from antoviaque/hidden-module-unicode
hidden-module-unicode: Return unicode string to pass assertion
2013-11-14 14:02:07 -08:00
Sarina Canelake
b1d91fad49 Merge pull request #1663 from edx/sarina/persist-student-answers-on-error
Sarina/persist student answers on error
2013-11-14 08:15:08 -08:00
cahrens
a170c6f4e7 Change save_item and create_item to RESTful URL.
Part of STUD-847.
2013-11-14 11:03:31 -05:00
Xavier Antoviaque
0293727220 hidden-module-unicode: Return unicode string to pass assertion
XBlock Fragments expect unicode strings, and fail on an assertion when
it isn't:

```
2013-11-14 07:55:50,774 ERROR 3788 [django.request] base.py:215 - Internal Server Error: /courses/TestU/TST101/now/courseware/41d55c576a574fde99319420228f7f88/5fef5794e34842f4a2d45ebcdeaa9a3a/
Traceback (most recent call last):
  File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/core/handlers/base.py", line 111, in get_response
    response = callback(request, *callback_args, **callback_kwargs)
  File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/contrib/auth/decorators.py", line 20, in _wrapped_view
    return view_func(request, *args, **kwargs)
  File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/utils/decorators.py", line 91, in _wrapped_view
    response = view_func(request, *args, **kwargs)
  File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/views/decorators/cache.py", line 75, in _cache_controlled
    response = viewfunc(request, *args, **kw)
  File "/edx/app/edxapp/edx-platform/lms/djangoapps/courseware/views.py", line 407, in index
    context['fragment'] = section_module.render('student_view')
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/core.py", line 156, in render
    return self.runtime.render(self, view, context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 903, in render
    return block.xmodule_runtime.render(to_render, view_name, context)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/runtime.py", line 356, in render
    frag = view_fn(context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/seq_module.py", line 77, in student_view
    rendered_child = child.render('student_view', context)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/core.py", line 156, in render
    return self.runtime.render(self, view, context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 903, in render
    return block.xmodule_runtime.render(to_render, view_name, context)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/runtime.py", line 356, in render
    frag = view_fn(context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/vertical_module.py", line 27, in student_view
    rendered_child = child.render('student_view', context)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/core.py", line 156, in render
    return self.runtime.render(self, view, context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 903, in render
    return block.xmodule_runtime.render(to_render, view_name, context)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/runtime.py", line 356, in render
    frag = view_fn(context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 464, in student_view
    return Fragment(self.get_html())
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/fragment.py", line 34, in __init__
    self.add_content(content)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/fragment.py", line 71, in add_content
    assert isinstance(content, unicode)
AssertionError
```
2013-11-14 13:57:08 +01:00
Oleg Marshev
128846f67d BLD-449: Fix rearrange bug in problems. 2013-11-14 13:44:58 +02:00
Sarina Canelake
9508b3f9b4 pep8/pylint fixes for capa 2013-11-13 16:12:25 -05:00
Sarina Canelake
862beafdd1 Persist student answers on input error
LMS-469
2013-11-13 14:15:52 -05:00
polesye
50674a966b BLD-457: Fix speed menu when YouTube is unavailable. 2013-11-12 21:44:06 +02:00
Ned Batchelder
c8e0fb2508 Mock servers shouldn't pollute test output.
BY writing to stderr, BaseHTTPRequestHandler writes log messages to the
console during testing.  This makes the output harder to interpret.
Write the log messages to stdout instead, so that test runners will
suppress them during passing tests, and show them during failing tests.

It would be nice to have a place to write this method just once for the
Youtube and LTI mock servers, but we don't seem to have a place for code
as common as that.
2013-11-12 10:19:19 -05:00
Calen Pennington
864d831ce3 Use XBlock handlers for handle_ajax in XModules
Adds xblock handler_url support to the LMS, and makes handle_ajax use
that code.

[LMS-230] [LMS-229]
2013-11-08 11:08:48 -05:00
Calen Pennington
8ddd8c14a4 Fix pylint/pep8 errors 2013-11-08 11:08:48 -05:00
Calen Pennington
da26ae2529 Remove lms/lib from sys.path in favore of using it as the module lms.lib 2013-11-08 11:08:48 -05:00
Christina Roberts
cd868efc22 Merge pull request #1580 from edx/christina/item
Change delete_item to RESTful URL.
2013-11-06 10:50:56 -08:00
cahrens
16766a5ee9 Change delete_item to RESTful URL.
Part of STUD-847.
2013-11-06 13:49:24 -05:00