Commit Graph

171 Commits

Author SHA1 Message Date
Valera Rozuvan
e1e0cba033 Added acceptance tests. 2013-10-16 15:44:21 +03:00
Will Daly
9385b5764c Merge pull request #1143 from edx/will/skip-tests-with-comments
Use comments to skip tests instead of a tag
2013-09-27 05:33:49 -07:00
Will Daly
3c88ccb4ff Use comments to skip tests instead of a tag 2013-09-26 16:37:25 -04:00
Jay Zoldak
8e6c0ea937 Wrap logic for selecting options in acceptance tests 2013-09-26 16:07:20 -04:00
Will Daly
47621b56ff Merge pull request #1112 from edx/will/shard-acceptance-tests
Added tags to acceptance tests to define multiple shards.
2013-09-25 11:36:18 -07:00
Jay Zoldak
7669b4d777 Namespace the acceptance tests so they show up nicely in jenkins
Conflicts:
	cms/djangoapps/contentstore/features/advanced-settings.feature
	cms/djangoapps/contentstore/features/checklists.feature
	cms/djangoapps/contentstore/features/component.feature
	cms/djangoapps/contentstore/features/course-overview.feature
	cms/djangoapps/contentstore/features/course-settings.feature
	cms/djangoapps/contentstore/features/course-team.feature
	cms/djangoapps/contentstore/features/course-updates.feature
	cms/djangoapps/contentstore/features/courses.feature
	cms/djangoapps/contentstore/features/discussion-editor.feature
	cms/djangoapps/contentstore/features/grading.feature
	cms/djangoapps/contentstore/features/html-editor.feature
	cms/djangoapps/contentstore/features/problem-editor.feature
	cms/djangoapps/contentstore/features/section.feature
	cms/djangoapps/contentstore/features/signup.feature
	cms/djangoapps/contentstore/features/static-pages.feature
	cms/djangoapps/contentstore/features/subsection.feature
	cms/djangoapps/contentstore/features/textbooks.feature
	cms/djangoapps/contentstore/features/upload.feature
	cms/djangoapps/contentstore/features/video-editor.feature
	cms/djangoapps/contentstore/features/video.feature
	lms/djangoapps/courseware/features/certificates.feature
	lms/djangoapps/courseware/features/help.feature
	lms/djangoapps/courseware/features/high-level-tabs.feature
	lms/djangoapps/courseware/features/homepage.feature
	lms/djangoapps/courseware/features/login.feature
	lms/djangoapps/courseware/features/lti.feature
	lms/djangoapps/courseware/features/navigation.feature
	lms/djangoapps/courseware/features/problems.feature
	lms/djangoapps/courseware/features/registration.feature
	lms/djangoapps/courseware/features/signup.feature
	lms/djangoapps/courseware/features/video.feature
	lms/djangoapps/courseware/features/word_cloud.feature
2013-09-24 14:35:12 -04:00
Will Daly
f898f72920 Added tags to acceptance tests to define multiple shards. 2013-09-24 11:47:53 -04:00
Jay Zoldak
002f3ef9e2 Speed up waiting for elements not present on remote webdriver sessions. 2013-09-24 11:27:42 -04:00
Jay Zoldak
20ea28748b Speed up problems feature tests 2013-09-24 11:09:37 -04:00
Jay Zoldak
f30364906d Speed up lti acceptance test for remote webdriver. 2013-09-24 11:09:37 -04:00
jmclaus
66bd8127e6 Acceptance tests now pass 2013-09-20 14:04:58 +02:00
jmclaus
cbc4bd5c3a Modified acceptance test to reflect autoplay=false as a default for lms 2013-09-20 14:04:57 +02:00
Jay Zoldak
30b13d3cf1 Improve code clarity and error messages for css selection 2013-09-16 16:49:18 -04:00
Jay Zoldak
2ff056df8c Simplify retry logic for ui helper functions 2013-09-16 16:49:17 -04:00
Jay Zoldak
6531918af5 Skip verified cert acceptance tests that upload to s3 2013-09-16 16:11:21 -04:00
Jay Zoldak
ade62ab90f Fix acceptance tests to capture images for paid cert flow 2013-09-12 14:33:07 -04:00
Jay Zoldak
fbeb63ee47 Add more certificates test for newly implemented features 2013-09-11 17:29:50 -04:00
Jay Zoldak
1ead54223b Change locators of links to match updated ids 2013-09-11 16:23:51 -04:00
Valera Rozuvan
ee02c06250 Add Learning Tools Interoperability (LTI) blade.
LTI blade allows to include LTI components to courses.
Python integration, Jasmine and acceptance tests are included.
2013-09-10 12:30:42 +03:00
David Ormsbee
48f867bd6b Merge branch 'master' into ormsbee/verifyuser3
Conflicts:
	lms/envs/common.py
