Commit Graph

334 Commits

Author SHA1 Message Date
Alexander Kryklia
5e8aebf00b Fix 2013-09-09 19:16:18 +03:00
Alexander Kryklia
5e3c6736ab Fixes. 2013-09-09 19:16:16 +03:00
Alexander Kryklia
ab3cde8a4d Fix 2013-09-09 19:16:14 +03:00
Alexander Kryklia
faa03f0e25 Update docstrings. 2013-09-09 19:16:14 +03:00
Alexander Kryklia
e10577d6ad Pass user_id and course_id to runtime in cms (dev) and tests. 2013-09-09 19:16:14 +03:00
Alexander Kryklia
f6d9c077f0 Improve LTI module
Add simplifyed template.
Update lti integration test.
Add getting oauth credentials from course settings.
Add user id transferring to provider.
Improve documentation of lti module.
2013-09-09 19:13:22 +03:00
Alexander Kryklia
e4e7a4e30b Remove ipdb. 2013-09-09 19:13:20 +03:00
Valera Rozuvan
417ddcaaa1 LTI module with tests 2013-09-09 19:13:20 +03:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Jason Bau
08168ec67f Merge pull request #859 from edx/jbau/studio-link-in-instructor-panel
Add link in lms legacy instructor dashboard to cms course_index
2013-09-04 13:03:21 -07:00
Jason Bau
ec989e4999 Address review comments for lms_link_to_cms
* Uses override_settings to provide test variable
* Move location of cms link to upper right
* PEP8 / Pylink
2013-09-04 11:29:22 -07:00
Adam Palay
67890b3c66 resolve merge conflict with hotfix branch 2013-09-03 16:00:24 -04:00
Anton Stupak
a09e610403 Fix multiple video bug 2013-09-03 18:49:46 +03:00
Jason Bau
b0f9fd0df5 Add link in lms legacy instructor dashboard to cms course_index
A one-click way of getting to editing the course
2013-08-31 01:07:34 -07:00
Calen Pennington
7d79f4fe37 Move mitxmako initialization to a startup module, called by lms.startup and cms.startup for both management commands and when run via wsgi
[DEVPAIN-7]
2013-08-28 10:56:07 -04:00
Calen Pennington
407b02b358 Centralize startup code, and execute in all contexts
Inspired by: http://eldarion.com/blog/2013/02/14/entry-point-hook-django-projects/
Moves startup code to lms.startup and cms.startup, and calls the startup
methods in wsgi.py and manage.py for both projects.
2013-08-27 12:12:20 -04:00
Will Daly
42ac76ce0c Merge branch 'master' into lapentab/fix_network_tests
Conflicts:
	lms/djangoapps/courseware/tests/tests.py
2013-08-23 11:48:38 -04:00
Will Daly
c680dfdd40 Merge pull request #768 from edx/will/use-mixed-modulestore-in-tests
Will/use mixed modulestore in tests
2013-08-23 08:38:09 -07:00
Will Daly
1cb52df16b Removed unnecessary TestCase 2013-08-22 16:10:24 -04:00
lapentab
d894a065df Stylistic changes 2013-08-22 09:28:37 -04:00
lapentab
1759191370 Remove network calls in tests 2013-08-22 08:43:28 -04:00
Chris Dodge
ef98c54f5b fix some pylint violations 2013-08-21 20:06:10 -04:00
Will Daly
8165a033b1 Pep8/pylint fixes
Fixed test_masquerade failure due to not clearing the modulestore
between tests.
2013-08-21 19:42:59 -04:00
ichuang
42af561a17 pep8 and pylint for tests of nostatic import 2013-08-21 11:23:00 -04:00
Will Daly
96c2a50370 Merge branch 'master' into will/use-mixed-modulestore-in-tests
Conflicts:
	common/lib/xmodule/xmodule/modulestore/django.py
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/courseware/tests/tests.py
2013-08-21 10:12:24 -04:00
Will Daly
48c6daacb8 Removed unnecessary settings wrangling from ModuleStoreTestCase.
Modified navigation tests to use MixedModulestore
Updated factories to find editable modulestore

Updated test_submitting_problems

Updated test_tabs.py

Updated test_view_authentication

Updated test_views

Updated courseware/tests/tests.py

Updated test_masquerade

Updated test_module_render

Pylint fixes

Updated video and word cloud tests

Updated course wiki tests

Updated license and open_ended tests.
One open_ended test still failing due to Mako initialization issues

Updated staticbook

Updated django_comment_client tests

Updated instructor tests

Updated instructor task tests

Updated external_auth tests

Updated course_groups
2013-08-21 09:36:45 -04:00
ichuang
0d938d3940 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static
Conflicts:
	lms/djangoapps/courseware/tests/test_module_render.py
