Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,188 Commits 1 Branch 0 Tags
7c4e20f9e5afaf0fe14110515107cd6bb2bedfcb
Commit Graph

715 Commits

Author SHA1 Message Date
Nate Hardison
7bccce4e9c Add comment to dynamically-generated asset files 
To avoid confusion about where these files come from, add a header
comment upon preprocessing that warns people to not modify the
generated files directly, and points them to the appropriate
template file.
 2013-06-04 11:14:02 -07:00
Jonah Stanley
cdadcba9da Merge pull request #10 from edx/jonahstanley/add-more-tests 
Jonahstanley/add more tests
 2013-06-03 10:25:53 -07:00
Nate Hardison
1001b315a3 Preprocess assets as Django management command 
Rather than directly invoke command-line Python (and Mako) from the
assets Rakefile, or call an external Python script, use a Django
management command to preprocess all asset template files.

An "asset template file" is defined as a static asset file with a
file extension indicating that it needs to be run through a template
engine prior to Sass/CoffeeScript compilation or packaging with other
assets. The preprocess_assets management command will look through
all of the files listed in the `STATICFILES_DIRS`, preprocessing each
as needed. Preprocessing strips off the special template file
extension, creating a new file in the process.

Currently, the only variable accessible in an asset template file is
the `THEME_NAME`, defined in the settings.
 2013-06-03 09:58:01 -07:00
JonahStanley
a17c487f16 Merged from Master 2013-06-03 09:46:19 -04:00
JonahStanley
8cc93cb5d8 Merge branch 'master' into jonahstanley/add-more-tests 2013-06-03 09:37:25 -04:00
Christina Roberts
52b76c87f4 Merge pull request #11 from edx/feature/christina/metadata-ui 
Feature/christina/metadata ui
 2013-06-01 16:01:53 -07:00
JonahStanley
286fcece4a Fixed issue of searching for text 
Now the step calls is_text_present and is_text_not_present with a wait time of 5 seconds so that the page can be properly refreshed/reloaded if needed.
This also gets rid of an assert not
 2013-05-31 15:33:56 -04:00
JonahStanley
cb9da2cd03 Potentially fixed all flakey tests 
New function was added: is_css_not_present
This function works like is_css_present in that it will wait and can take in an optional argument to wait longer.  This should be used everywhere INSTEAD of not is_css_present as in the latter case, you are telling selenium to wait for the thing you don't want to be there to either be there or time out.
 2013-05-31 15:16:45 -04:00
JonahStanley
3308bb4be7 Fixed pull request comments and refactored the duplicate code 2013-05-31 14:53:29 -04:00
e0d
2e84540af0 removing the request debugger entirely. 2013-05-31 11:15:28 -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
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
6627ca5635 Tidy up the new lettuce tests for metadata editing a bit. 2013-05-30 12:26:18 -04:00
Jane Manning
c976fee2d9 Copy changes to make dup email or public-username messages more informative 2013-05-28 15:32:53 -07:00
James Tauber
d38f266153 updated mitxmako README to clarify license and origin 2013-05-28 15:14:47 -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
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
Calen Pennington
257dae634b Merge pull request #2090 from edx/fix/cale/amazon-ses-errors 
Fix/cale/amazon ses errors
 2013-05-23 09:17:51 -07:00
Will Daly
a4ad495bef Merge pull request #2084 from edx/fix/will/lettuce-browser-size 
Set the browser size on startup of acceptance tests.
 2013-05-23 08:00:48 -07:00
Calen Pennington
f521b8e8c0 Handle errors while sending emails around changing user data 
The most common error is Amazon SES having blacklisted an email address.
However, we handle any error being raised during user.email_user.

Fixes JIRA LMS-131
 2013-05-23 10:27:34 -04:00
