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

120 Commits

Author SHA1 Message Date
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
Peter Fogg
f9b825fe8b Fix failing acceptance tests and allow videos to be imported from XML. 2013-06-11 09:27:02 -04:00
cahrens
b0b3062a20 Allow a value of 0 for max attempts. STUD-264. 2013-06-10 11:51:25 -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
Peter Fogg
2871ce8dee Fix pep8 violations. 2013-06-03 10:36:46 -04:00
Peter Fogg
55aaa1a8e9 Add lettuce tests for single-click video creation and fix previously failing tests. 2013-06-03 10:20:38 -04:00
JonahStanley
a17c487f16 Merged from Master 2013-06-03 09:46:19 -04:00
Peter Fogg
8c5f9e6e41 Fix merge conflict. 2013-06-03 08:49:52 -04:00
Peter Fogg
5434f2750e Cleaning up code to fix pylint/pep8 errors. 2013-05-31 15:58:12 -04:00
Peter Fogg
7a16938ad2 Remove unnecessary suppression. 2013-05-31 11:58:05 -04:00
cahrens
57f8bbf69d Updates to Selenium test based on feedback. 2013-05-31 11:26:31 -04:00
Peter Fogg
782cb05410 Add passing Lettuce testing for video autoplay in LMS. 2013-05-31 11:22:45 -04:00
Peter Fogg
1ead857792 Working on Lettuce tests for video in LMS. 
In progress, committing for the great git history rewrite.
 2013-05-30 15:01:23 -04:00
cahrens
6c06599d75 Prepare for Peter's change. 2013-05-30 14:30:28 -04:00
JonahStanley
62b74008e6 Added tests for Limited Attempt Problems and Showing the Answer 2013-05-30 14:22:37 -04:00
cahrens
46cf5e3338 Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui 2013-05-30 14:13:14 -04:00
cahrens
8fd15ce45d Review feedback. 2013-05-30 14:13:10 -04:00
Jay Zoldak
86afe7279b Refactor user factory usage for lettuce tests. Fix merge conflict. 2013-05-30 13:48:07 -04:00
Jay Zoldak
2f504ec4bf fix merge conflict 2013-05-30 12:42:50 -04:00
Jay Zoldak
4a64c0c9b6 Merge in from origin/feature/christina/metadata-ui 2013-05-30 12:33:02 -04:00
Jay Zoldak
6627ca5635 Tidy up the new lettuce tests for metadata editing a bit. 2013-05-30 12:26:18 -04:00
Peter Fogg
6eeb12ad1c Add Lettuce tests for autoplay in Studio. 2013-05-30 11:34:15 -04:00
cahrens
f0260757c5 Cleanup. 2013-05-29 16:50:22 -04:00
cahrens
551a1c1516 pep8 and documentation cleanup. 2013-05-29 15:47:46 -04:00
cahrens
7d07309f9d Don't call setFixtures. Can stomp on other tests. 2013-05-29 14:03:16 -04:00
cahrens
87d904cb35 Merge branch 'master' into feature/christina/metadata-ui 
Conflicts:
	cms/templates/base.html
 2013-05-24 16:10:34 -04:00
David Baumgold
cf1e906c13 Fix lettuce tests 2013-05-23 12:50:19 -04:00
cahrens
1a8a721998 Will not do unrelated test at this time. 2013-05-23 12:31:20 -04:00
cahrens
c8d6d5d283 Selenium tests. 2013-05-23 11:34:02 -04:00
cahrens
f3bd9ab234 Get rid of empty, store ID. 2013-05-21 14:29:33 -04:00
cahrens
bb699f482d Update xblock, start Selenium. 2013-05-21 09:37:55 -04:00
Will Daly
1e1e6450df Pep8 fixes 2013-05-16 11:33:50 -04:00
Will Daly
59f68c2179 Added comments for skipped tests 2013-05-15 15:45:12 -04:00