3993 Commits

Author	SHA1	Message	Date
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
Jay Zoldak	4a64c0c9b6	Merge in from origin/feature/christina/metadata-ui	2013-05-30 12:33:02 -04:00
cahrens	14eb9c9a3b	Merge branch 'master' into feature/christina/metadata-ui	2013-05-30 12:27:03 -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	aca5cbb215	Merge branch 'master' into bug/christina/preview_url	2013-05-28 12:13:19 -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
cahrens	138ad3988f	Update test (and set PREVIEW_LMS_BASE to something different so we can actually test the method).	2013-05-23 17:06:02 -04:00
cahrens	522b76e847	PREVIEW_LMS_BASE must now be set (default value does not work for both edge and edx). ... https://edx.lighthouseapp.com/projects/102637/tickets/331	2013-05-23 16:27:05 -04:00
David Baumgold	007a4e534f	Merge pull request #2110 from edx/fix/db/lettuce-tests ... Fix lettuce tests	2013-05-23 09:55:56 -07: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
chrisndodge	a8084628e1	Merge pull request #1956 from edx/feature/cdodge/autoprovision-forums-master ... Feature/cdodge/autoprovision forums master	2013-05-23 09:27:36 -07:00
cahrens	c95b44d851	Merge branch 'master' into feature/christina/metadata-ui ... Conflicts: cms/envs/common.py cms/templates/base.html common/lib/xmodule/xmodule/combined_open_ended_module.py	2013-05-23 11:41:12 -04:00
cahrens	c8d6d5d283	Selenium tests.	2013-05-23 11:34:02 -04:00
David Baumgold	be8daf7468	/event was returning invalid JSON: fix it	2013-05-22 15:55:56 -04:00
David Baumgold	8e384a73be	Remove proof-of-concept page	2013-05-22 15:55:51 -04:00
Chris Dodge	9b88528b04	Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master	2013-05-22 13:20:49 -04:00
Arthur Barrett	cf502e2349	Fix advanced modules list.	2013-05-21 17:49:20 -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
Chris Dodge	a44e816877	remove_open_ended_panel_tab() -> remove_extra_paneltab(). Also, update new forums test factors to use refactored Models.py	2013-05-20 10:33:52 -04:00
Chris Dodge	fbbae44988	Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master ... Conflicts: cms/djangoapps/contentstore/views/course.py lms/djangoapps/django_comment_client/base/views.py lms/djangoapps/django_comment_client/management/commands/show_permissions.py lms/djangoapps/django_comment_client/models.py lms/djangoapps/django_comment_client/tests/test_utils.py lms/envs/common.py	2013-05-20 10:22:36 -04:00
Christina Roberts	f4044ed1e8	Merge pull request #2061 from edx/bug/christina/static-pages ... Make sure to get the correct modulestore on delete (static tabs do not e...	2013-05-17 09:59:59 -07:00
cahrens	944d2d61f1	Make sure to get the correct modulestore on delete (static tabs do not exist in draft modulestore). ... #324	2013-05-16 17:15:53 -04:00
Arthur Barrett	1fbe43a650	Merge branch 'master' into feature/abarrett/lms-notes-app	2013-05-16 13:23:12 -04:00