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

149 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Peter Fogg
0149766710 Add acceptance test to ensure that show_captions has the right effect. 2013-06-11 14:07:40 -04:00
JonahStanley
29275c48d1 Added in the drag and drop support 2013-06-11 11:29:54 -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
Don Mitchell
44061f9c04 Revert bad merge 2013-06-10 17:16:35 -04:00
cahrens
b0b3062a20 Allow a value of 0 for max attempts. STUD-264. 2013-06-10 11:51:25 -04:00
JonahStanley
2ad934f1c2 Added testing for grading settings 
Please note that 2 tests will not reliably work:
Deleting a grade- Was able to circumvent this with javascript
Moving the grade slider- Could not circumvent, is skipped but the framework is in place
 2013-06-10 11:41:17 -04:00
Peter Fogg
4415fb4c42 Started removing XML from video editor. 
TODO: This breaks the 1.5x and .75x speeds. I'm still looking into
why.

TODO: VideoDescriptor inherits from RawDescriptor in order to
use the from_xml and export_to_xml methods. This seems really ugly,
though; I'd rather find a better way to do this.
 2013-06-06 10:29:24 -04:00
JonahStanley
d226a21eb0 Changed wording to I will 2013-06-05 16:01:45 -04:00
JonahStanley
d147103be0 Fixed tab issue (tabs are now correctly spaces) 2013-06-05 15:55:12 -04:00
JonahStanley
0548b119a9 Fixed other scenarios that were skipped 2013-06-05 15:21:23 -04:00
JonahStanley
acc743eea8 Added functionality to bypass alerts 
This is done with the following steps:
'I confirm all alerts' means that all alert and confirm windows are returned and returned true respectively
'I dismiss all alerts' means that all confirm windows are returned false
'I answer all prompts with "([^"]*)"' means that all prompts are returned with the given string

Please note that these settings are on a PER PAGE basis.  This means that for best results, the step must be given right before the alert is generated.
 2013-06-05 15:08:58 -04:00
JonahStanley
bbd34235b8 Made finding place to click a bit nicer 2013-06-04 16:40:18 -04:00
JonahStanley
7f2fa8ff3a Fixed issue with code mirror editing 
It turns out that code mirror things can be edited.  Once the div is clicked, a new text area appears that can be obtained and sent keys
 2013-06-04 16:33:54 -04:00
Peter Fogg
90a1a8cb72 Merge pull request #63 from edx/peter-fogg/single-click-video-creation 
Unbreak acceptance tests in the cms.
 2013-06-04 13:10:39 -07:00
Peter Fogg
2b6a449b2a Unbreak acceptance tests in the cms. 2013-06-04 15:48:20 -04:00
Peter Fogg
779f86c440 Merge pull request #46 from edx/peter-fogg/single-click-video-creation 
Peter fogg/single click video creation
 2013-06-04 11:08:40 -07:00
Peter Fogg
8a67454f98 Prevent creation of unnecessary template divs, and rename .single_templates to .single-templates for convention. 2013-06-03 15:36:55 -04:00
Peter Fogg
d3ec1cb915 Add tests for single-click discussion creation. 2013-06-03 14:57:34 -04:00
Peter Fogg
eff78bfd86 Add doc for click_component_from_menu and make sure css is present in any case. 2013-06-03 14:39:02 -04:00
Peter Fogg
ff0c56b7fb Cleaning up code -- removed unnecessary lines, fixed indentation, renamed method. 2013-06-03 14:21:50 -04:00