Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,939 Commits 1 Branch 0 Tags
2cd18dfad3bcda0bbca0ee4ea81eaef026c975f9
Commit Graph

171 Commits

Author SHA1 Message Date
Peter Fogg
d5d495c24d Fix acceptance tests expecting outdated CSS. 2013-06-24 16:57:14 -04:00
David Baumgold
d632ffe9cd Make Course Team lettuce tests gender-neutral 
Because it bothers me, although I don't expect anyone else to care.
 2013-06-21 14:52:31 -04:00
JonahStanley
a52d0beb41 Got rid of leftover set_trace 2013-06-20 17:00:46 -04:00
JonahStanley
ec4547b51e Merge branch 'master' into jonahstanley/add-courseteam-tests 2013-06-20 16:55:37 -04:00
JonahStanley
70d48e2e9f Now referencing css element 2013-06-20 16:40:13 -04:00
Christina Roberts
e84ee873d0 Merge pull request #230 from edx/christina/pep8-again 
Pep8 cleaning.
 2013-06-20 13:34:50 -07:00
cahrens
34f8c044b8 Pep8 cleaning. 2013-06-20 16:06:00 -04:00
JonahStanley
b9d79aea60 A bunch of pylint fixes and explicit use case for uploads/test 2013-06-20 15:55:53 -04:00
Peter Fogg
1d8d507f49 Merge in master (again). 2013-06-20 12:21:16 -04:00
Jonah Stanley
9b478ff3e3 Merge pull request #115 from edx/jonahstanley/add-gradingsettings-tests 
Added testing for grading settings
 2013-06-20 08:31:31 -07:00
cahrens
9e69586bb3 pep8 fixes. 2013-06-20 10:31:44 -04:00
Peter Fogg
9c7be8b1dc Fix merge conflict in CHANGELOG.rst. 2013-06-20 09:58:22 -04:00
Christina Roberts
6fe56ac9f7 Merge pull request #205 from edx/christina/advanced-settings-test 
Sometimes the first click doesn't actually work, so call click up to 5 t...
 2013-06-20 05:48:13 -07:00
cahrens
6643994348 Add an optional success lambda to css_click. 2013-06-19 13:51:40 -04:00
JonahStanley
0524ff53cc Merge branch 'master' into jonahstanley/add-courseteam-tests 
Conflicts:
	cms/djangoapps/contentstore/features/common.py
 2013-06-19 11:29:43 -04:00
Don Mitchell
1ff022e181 Incidental pep8 changes 2013-06-18 17:25:06 -04:00
cahrens
9878c75b7a Sometimes the first click doesn't actually work, so call click up to 5 times. 
This seems to fix the sporadic failure (at least on my machine).
 2013-06-18 15:22:25 -04:00
JonahStanley
85e3062225 Fixed click to comply to new css_click 2013-06-18 12:51:18 -04:00
JonahStanley
ce3bc1e1cb Merge branch 'master' into jonahstanley/add-gradingsettings-tests 2013-06-18 12:47:30 -04:00
JonahStanley
650a2ba423 Added deletion tests 2013-06-18 11:20:23 -04:00
Peter Fogg
5cb456ba85 Fix merge conflict. 2013-06-17 16:49:22 -04:00
JonahStanley
15facf8fc0 Changed change_text to implement new type_in_codemirror function 2013-06-17 16:48:37 -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
JonahStanley
25fe8e8070 Now using context files and os.path 2013-06-17 15:54:10 -04:00
cahrens
73ba1e547e Change code to use css_click in hopes that will make the test pass on Don's mac. 
css_click will try clicking multiple times.
 2013-06-17 15:46:10 -04:00
cahrens
92fc452b34 Change the wording of problem steps to follow Given, When, Then... convention. 2013-06-17 14:30:37 -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
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
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
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
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
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
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
Peter Fogg
0149766710 Add acceptance test to ensure that show_captions has the right effect. 2013-06-11 14:07:40 -04:00