Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

6956 Commits

Author SHA1 Message Date
Valera Rozuvan
b75876e3ac As per PR comments from reviewer, fixing coding style. 2013-06-18 16:30:15 +03:00
Anton Stupak
cfb9a54e21 Add tests for additional events 2013-06-18 16:30:15 +03:00
Anton Stupak
78e22a910e Disable tests because of problems with phantomjs 2013-06-18 16:30:15 +03:00
Anton Stupak
70889c3625 Add tests for Event Logger 2013-06-18 16:30:15 +03:00
Anto Stupak
499c682d95 Add tests for HTML5 part of Videoalpha 2013-06-18 16:30:14 +03:00
Anto Stupak
70cc9a168b Add tests for Youtube part of Videoalpha 2013-06-18 16:30:14 +03:00
Vasyl Nakvasiuk
80f38b8f3c python tests for videoalpha 2013-06-18 16:30:14 +03:00
Peter Fogg
5cb456ba85 Fix merge conflict. 2013-06-17 16:49:22 -04:00
Peter Fogg
56015e4b94 Update CHANGELOG.rst; move acceptance test methods into more appropriate files; docstring cleaning. 2013-06-17 16:47:15 -04:00
JonahStanley
46da897610 Merge branch 'master' into jonahstanley/add-courseteam-tests 
Conflicts:
	cms/envs/test.py
 2013-06-17 16:43:56 -04:00
Christina Roberts
080c5e4bc1 Merge pull request #186 from edx/christina/latex_and_click 
Bug fix for LaTeX source not saving
 2013-06-17 13:36:49 -07:00
Renzo Lucioni
f528f61ec1 Add new Jasmine test to ensure Segment.io is called when appropriate 2013-06-17 16:18:07 -04:00
Don Mitchell
085a590bdd timezone conversion: more unit tests 
and code reorganization
 2013-06-17 14:48:18 -04:00
JonahStanley
ef1f523c55 Removed _MODULESTORE reference that was doing nothing 2013-06-17 14:12:42 -04:00
Don Mitchell
9d464701f9 timezone conversion tests 2013-06-17 14:04:12 -04:00
cahrens
298417c732 Remove waits by adding code in click that will try the operation multiple times (thanks to Jonah). 2013-06-17 13:55:15 -04:00
Renzo Lucioni
c30d2d2f52 Incorporate Segment.io into Logger.log with whitelist 2013-06-17 13:48:50 -04:00
Peter Fogg
8159e86141 Many changes to finish up PR. To wit: 
-- Changed docstrings to use double quote.
-- More consistent naming for youtube IDs (normal_speed_id -> youtube_id_1_0).
-- Formatting changes for readability.
-- Updated test XML to expect JSON-encoded strings; prevents tests from spuriously failing.
 2013-06-17 13:46:20 -04:00
Calen Pennington
82606a062c Make XModuleDescriptor use __init__ from XBlock 
Fixes JIRA LMS-203
 2013-06-17 13:38:57 -04:00
Calen Pennington
438ac3b1a4 Move video xmodule tests to xmodule directory 2013-06-17 13:38:29 -04:00
Don Mitchell
cb40e9ff88 Fix a few remaining tz naive dates 
And remove redundant but != date parsing methods. In process make
the general parsing function less lenient (don't default date nor
month)
 2013-06-17 13:26:45 -04:00
Jean Manuel Nater
07486a4dbc Refactoring the code in tests.py to remove unnecessary dependencies on the XML Modulestore. 2013-06-17 11:54:16 -04:00
Chris Dodge
7cebb873df allow for an optional throw_on_not_found on contentstore().find() so we can clean up caller logic in the tests 2013-06-17 11:10:36 -04:00
Chris Dodge
7e46447cd5 there is no default for empty_asset_trashcan, caller must provide a list 2013-06-17 11:10:36 -04:00
Chris Dodge
7f1768f8f8 put back the verbose switch in xml_importer.py 2013-06-17 11:10:36 -04:00
Chris Dodge
70ee4b8060 add unit tests for asset delete/restore 2013-06-17 11:10:35 -04:00
Chris Dodge
85b904f176 fix sizing of the delete column 2013-06-17 11:09:52 -04:00
Chris Dodge
3fa6e77dff add new collection configuration to support a 'trashcan' for assets. Update class factory to allow callers to specify if they want the default set of assets or the trashcan 2013-06-17 11:09:52 -04:00
Renzo Lucioni
7518f32f5e Instrument sequentials with segment-io so we know when people switch tabs manually or using the arrows to navigate 2013-06-17 10:30:17 -04:00
Valera Rozuvan
184c0a5c40 Added comment regarding the fact that the temporary bug fix should be eventually removed. 2013-06-17 09:17:48 +03:00
Peter Fogg
d8f307a50b Merge branch 'master' into peter-fogg/remove-video-xml 2013-06-14 15:33:51 -04:00
cahrens
2cf71b7ff3 Add helper method for typing in CodeMirror, make it robust to Mac and Unix. 2013-06-14 15:12:25 -04:00
Peter Fogg
6035d0a23a Addresses latest comments on pull request #132. In particular: 
- Make 1.0x speed default Youtube ID Lyla's introduction video.
- Add acceptance tests for toggling captions on/off.
- Move captions settings acceptance tests into video-editor.feature.
- Rename acceptance test methods to reflect their function.
- Remove undefined variable from video Jasmine tests.
- Test VideoDescriptor.from_xml when no attributes are set.
- Convert Stringy* to non-Stringy equivalents.
- Test parsing of Youtube ID strings and times in more cases.
- Remove some commented-out code.
 2013-06-14 14:08:28 -04:00
