Commit Graph

166 Commits

Author SHA1 Message Date
Alexander Kryklia
719ec8f9d8 Revert "Merge pull request #804 from edx/valera/lti_module"
This reverts commit 2894b21c32, reversing
changes made to 34d0fe1554.
2013-09-09 22:51:57 +03:00
Alexander Kryklia
2894b21c32 Merge pull request #804 from edx/valera/lti_module
LTI module with tests
2013-09-09 12:38:01 -07:00
Alexander Kryklia
03de84ecfe Fix 2013-09-09 19:16:18 +03:00
Alexander Kryklia
bd6fed83eb Fix. 2013-09-09 19:16:18 +03:00
Alexander Kryklia
f45eddc1cb Fix 2013-09-09 19:16:17 +03:00
Alexander Kryklia
cf70a986d6 Fix 2013-09-09 19:16:17 +03:00
Alexander Kryklia
c4259ba9bf Fix 2013-09-09 19:16:17 +03:00
Alexander Kryklia
494fd52de0 Fix 2013-09-09 19:16:17 +03:00
Alexander Kryklia
787545c83e Renames LTIs to lti_passports. 2013-09-09 19:16:15 +03:00
Alexander Kryklia
d563929337 Add correct acceptance tests for LTI 2013-09-09 19:16:14 +03:00
Alexander Kryklia
462a42e99e Update acceptance test 2013-09-09 19:16:14 +03:00
Alexander Kryklia
0e697f972c acceptance tests updated 2013-09-09 19:13:21 +03:00
Alexander Kryklia
02de4609de updates 2013-09-09 19:13:21 +03:00
Alexander Kryklia
b5dc03ec36 Acceptance test for LTI module (not finished), but working 2013-09-09 19:13:20 +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
JonahStanley
7056c80319 Fixed most of the lms tests to work on firefox 2013-08-08 13:24:25 -04:00
Jay Zoldak
006b90af9f Modify cms acceptance tests to use auto_auth workflow. 2013-08-08 12:08:25 -04:00
Vasyl Nakvasiuk
ae8b2c883c add Word Cloud acceptance tests 2013-08-07 15:46:27 +03:00
Valera Rozuvan
52fa6591c2 Corrected all isues found during refactoring #2.
Added missing file.~
Undid a mistake.
Copied Python tests from video_alpha1.
moves TestLogic to __init__.py
reorginizes xmodule logic tests
adds docstrings for poll tests
adds docstring for word cloud and conditional tests
adds docstrings for video alpha tests
adds videoalphafactory for tests, not finished
adds imports
Bug fixing.
fix video/videoalpha tests
Updated lettuce test. Now it is aware of the fact that Video and Video Alpha players have different base CSS classes.
Removed REFACTOR comments.
Turn off autoplay for Video Alpha in Studio.
Carry over fix for bug where in Firefox changing to speed 1.0 has no effect.
Carry over JavaScript Jasmine tests from jmclaus/videoalpha2_js branch.
Exporting state object from main function of Video Alpha.
More stuff from jmclaus/videoalpha2_js branch.
Specs in html5_video.js all pass except ten of them. Cleaned code a bit and moved it out of display_spec.js
One more spec passes
Fixed remaning tests in spec/../html5_video.js test suite. Removed test video files.
Added JavaScript Jasmine tests for main of Video Alpha 2.
adds test for volume control and updates helper file for videoalpha
2013-08-01 20:08:45 +03:00
Jonah Stanley
8d11c246e1 Merge pull request #516 from edx/jonahstanley/upgrade-chrome-version
Jonahstanley/upgrade chrome version
2013-07-31 08:17:46 -07:00