Commit Graph

108 Commits

Author SHA1 Message Date
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
Will Daly
1240c5ae92 Merge branch 'master' into feature/will/ci-lettuce-tests 2013-05-15 11:40:54 -04:00
Will Daly
3217989de5 Fixed/skipped CMS tests in subsection and signup. 2013-05-15 10:14:37 -04:00
Will Daly
8e069c1faa Skip tests that break on Ubuntu due to alerts (which will be removed
soon anyway).  Removed @skip-phantom and @skip-firefox tags

Fixed sign up test to work in Ubuntu

Added comments
2013-05-15 09:39:07 -04:00
Jay Zoldak
5d783d33ad Update lettuce test for new css changes. 2013-05-14 17:16:51 -04:00
Jay Zoldak
29ce700de6 Tag CMS lettuce tests with @skip-phantom if they aren't working under phantomjs right now. 2013-04-18 10:23:03 -04:00
Jay Zoldak
8a852f90cb Fix or skip lettuce tests to run under phantomjs and firefox 2013-04-18 10:18:35 -04:00
Chris Dodge
b4fe23f3a2 more cleanups in CMS project 2013-04-13 21:13:34 -04:00
cahrens
fa31953924 Update tests for GMT, get Advanced Settings test to pass reliably. 2013-04-05 10:47:58 -04:00
cahrens
52fdf5c7a0 Make sure due date year is always in the past. 2013-04-03 11:30:14 -04:00
cahrens
42b4ffdcf9 Cleanup. 2013-04-01 13:40:32 -04:00
cahrens
16f4a3f9c1 Convert due date to a Date (vs. a string with no year). 2013-04-01 11:37:05 -04:00
cahrens
b2bda10435 Merge branch 'master' into bug/christina/studio
Conflicts:
	cms/djangoapps/contentstore/features/common.py
	cms/djangoapps/contentstore/features/section.py
	cms/djangoapps/contentstore/features/subsection.feature
2013-03-28 11:17:47 -04:00