Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,146 Commits 1 Branch 0 Tags
342b3bb0e9815017269831a3710175cedf59bedf
Commit Graph

13146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Daly
342b3bb0e9 Merge branch 'master' into feature/will/ci-lettuce-tests 
Resolved conflict with changes to Rakefile in master

Conflicts:
	rakefile
 2013-05-16 11:21:59 -04:00
Will Daly
e78436db18 Merge branch 'feature/will/ci-lettuce-tests' of https://github.com/edx/edx-platform into feature/will/ci-lettuce-tests 2013-05-15 17:07:24 -04:00
Will Daly
3a981cfa05 Removed COURSES_ROOT and DATA_DIR from cms/envs/acceptance.py 2013-05-15 17:06:44 -04:00
Calen Pennington
281662a43e Merge pull request #2048 from edx/fix/cale/prereqs-before-django 
Install python prereqs before trying to run django or install requiremen...
 2013-05-15 13:49:05 -07:00
Brian Talbot
6dcf7be05d Merge pull request #2047 from edx/fix/btalbot/studio-typographyvariables 
Studio - Resolving incorrect Sans Serif Sass Variable Definition
 2013-05-15 13:03:50 -07:00
Brian Talbot
6a618cbe5e Merge branch 'master' into fix/btalbot/studio-typographyvariables 2013-05-15 16:02:44 -04:00
Calen Pennington
0df9f714b8 Install python prereqs before trying to run django or install requirements/local.txt 2013-05-15 15:49:51 -04:00
Will Daly
4e118a080e Updated docs to add a note about Chrome / ChromeDriver revisions. 2013-05-15 15:48:03 -04:00
Will Daly
59f68c2179 Added comments for skipped tests 2013-05-15 15:45:12 -04:00
Brian Talbot
d1c629882c studio - fixes Sass variable defintion to ensure the older -serif references the proper new -sans-serif variable 2013-05-15 15:42:59 -04:00
Calen Pennington
ec7c47828f Merge pull request #1961 from edx/feature/cale/maintain-dev-environment 
Feature/cale/maintain dev environment
 2013-05-15 12:36:36 -07:00
Calen Pennington
9c2756b76b Fix up documentation 2013-05-15 15:25:43 -04:00
Calen Pennington
b5c134e21e Make the externally facing asset watch commands wait for user intervention, and add internal tasks that only run as long as the rake process 2013-05-15 15:25:42 -04:00
Calen Pennington
91dce34f77 Be more graceful when terminating background processes 2013-05-15 15:25:42 -04:00
Calen Pennington
352a4da5b8 Use install_prereqs in tests 2013-05-15 15:25:42 -04:00
Calen Pennington
0701e1a776 Use local node_modules as system_node_path if none is set 2013-05-15 15:25:42 -04:00
Calen Pennington
52d209d053 Use coffee installed in local node_modules for tests 2013-05-15 15:25:41 -04:00
Calen Pennington
089ac002c6 Install prereqs before running pep8 or pylint 2013-05-15 15:25:41 -04:00
Calen Pennington
ed9b91e9d0 Add mechanism for running migrations of developer workspaces 2013-05-15 15:25:41 -04:00
Calen Pennington
9d42bce54f Split rake file into smaller, more manageable pieces 2013-05-15 15:25:35 -04:00
Calen Pennington
437158a4f1 Allow disabling of prereq installation 2013-05-15 15:23:57 -04:00
Calen Pennington
afdf10a448 Clean up how asset prereq tasks are wired up 2013-05-15 15:23:57 -04:00
Calen Pennington
6485b85a9c Allow overriding of prereqs cache dir 2013-05-15 15:23:57 -04:00
Calen Pennington
a22287f192 Install prereqs before starting cms/lms or running tests 2013-05-15 15:23:57 -04:00
Calen Pennington
964c21ff2b Add a jasmine test runner for capa 2013-05-15 15:23:56 -04:00
Calen Pennington
1c28f5a0ec Move Mysql and scipi to requirements/post.txt, because they require the contents of requirements.txt to be completely installed 2013-05-15 15:23:56 -04:00
Calen Pennington
ef17e9368c Make capa specify distribute 0.6.28 like the rest of the project 2013-05-15 15:23:56 -04:00
Calen Pennington
05d76c77ec Pip installs paths relative to the current directory, not the directory the requirements file is in 2013-05-15 15:23:56 -04:00
Calen Pennington
9743e84d0b Use launchy for opening browsers 2013-05-15 15:23:55 -04:00
Calen Pennington
8e54991b89 Clean out cruft from rake file 2013-05-15 15:23:55 -04:00
Carlos Andrés Rocha
4a835433ab Remove unused fixtures 2013-05-15 15:23:55 -04:00
Carlos Andrés Rocha
79a029ce9a Clean root project directory 2013-05-15 15:23:55 -04:00
Calen Pennington
14bf719538 Merge pull request #2019 from edx/fix/cale/xmodule-template-docs 
Add documentation of xmodule template files
 2013-05-15 12:20:10 -07:00
Calen Pennington
1746c60072 Merge pull request #2027 from edx/fix/cale/allow-liveserver-port-ranges 
Allow django liveserver to use larger port range
 2013-05-15 12:19:25 -07:00
Calen Pennington
f499dec1db Merge pull request #2028 from edx/feature/cale/flexible-repo-jenkins 
Make gcli commands flexible around org and repo name
 2013-05-15 12:15:48 -07:00
Calen Pennington
9689445251 Merge pull request #1964 from edx/feature/cale/parallel-build-venvs 
Use one virtualenv for each parallel build process
 2013-05-15 10:48:40 -07:00
Calen Pennington
8b7970938f Use one virtualenv for each parallel build process 2013-05-15 13:39:21 -04:00
Calen Pennington
b3e8d59762 Make gcli commands flexible around org and repo name 2013-05-15 13:19:42 -04:00
Calen Pennington
5cc15fccf1 Allow django liveserver to use larger port range 2013-05-15 13:19:22 -04:00
Will Daly
1240c5ae92 Merge branch 'master' into feature/will/ci-lettuce-tests 2013-05-15 11:40:54 -04:00
Will Daly
405299712c Disabled color output from lettuce tests in the Jenkins logs 2013-05-15 11:38:11 -04:00
chrisndodge
d7a6e58fec Merge pull request #2044 from edx/fix/cdodge/fix-test-on-css-class 
fix broken tests. Also drive by fix for the sporadic failure on tests wh...
 2013-05-15 08:37:58 -07:00
Will Daly
b3e959773d Disabled logging of warnings/errors for acceptance tests 
to make the logs readable
 2013-05-15 11:31:52 -04:00
Chris Dodge
6cec66979a fix broken tests. Also drive by fix for the sporadic failure on tests which may go to a textbook page. The URL formatting was incorrect in the test 2013-05-15 11:16:47 -04:00
Will Daly
baec80ed07 Updated documentation with note about running acceptance tests 
in parallel.

Updated docs to say we target Chrome.
 2013-05-15 10:38:04 -04:00
Will Daly
3217989de5 Fixed/skipped CMS tests in subsection and signup. 2013-05-15 10:14:37 -04:00
Calen Pennington
abc67b5e43 Merge pull request #2021 from edx/vaxxxa/word_cloud_fix_peps 
word cloud: fix pylint warnings, fix word cloud test
 2013-05-15 06:56:17 -07: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
Vasyl Nakvasiuk
b02e92a80c fix word cloud test 2013-05-15 11:42:43 +03:00