2013-08-20 23:40:09 -04:00
ichuang
95952bd693 add tests of static_asset_path and importing with no static;
fix (again) static_replace to work with static_asset_path
2013-08-20 23:30:26 -04:00
Chris Dodge
bc5e27fe17 update some more call sites in LMS to always pass in a course_id 2013-08-19 23:42:26 -04:00
Diana Huang
9469991f52 Merge pull request #713 from edx/diana/button-updates
Drupal side Register button updates
2013-08-19 07:28:45 -07:00
chrisndodge
7aa4418934 Merge pull request #723 from edx/fix/cdodge/bad-links-can-cause-exception-on-rewrite
Fix/cdodge/bad links can cause exception on rewrite
2013-08-19 06:33:55 -07:00
Anton Stupak
7a68516d12 Fix formatting. 2013-08-19 10:39:52 +03:00
Chris Dodge
033f922ec0 add a try catch around the staticstorage lookup, which can throw an exception 2013-08-17 10:33:59 -04:00
Chris Dodge
61219169d4 change over the modulestore configuration to be a dict and use a property accessor. Also update some django-admin configs to use this means to set the runtime configuration 2013-08-15 22:58:04 -04:00
Chris Dodge
5ee5beafbe fix bad merge conflict resolution 2013-08-15 22:58:03 -04:00
Chris Dodge
5298f54f4c fix tests 2013-08-15 22:58:02 -04:00
Diana Huang
c8fdf6ad29 Add in tests for the marketing site button. 2013-08-15 16:34:48 -04:00
David Ormsbee
3ce87583ab Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode.
Features coming down the pipe will want to be able to:
* Refer to enrollments before they are actually activated (approval step).
* See what courses a user used to be enrolled in for when they re-enroll in
  the same course, or a different run of that course.
* Have different "modes" of enrolling in a course, representing things like
  honor certificate enrollment, auditing (no certs), etc.

This change adds an is_active flag and mode (with default being "honor").
The commit is only as large as it is because many parts of the codebase were
manipulating enrollments by adding and removing CourseEnrollment objects
directly. It was necessary to create classmethods on CourseEnrollment to
encapsulate this functionality and then port everything over to using them.

The migration to add columns has been tested on a prod replica, and seems to be
fine for running on a live system with single digit millions of rows of
enrollments.
2013-08-14 13:23:06 -04:00
Peter Fogg
e20acee4c4 Working on Videoalpha test fix.
Fixed all common and LMS tests.

The tests were failing because XMLDescriptor adds in some attributes
to _model_data, such as `xml_attributes`, that aren't necessary. The
solution is to handle all XML parsing in VideoDescriptor. There's
still one test failing in CMS, which has to do with metadata being
saved. I'm still working out how to update it in such a way that it
doesn't fail, but still tests something meaningful.
2013-08-12 14:32:15 +03:00
Vasyl Nakvasiuk
b33b5c7bd4 Python: videoalpha -> video. 2013-08-12 14:31:48 +03:00
Vasyl Nakvasiuk
28b0ba5e10 Migrate video tests to videoalpha tests, remove video tests. 2013-08-12 14:31:47 +03:00
Peter Fogg
9c84440501 PR comment cleanup. 2013-08-06 13:23:33 -04:00
Peter Fogg
08c5f955aa Unstyled prototype for new list editor design. 2013-08-06 13:23:33 -04:00
Peter Fogg
f317244ac4 Convert Video Alpha to metadata-only. 2013-08-06 13:23:33 -04:00
polesye
042b7d5f60 Merge pull request #428 from edx/valera/video_alpha2_refactor
Valera/video alpha2 refactor
2013-08-02 01:04:13 -07:00
brianhw
a628b62d1e Merge pull request #511 from edx/feature/brian/audit-log
Use audit logger for logging of logins in external_auth...
2013-08-01 14:08:08 -07:00
Valera Rozuvan
52fa6591c2 Corrected all isues found during refactoring #2.
Added missing file.~
Undid a mistake.
Copied Python tests from video_alpha1.
moves TestLogic to __init__.py
reorginizes xmodule logic tests
adds docstrings for poll tests
adds docstring for word cloud and conditional tests
adds docstrings for video alpha tests
adds videoalphafactory for tests, not finished
adds imports
Bug fixing.
fix video/videoalpha tests
Updated lettuce test. Now it is aware of the fact that Video and Video Alpha players have different base CSS classes.
Removed REFACTOR comments.
Turn off autoplay for Video Alpha in Studio.
Carry over fix for bug where in Firefox changing to speed 1.0 has no effect.
Carry over JavaScript Jasmine tests from jmclaus/videoalpha2_js branch.
Exporting state object from main function of Video Alpha.
More stuff from jmclaus/videoalpha2_js branch.
Specs in html5_video.js all pass except ten of them. Cleaned code a bit and moved it out of display_spec.js
One more spec passes
Fixed remaning tests in spec/../html5_video.js test suite. Removed test video files.
Added JavaScript Jasmine tests for main of Video Alpha 2.
adds test for volume control and updates helper file for videoalpha
2013-08-01 20:08:45 +03:00
Calen Pennington
0d3c44996a LMS i18n from Tsinghua 2013-07-31 19:39:15 -04:00
Brian Wilson
635d36fcf9 Add audit log definition, and use for logging of logins in external_auth and student apps. Move test_login to student app. Improve conditional tests for Shibboleth login logic. (Does not include reconfiguring log settings.) 2013-07-31 13:32:21 -04:00
Calen Pennington
b64aa813c8 Make render_template mocking clearer 2013-07-31 12:19:33 -04:00