Calen Pennington
7ef6132194 Make factories return unicode data 
Django always returns string data from the database as unicode objects
(ref: https://docs.djangoproject.com/en/1.4/ref/unicode/#models).
Therefor, our factories should do the same
 2013-05-22 21:38:07 -04:00
Calen Pennington
2add58bb5a Create sequences for names, emails, and usernames in UserFactory 2013-05-22 21:35:49 -04:00
David Baumgold
0c368011da Move underscore templates into separate files, included in Mako templates 2013-05-22 15:55:50 -04:00
Chris Dodge
470569545d add a migrations to the new django_comment_common to keep things a bit more consistent with our normal useage. 2013-05-22 13:32:32 -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
Will Daly
bab4b18647 Set the browser size on startup of acceptance tests. 
This resolves an issue on Mac OS X in which the login dropdown
arrow couldn't be clicked because it was off-screen.
It should make the test suite more stable.
 2013-05-17 17:21:44 -04:00
Greg Price
372084e0b6 Merge branch 'drupal-new' 
Conflicts:
	lms/envs/common.py
 2013-05-17 16:17:35 -04:00
Greg Price
de5b4d7d27 Merge branch 'master' into drupal-new 2013-05-17 16:10:56 -04:00
Diana Huang
00378add25 Merge pull request #2065 from edx/diana/drupal/fix-link-test 
Drupal: Fix test so that it works with both CMS and LMS settings
 2013-05-17 12:08:46 -07:00
Greg Price
d4cee365e6 Ensure CSRF cookie is present for login and registration pages 2013-05-17 14:23:28 -04:00
Diana Huang
15a5e6c1ac Fix test so that it works with both CMS and LMS settings 2013-05-17 13:18:10 -04:00
Diana Huang
ba983d5f49 Merge pull request #2062 from edx/diana/drupal/lettuce-tests 
Fix Lettuce Tests for Drupal site
 2013-05-17 08:56:11 -07:00
Carlos Andrés Rocha
35bd38d677 Add status app with simple view to check celery workers 2013-05-17 11:33:14 -04:00
Diana Huang
2b80b358ed Add in a test for the marketing_link function in mitxmako 2013-05-17 10:51:37 -04:00
Greg Price
362736c4d1 Merge pull request #2060 from edx/fix/gprice/marketing-links 
Fix marketing links in password reset pages
 2013-05-16 14:24:13 -07:00
Greg Price
4e95aa053f Fix marketing links in password reset pages 2013-05-16 16:57:56 -04:00
Diana Huang
b6c0081064 Look for the existence of the links, not for 
the actual urls
 2013-05-16 16:30:29 -04:00
Diana Huang
22cf0dfa97 Fix bug in lettuce tests where the unregister dialog wasn't 
getting closed fast enough.
 2013-05-16 16:30:29 -04:00
Diana Huang
1c2175304e Merge branch 'master' into drupal-new 2013-05-16 16:27:36 -04:00
Ned Batchelder
e947218285 Merge master to here. 2013-05-16 14:21:51 -04:00
Will Daly
1e1e6450df Pep8 fixes 2013-05-16 11:33:50 -04:00
Will Daly
1240c5ae92 Merge branch 'master' into feature/will/ci-lettuce-tests 2013-05-15 11:40:54 -04:00
Chris Dodge
ce52be1e57 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 2013-05-15 09:59:26 -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
Will Daly
ee5f0ac0ce Workaround for Ubuntu ChromeDriver issue. Now retries 
until it acquires a valid session.
 2013-05-15 08:24:27 -04:00
Will Daly
9dbcf0baa4 Updated login session handling to fix issue with ChromeDriver on Ubuntu 2013-05-14 14:47:50 -04:00
Greg Price
a5bb31792b Add a prefix string to Zendesk errors to be more searchable in Splunk 2013-05-13 16:38:52 -04:00
Will Daly
2e0b5b24d8 Pylint and pep8 fixes 2013-05-13 15:21:45 -04:00
Will Daly
d1e35b14bb Merge branch 'master' into feature/will/ci-lettuce-tests 2013-05-13 14:08:06 -04:00