Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

9424 Commits

Author SHA1 Message Date
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
dc94ea1041 add unit test for emptying the trashcan 2013-06-17 11:10:36 -04:00
Chris Dodge
ab94b8618c forgot to internationalize one string 2013-06-17 11:10:36 -04:00
Chris Dodge
b443629ee8 remove invalid comments 2013-06-17 11:10:36 -04:00
Chris Dodge
cd0087ca53 use the new notification tools for the confirmation dialog 2013-06-17 11:10:35 -04:00
Chris Dodge
70ee4b8060 add unit tests for asset delete/restore 2013-06-17 11:10:35 -04:00
Chris Dodge
274d8997a2 update warning message 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
9b749c4201 add ajax callback entry point to remove the asset 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
1e3efadc28 switch to using environment variables to get key for Segment.io 2013-06-17 10:58:37 -04: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
e0045499f3 Update acceptance test. 2013-06-14 14:41:33 -04:00
cahrens
21dc4d863e Put back in some older code to save source_code property. 2013-06-14 14:10:40 -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 Fogg
206f582503 Fix merge conflict in common/test/data/full/sequential/Administrivia_and_Circuit_Elements.xml. 2013-06-14 10:44:05 -04:00
Peter Fogg
bea83c533f Update failing metadata settings acceptance test. 2013-06-13 15:31:28 -04:00
JonahStanley
40bf2514ab Added tests for downloading files 
A few notes:
1. Downloads are done through direct requests.  This is due to the difficulty of downloading a file to the correct place
2. Modifiying a file will just change the file to a random 10 character string.
3. The page is reloaded in between uploads.  This is due to a current caching bug that is in the process of being looked into and will be updated once it is fixed.
 2013-06-13 11:00:45 -04:00
cahrens
fae8fd3841 Merge branch 'master' into feature/christina/unify-fields 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/fields.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_fields.py
	requirements/edx/github.txt
 2013-06-13 10:55:13 -04:00
cahrens
0f8d7c744c Test cleanup. 2013-06-13 10:42:23 -04:00
Peter Fogg
d52329be23 Merge pull request #128 from edx/peter-fogg/fix-video-captions-setting 
Make video captions respect course author's setting.
 2013-06-13 06:32:33 -07:00
cahrens
6e92ddf3dd Cannot set String field to a dict anymore! 2013-06-12 17:07:41 -04:00
JonahStanley
3c43dbb26f Changed the other % to format 2013-06-12 13:36:46 -04:00
cahrens
86d952bf91 Change to putting serialize/de-serialize directly in xml_module. 2013-06-12 13:34:38 -04:00
JonahStanley
6d686dd9f6 Changed the way the file path was obtained 2013-06-12 13:32:46 -04:00
JonahStanley
1b5050c9ac Changed the following: 
% to format
css_find().click() to its actual function
A few name changes as well as step changes
Removal of drag testing
A refactoring of login and create user.  Login will no longer create the specified user
 2013-06-12 13:25:33 -04:00
Brian Talbot
832da3ad48 syncs styling rules for buttons/inputs to ensure consistency 2013-06-12 11:43:59 -04:00
Peter Fogg
52bf82ac17 Set Youtube ID defaults to the empty string. 2013-06-12 11:29:14 -04:00
Peter Fogg
008c769ffb Update and fix acceptance to show captions when correct. 2013-06-12 10:27:05 -04:00
JonahStanley
eb14a07814 Added tests for course updates and handouts 2013-06-11 16:15:49 -04:00
chrisndodge
e685ff7125 Merge pull request #129 from edx/fix/cdodge/cancel-asset-upload-crash 
[STUD-256] Seems like on chrome when cancel is hit in the file chooser, the 'change...
 2013-06-11 12:52:56 -07:00
Peter Fogg
3159c949d3 Update acceptance tests for captions to use metadata settings editor. 2013-06-11 15:29:16 -04:00
Peter Fogg
dbb127599f Merge peter-fogg/fix-video-captions-setting. 2013-06-11 15:11:14 -04:00
Peter Fogg
45527bf921 Reword acceptance test. 2013-06-11 15:07:01 -04:00
Chris Dodge
be6fbf913e make local variable 2013-06-11 14:36:04 -04:00
JonahStanley
81b06d5c70 Added tests for static pages 
Also added in drag and drop helper.  Please be careful using this method as it is truly a hack to obtain the visual effects.  As of this commit, selenium does not support drag and drop for jQuery sortable items
 2013-06-11 14:34:18 -04:00
Chris Dodge
1602f592b4 use better API 2013-06-11 14:32:33 -04:00
Peter Fogg
0149766710 Add acceptance test to ensure that show_captions has the right effect. 2013-06-11 14:07:40 -04:00
Chris Dodge
fa8ae228bf Seems like on chrome when cancel is hit in the file chooser, the 'changed' event is fired and startUpload() was being called. We need to check to see if the upload file is blank and - if so - just return immediately out of the function 2013-06-11 13:38:01 -04:00
JonahStanley
29275c48d1 Added in the drag and drop support 2013-06-11 11:29:54 -04:00
JonahStanley
c74d76a36b Removed test breakpoint 2013-06-11 10:07:13 -04:00
JonahStanley
d471bcb723 Added tests for uploading files 
TODO: When deleting is available, test deleting uploaded files`
 2013-06-11 10:00:52 -04:00
Peter Fogg
f9b825fe8b Fix failing acceptance tests and allow videos to be imported from XML. 2013-06-11 09:27:02 -04:00
JonahStanley
b7674679d9 Tests now use their own contentstore database 
test.py was changed such that the database being used is test_xcontent
course_helpers.clear_courses now calls contentstore().fs_files.drop() such that all content is removed and the databse is started afresh in the same manner as the modulestore
 2013-06-11 09:18:16 -04:00
Don Mitchell
44061f9c04 Revert bad merge 2013-06-10 17:16:35 -04:00
Don Mitchell
e4757452f0 Partial implementation of means to get xmodule from descriptor and 
attempt to test xmodule_modified (see fixme)
Removed obsolete else clause from before conversion
Ensure factories use datetime not struct_time for start date
Added more unit tests for settings encoder
 2013-06-10 17:16:35 -04:00
Don Mitchell
e7c4e5f4d3 Fixed use_tz not being effective in cms 2013-06-10 17:16:35 -04:00
Don Mitchell
168cb306d3 Move tz_aware into connection config rather than settings. 
Make django use_tz
 2013-06-10 17:16:35 -04:00
Don Mitchell
909fe134f9 Added date_util tests back in and handle null time obj. 2013-06-10 17:16:34 -04:00