Commit Graph

404 Commits

Author SHA1 Message Date
Don Mitchell
cc6dfbbc75 Asset support in split
LMS-2876
2014-07-07 17:11:43 -04:00
Nimisha Asthagiri
eecff6e0aa ModulestoreEnum class. 2014-06-27 14:37:35 -04:00
Nimisha Asthagiri
a9213509c3 Enable Mixed Modulestore STUD-1540
Refactor get_parent_locations STUD-1663
2014-06-26 18:00:11 -04:00
David Baumgold
0c0859f17b Merge pull request #4026 from edx/db/requests-2
Upgrade `requests` module
2014-06-25 19:34:05 -04:00
Waqas Khalid
9e6333f689 Remember the user last thread sort preference
FOR-545
2014-06-18 14:26:30 +05:00
David Baumgold
bafdb8ecb1 make our HTTP stub services respond to HEAD requests 2014-06-13 14:42:23 -04:00
Oleg Marshev
cfec580a63 Add argument. 2014-06-11 11:41:03 +03:00
jsa
58c5066e66 Add support for search spell corrections to Forums UX.
Co-authored-by: Brian Talbot <btalbot@edx.org>

JIRA: FOR-591
2014-06-05 15:00:29 -04:00
Muhammad Ammar
84ac562831 Lettuce YouTube Check Improvements 2014-06-02 16:27:04 +00:00
Sarina Canelake
5c9fe4bb7a Merge pull request #3929 from edx/sarina/lms-2786
Fix location.url [LMS-2786]
2014-05-29 21:01:46 -04:00
Sarina Canelake
e77dffcbcd Fix location.url [LMS-2786] 2014-05-29 18:01:29 -04:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library
[LMS-2757]
2014-05-29 17:03:35 -04:00
Muhammad Ammar
7afcb9348c Check YouTube Availabitlity for Video Tests 2014-05-29 15:08:47 +00:00
Jay Zoldak
721732bf27 Merge pull request #3920 from edx/zoldak/increase-test-async-timeout
Increase async script timeout in lettuce tests
2014-05-29 10:44:37 -04:00
Jay Zoldak
40884a5085 Increase the default timeout for waiting in lettuce tests 2014-05-29 09:35:51 -04:00
Jay Zoldak
11fbaa19bf Increase async script timeout in lettuce tests 2014-05-29 09:05:31 -04:00
Calen Pennington
155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py
2014-05-09 15:29:32 -04:00
Calen Pennington
9811926d97 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit updates lms/djangoapps/courseware.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-06 10:08:32 -04:00
Jason Bau
f8c062b6ce lti 2.0 result service rest endpoint 2014-04-29 12:01:12 -07:00
Muhammad Ammar
6f064e2b27 Configure youtube stub for bok-choy 2014-04-25 20:01:09 +00:00
jsa
f71e78b69f add acceptance tests for user profile pagination.
JIRA: FOR-492
2014-04-24 13:47:03 -04:00
Jay Zoldak
3fc19a35b0 Serve video HTML5 sources locally for acceptance tests 2014-04-15 10:40:53 -04:00
Valera Rozuvan
615ce23930 Update acceptance tests to use real duration of YouTube video. 2014-04-14 10:37:56 +03:00
Greg Price
8c8367b055 Merge pull request #3183 from edx/gprice/inline-response-pagination
Add repsonse pagination to inline discussions
2014-04-09 17:55:15 -04:00
Greg Price
16847d85a9 Add bok-choy tests for inline response pagination 2014-04-09 16:56:20 -04:00
Valera Rozuvan
b2543bfa95 Tweaking automatic screenshots in acceptance tests. 2014-04-09 11:37:32 +03:00
Valera Rozuvan
668c476acb Add auto screenshot functionality. 2014-04-08 10:41:39 +03:00
Alexander Kryklia
cf3e2c860b Fix flaky video tests: speed up youtube api loading and wait for controls. 2014-04-03 14:37:17 +03:00
Valera Rozuvan
3f41aae9f7 Make YouTube mocked server serve YouTube API
1.) Making YouTube mock server serve YouTube API.
2.) Adding ability to block YouTube API from YouTube mock server.
3.) Adding acceptance tests that check YouTube mock server for availability of YouTube API, and for it's ability to block YouTube API.

