cahrens
b0b3062a20
Allow a value of 0 for max attempts. STUD-264.
2013-06-10 11:51:25 -04:00
Chris Dodge
d9ce3162e0
partial fix for STUD-145, catch invalid location errors and return a HTTP 400 error to client
2013-06-10 11:47:37 -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
Don Mitchell
2266028921
Have the draft module store actively prevent non-leaf nodes from being
...
saved as draft.
2013-06-07 15:40:30 -04:00
Jonah Stanley
a3a7d1d548
Merge pull request #77 from edx/jonahstanley/fix-alert-tests
...
Jonahstanley/fix alert tests
2013-06-06 12:59:07 -07:00
cahrens
c715edf57a
Strip off https://
2013-06-06 10:55:41 -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
cahrens
39397c5c2f
Bullet-proofing for MKTG_URLS.
2013-06-06 10:29:10 -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
Chris Dodge
4391783248
add exporting of 'about' content as well as adding unit test checks
2013-06-05 12:40:09 -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
e982d7fcdc
Refactor test_contenstore to remove code duplication.
2013-06-04 13:22:08 -04:00
Peter Fogg
266938a7b3
Finish the comment I forgot about...
2013-06-03 16:55:28 -04:00
Peter Fogg
90bbff8965
Add test to be sure that advanced components require multiple clicks.
2013-06-03 16:53:14 -04: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
cahrens
38e3ff13ed
pep8 cleanup.
2013-06-03 15:32:42 -04:00
cahrens
93be67d49a
Fix bug STUD-103. The url base for about page links needs to be www.edx.org for Drupal site, vs. LMS_BASE which is used for Studio. Note that the complete URL is still not correct, but a redirect exists to take it to the new location.
2013-06-03 15:21:02 -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
chrisndodge
7735e37585
Merge pull request #8 from edx/valera/fix_videoalpha_studio_integration
...
Added videoalpha to advanced components in component.py file.
2013-06-02 13:04:33 -07:00
Chris Dodge
6fb520f21e
add peer grading to the advanced components check
2013-06-02 14:39:36 -04:00
chrisndodge
cd0f4b8194
Merge pull request #18 from edx/fix/cdodge/bad-link-in-activation-email
...
[STUD-177] Fix/cdodge/bad link in activation page
2013-06-02 11:36:31 -07:00
Chris Dodge
91d3f4ddff
add simple content check for the activation page when the user is not logged in
2013-06-02 00:43:17 -04:00
Chris Dodge
c0899463e3
remove unused import reference
2013-06-02 00:18:35 -04:00
Chris Dodge
ba9a5b3824
add simple check on whether the expected advanced modules appear in the edit unit page when turned on
2013-06-02 00:15:34 -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
Valera Rozuvan
37cffd0835
Added videoalpha to advanced components in component.py file.
2013-05-31 13:48:17 +03: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
a1b62912f3
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
2013-05-30 12:33:15 -04:00