2013-09-09 10:18:25 -04:00
Jay Zoldak
5ece64433d Fix certificates acceptance test after come css changes 2013-09-06 15:31:08 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
David Ormsbee
78acd083be Merge branch 'master' into ormsbee/verifyuser3
Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss
2013-09-04 10:58:30 -04:00
Jay Zoldak
a432cffc2c Mark tests for unimplemented features as skip so that the acceptance tests will all pass when we merge into master. 2013-09-03 16:42:03 -04:00
Adam Palay
67890b3c66 resolve merge conflict with hotfix branch 2013-09-03 16:00:24 -04:00
Jay Zoldak
e0110bf108 Change css for payment page for better synchronization. 2013-09-03 13:51:47 -04:00
Anton Stupak
a09e610403 Fix multiple video bug 2013-09-03 18:49:46 +03:00
Jay Zoldak
b9ccc37c57 Automate more scenarios 2013-09-03 10:46:33 -04:00
Jay Zoldak
7bc997d0fb Change CSS after rebase. 2013-09-03 10:46:33 -04:00
Will Daly
a52ca3639b Initial BDD spec for certificates workflow 2013-09-03 10:46:32 -04:00
Peter Baratta
fe47dcb122 Acceptance tests for visual correctness reset feature 2013-08-30 17:24:33 -04:00
Jay Zoldak
c8949b99d1 Disable pylint violation E0611 when importing assert_* methods from nose.tools
Cleaned up files with muliline imports

Cleaned up files that do not use these imports

Misread comment
2013-08-27 16:21:33 -04:00
JonahStanley
b2480b5f00 Changed way feature flags are interpreted
Configurations must be defined before hand

Reduced pylint violations

We only support 4 browsers
2013-08-21 16:05:53 -04:00
JonahStanley
21f75ff250 Various stylistic and pylint fixes / changes
Version numbers have very different ranges for different browsers so not having a dictionary of those.

Fixed a whitespace issue

Fixed pylint/pep8 violations

Don't need django_url

Spacing issues

Changed how commenting works

Forgot one

Used wrong name

Changed around importing

Remove django_url

Fixed function orderingn

Made logic nicer for getting a new browser

Modifying tests to run in opera

Needed to increase time to account for slow sauce loading

Now safari LMS works

Forgot an assert statement

Skipping a few tests for opera
2013-08-21 16:05:52 -04:00
JonahStanley
58bb6e1ea3 Changed tags to be lowercase to prevent preprocessing
Changed to have a default for device since it isn't always needed

Tags are more clear

Fixed stylistic issues
2013-08-21 16:05:02 -04:00
JonahStanley
3746c654d8 Added a tag for things that will not work on Firefox
Added tags for tests that will not work on Sauce

Changed build name

Tightened up logic

Conflicts:
	common/djangoapps/terrain/browser.py

Added flag for session name
2013-08-21 16:05:01 -04:00
Jonah Stanley
73ad057eff Merge pull request #710 from edx/jonahstanley/help-acceptance-test
Jonahstanley/help acceptance test
2013-08-19 14:02:29 -07:00
JonahStanley
ce5d9b93b1 Added the full range of help modal options
Fixed pylint violations
2013-08-19 09:56:57 -04:00
Anton Stupak
a921e44aa3 Fix steps. 2013-08-19 10:39:52 +03:00
Anton Stupak
d848477596 Remove unecessary assert. 2013-08-19 09:10:50 +03:00
JonahStanley
fc899ab116 Stylistic change and factored out method to common 2013-08-16 15:30:35 -04:00
JonahStanley
43bee86074 Tightened up wording 2013-08-16 11:08:05 -04:00
JonahStanley
967fdee6bc Made filling field a bit safer 2013-08-16 10:55:14 -04:00
JonahStanley
97f70e8598 Fixed wording to better reflect BDD specs 2013-08-16 10:52:20 -04:00
JonahStanley
fc67c2ee6b Wrote preliminary help modal acceptance tests 2013-08-16 10:36:12 -04:00
David Ormsbee
3ce87583ab Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode.
Features coming down the pipe will want to be able to:
* Refer to enrollments before they are actually activated (approval step).
* See what courses a user used to be enrolled in for when they re-enroll in
  the same course, or a different run of that course.
* Have different "modes" of enrolling in a course, representing things like
  honor certificate enrollment, auditing (no certs), etc.

This change adds an is_active flag and mode (with default being "honor").
The commit is only as large as it is because many parts of the codebase were
manipulating enrollments by adding and removing CourseEnrollment objects
directly. It was necessary to create classmethods on CourseEnrollment to
encapsulate this functionality and then port everything over to using them.

The migration to add columns has been tested on a prod replica, and seems to be
fine for running on a live system with single digit millions of rows of
enrollments.
2013-08-14 13:23:06 -04:00
Anton Stupak
74f3595d54 Add acceptance tests for checking rendering. 2013-08-12 14:32:15 +03:00
Anton Stupak
d846462ce9 Migrate acceptance tests: old Video -> new Video. 2013-08-12 14:32:07 +03:00
JonahStanley
5a579921f2 Fixed stylistic things and no longer skipped tests in firefox 2013-08-08 13:24:28 -04:00
JonahStanley
38c2997fcf Added a comment on the features that will not work on firefox 2013-08-08 13:24:27 -04:00