Part of BLD-939.
2014-03-28 10:34:34 +02:00
Valera Rozuvan
f03a94b0f2 Update doc string for YouTube stub server.
Included information on how to launch the server
on its own.
EOF
2014-03-27 21:21:38 +02:00
Jay Zoldak
c5a7911b87 Fix pylint disable pragmas that were pep8 violations 2014-03-20 10:18:40 -04:00
polesye
43c16bd093 BLD-915: Fix issues with different videoIDs. 2014-03-11 17:38:29 +02:00
jsa
bea463d950 Add acceptance tests for forums comment deletion.
JIRA: FOR-472
2014-02-26 10:31:02 -05:00
Will Daly
b8187fb173 Fixed intermittent failure in XQueue stub unit test 2014-02-14 16:43:13 -05:00
Oleg Marshev
79ffcb7e94 Refactor stub implementation of LTI Provider. BLD-601. 2014-02-11 12:50:22 +02:00
Greg Price
8e3a77fa1e Add acceptance tests for forum response pagination 2014-02-06 17:52:14 -05:00
Will Daly
4c2b76951d Merge pull request #2431 from edx/will/ora-acceptance-tests-rebase
Peer-grading acceptance tests
2014-02-05 16:43:47 -05:00
Will Daly
0a9b4ada86 Added stub XQueue server to bok_choy test suite.
Added feedback check for AI-assessment test
Added peer assessment feedback test
Added tests for peer grading module
Added stub peer grading module service
Updated Studio/LMS page objects and tests to use bok-choy v0.1.0
Added LMS bok-choy tests from e2e repo
Add bok-choy tests for peer grading module, including calibration.
2014-02-05 14:50:15 -05:00
Jay Zoldak
a4275e90b1 Increase async script timeout in lettuce acceptance tests 2014-02-05 13:14:19 -05:00
Will Daly
7960d31416 Increase wait time in XQueue stub test 2014-02-04 22:58:58 -05:00
Dave St.Germain
636eab8b9e Added more descriptive page titles. 2014-01-30 17:32:03 -05:00
Will Daly
b73c6f63fc Added stub XQueue server to bok_choy test suite.
Added feedback check for AI-assessment test

Added peer assessment feedback test
2014-01-28 14:57:28 -05:00
Valera Rozuvan
b6e5db02ee Addressing comments for PR 2176.
BLD-529.
2014-01-22 16:39:00 +02:00
Valera Rozuvan
33031b76f4 Enable correct total time display in VCR for YouTube videos.
Before this, the VCR showed total time as 00:00:00 for YouTube
videos just after page loaded. The correct total time is shown only
after the user clicks Play button.

BLD-529.
2014-01-22 16:38:24 +02:00
zubiar-arbi
dc570859da enable tests depending on assert is_css_present(css_selector)
STUD-1183
2014-01-17 21:11:17 +05:00
Will Daly
4afd5ea49f Refactored bok-choy directory structure
Added fixtures for course and xblock creation
Added bok-choy Studio tests
Added bok-choy tests for ora self- and ai- assessment
Refactored auto-auth; added staff and course-enrollment options
Removed extra javascript properties from page objects
2014-01-15 09:37:32 -05:00
Calen Pennington
a0b8577ac3 Merge pull request #1988 from cpennington/annotation-module-acceptance-tests
Add acceptance tests of Annotatable module
2013-12-20 11:00:41 -08:00
Calen Pennington
77942cecef Don't create more factory subclasses, just absorb the classes directly 2013-12-20 12:32:14 -05:00
Will Daly
0fd03cfb02 Moved stub servers to terrain
Refactored stub services for style and DRY

Added unit tests for stub implementations

Updated acceptance tests that depend on stubs.

Updated Studio acceptance tests to use YouTube stub server; fixed failing tests in devstack.
2013-12-19 09:12:41 -05:00
Calen Pennington
1d0ce64b10 Update to the latest version of lettuce 2013-12-17 13:18:22 -05:00