Peter Baratta
5b388f52c1 Merge pull request #125 from edx/pbaratta/calc-add-trig 
Simplify calc.py; add trig/other functions
 2013-06-14 10:08:09 -07:00
Peter Fogg
206f582503 Fix merge conflict in common/test/data/full/sequential/Administrivia_and_Circuit_Elements.xml. 2013-06-14 10:44:05 -04:00
Anton Stupak
74426bdcc6 Add tracking of additional events 2013-06-14 11:30:21 +03:00
Valera Rozuvan
89da47a134 Merge pull request #138 from edx/valera/bugfix_firefox_videoalpha_speed_1 
force-refresh youtube iframe when changing speeds back to 1.0 in firefox
 2013-06-14 01:28:59 -07:00
Valera Rozuvan
72d7c9ca97 Moved the definition of autoplay attribute to videoalpha_module.py file. Changed double negative if statement for autoplay check to simple if. 2013-06-14 11:12:32 +03:00
Valera Rozuvan
66e106a9e2 Copied autoplay attribute from video xmoudle to videoalpha. Now students will have the video autoplaying, and in Studio it will be pause by default. 2013-06-14 11:12:32 +03:00
Valera Rozuvan
754be2caa1 If Video Alpha is playing a YouTube video in Firefox in HTML5 mode, then when switching to speed 1.0 it will simply reload the iframe, instead of using the built-in method to change the speed. The fixes the bug temporarily, while the YouTube team fixes the bug internally in the API. Commented additions to fix YouTube firefox speed 1.0 switch bug. 2013-06-14 11:11:37 +03:00
Christina Roberts
9e0997d3c8 Merge pull request #111 from edx/feature/christina/unify-fields 
Move "stringy" functionality into xblock fields
 2013-06-13 13:49:14 -07:00
Peter Baratta
bd1f912125 Merge branch 'master' into pbaratta/calc-add-trig 2013-06-13 16:43:27 -04:00
Peter Baratta
46686d8f7d Quick fixes in calc.py 
Especially the var[0].isdigit() one.
 2013-06-13 16:38:43 -04:00
cahrens
d42736708c Merge branch 'master' into feature/christina/unify-fields 2013-06-13 16:19:13 -04:00
Vik Paruchuri
c2e5c60713 Remove correct/incorrect message, and auto-add in needed markdown for studio 2013-06-13 15:34:00 -04:00
Peter Fogg
fa84abc3eb Add unit tests for creating VideoDescriptor from old XML. Brings test coverage for video_module.py to 91%. 2013-06-13 14:40:12 -04:00
Calen Pennington
e791e84ea7 Remove the stores_state field from XModule 
stores_state is now only used in a single test, in conjunction with
has_score. In practice, it's never the case that stores_state is false
when has_score is true, so we can delete stores_state entirely, and just
use has_score for the grading test.
 2013-06-13 14:38:59 -04:00
Bethany LaPenta
85f1386918 Fixed test_system looking like a test to nosetests, also fixed a class in test_error_module.py that had one class inheriting from another 2013-06-13 14:30:07 -04:00
Peter Fogg
5cee351896 Update XML in old video tests. This change tags like <video youtube="1.0:abcdefg"> to <video youtube_id_1_0="abcdefg". 2013-06-13 11:51:04 -04:00
cahrens
9d0867ea11 Merge cleanup. 2013-06-13 11:31:10 -04:00