Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,220 Commits 1 Branch 0 Tags
a896ccfff76055945148e7a8ec8e73d4fa8136d9
Commit Graph

15220 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JonahStanley
a896ccfff7 Added in a comment 
This explains why acceptance_static is used
 2013-07-10 16:21:11 -04:00
JonahStanley
4685cacc7b Databases are now cleaned properly 
Acceptance_static is used to prevent collect static from using a seed
test.py had its seed removed due to redundancy
 2013-07-10 15:28:23 -04:00
JonahStanley
0bd1e78e03 Acceptance tests use random ports 2013-07-09 12:18:30 -04:00
JonahStanley
a21303ba96 Found some other places where the name should be unique 2013-07-09 10:49:19 -04:00
JonahStanley
a2020aad03 Changed the lms database name to be different for the acceptance tests 2013-07-09 09:31:37 -04:00
JonahStanley
1eaa0317c4 Using parent process id for random number 
This is to allow acceptance tests to properly link and know the names of its other parts
 2013-07-09 08:57:05 -04:00
JonahStanley
28142d51f9 Added comment about how the resetting of the database works 2013-07-09 08:54:20 -04:00
JonahStanley
b0d70008e4 Changed when the databases are reset 
This might allow parallel features in the future
 2013-07-09 08:54:20 -04:00
JonahStanley
789b711023 Acceptance tests now pull from their own unique database 
These databases/collections are cleared after harvest
 2013-07-09 08:54:19 -04:00
David Baumgold
433e5e9087 Merge pull request #349 from hikari-boulders/patch-1 
update create-dev-env.sh, change one small character
 2013-07-08 14:14:15 -07:00
jkarni
ab4dfc248f Merge pull request #217 from edx/feature/jkarni/jsinput 
Feature/jkarni/jsinput
 2013-07-08 12:51:04 -07:00
Julian Arni
fd6abc88e2 Incorporate review comments 2013-07-08 14:32:02 -04:00
Will Daly
e477cceefb Merge pull request #346 from edx/will/disable-flakey-tests 
Disabled tests that are failing in Jenkins
 2013-07-08 09:55:09 -07:00
hikari-boulders
61806b2308 update create-dev-env.sh, change one small character 
in line 470, changed "curl -O" to "curl -OL" such that the scripts runs without problems.
 2013-07-08 17:55:15 +02:00
Sarina Canelake
bc0e590842 Merge pull request #343 from edx/sarina/pylint-R0921 
Ignore Pylint R0921
 2013-07-08 07:53:44 -07:00
Will Daly
7085b95bc0 Disabled video test that was failing on Mac OS X 2013-07-08 10:51:31 -04:00
chrisndodge
57d82dea10 Merge pull request #330 from edx/fix/cdodge/delete-course-delete-drafts 
[STUD-380] Fix/cdodge/delete course delete drafts
 2013-07-08 07:24:24 -07:00
Will Daly
01eb93eb47 Disabled tests that are failing in Jenkins 2013-07-08 10:02:01 -04:00
Carlos Andrés Rocha
1fbab8e9fa Merge pull request #295 from edx/rocha/celery-virtual-host 
Add setting to set the virtual host of a Celery broker
 2013-07-08 06:58:31 -07:00
Sarina Canelake
ff4888cbc5 Ignore Pylint R0921 2013-07-08 08:03:13 -04:00
Carlos Andrés Rocha
06529054de Merge hotfix 2013-07093 into master 
Conflicts:
	common/lib/xmodule/xmodule/crowdsource_hinter.py
	common/lib/xmodule/xmodule/css/crowdsource_hinter/display.scss
	common/lib/xmodule/xmodule/js/src/crowdsource_hinter/display.coffee
	common/static/coffee/src/logger.coffee
	common/templates/hinter_display.html
	lms/envs/test.py
	lms/urls.py
 2013-07-03 18:55:21 -04:00
Ned Batchelder
4d8eb53362 Merge pull request #335 from edx/ned/fix-course-factory 
Fix broken tests by simplifying the CourseFactory
 2013-07-03 14:32:29 -07:00
Ned Batchelder
31a72093e0 Fix broken tests by simplifying the CourseFactory 
The data argument was being treated specially, but that was just
because we didn't have **kwargs support.  Now we do.  There are
two uses of data=, one we convert to kwargs, the other was actually
unused, so remove it completely.
 2013-07-03 17:04:18 -04:00
Chris Dodge
3acff0a77a remove unnecessary type check on the module store. XML module stores will throw an exception when deleting an item... 2013-07-03 16:27:30 -04:00
Chris Dodge
e92799bb2e switch from prints to logging.debug. Also refactor some duplicate code 2013-07-03 16:12:23 -04:00
Ned Batchelder
14ed02c164 Merge pull request #327 from edx/ned/pylint-tweaks 
Pylintrc changes to improve things, including removing the reports.
 2013-07-03 12:29:21 -07:00
Ned Batchelder
a453de2fca Merge pull request #323 from edx/ned/fix-lms-530 
Fix LMS-530: Reflected XSS in chapter and page numbers
 2013-07-03 12:28:19 -07:00
Calen Pennington
573abb8091 Merge pull request #321 from edx/cale/pylint-errors 
Pylint errors
 2013-07-03 12:16:29 -07:00
Jonah Stanley
0be0df1b59 Merge pull request #325 from edx/jonahstanley/fix-flakey-tests 
Made a css_html to obtain the html of the css element.
 2013-07-03 11:55:25 -07:00
Ned Batchelder
1d5dfaa131 Add tests for image books, and more tests for the other kinds too. 2013-07-03 14:42:41 -04:00
chrisndodge
8dd32b2a12 Merge pull request #312 from edx/fix/cdodge/add-sandbox-whitelisting-to-cms 
add a 'can_execute_unsafe_code' callback method (ala LMS) to allow for w...
 2013-07-03 11:21:28 -07:00
Chris Dodge
a224c1e8a3 need to change aws.py to take the COURSES_WITH_UNSAFE_CODE from the envs.json file 2013-07-03 14:01:33 -04:00
Chris Dodge
656f2b15fd remove redundent test until we get clarity as to if unit tests are actually using the codejail functionality or not 2013-07-03 13:46:32 -04:00
Chris Dodge
ccfc4fc012 remove extra line space at end of file 2013-07-03 13:46:32 -04:00
Chris Dodge
5088450ed3 add another unit test to explicitly exercise the can_execute_unsafe_code() method 2013-07-03 13:46:32 -04:00
Chris Dodge
b32c4aaa56 actually, seems like we should be using double quotes for docstrings 2013-07-03 13:46:32 -04:00
Chris Dodge
aa7f1f867d actually, I think we use single quotes for docstrings 2013-07-03 13:46:32 -04:00
Chris Dodge
bcbac3aaa4 add docstring to newly refactored method 2013-07-03 13:46:32 -04:00
Chris Dodge
7962ad7dd0 remove incorrect comment 2013-07-03 13:46:31 -04:00
Chris Dodge
bf3a7287f0 do some lamda magic to refactor out the whitelist checking code to be shared between LMS and CMS 2013-07-03 13:46:31 -04:00
Chris Dodge
11ef3961bc try to add some additional diff coverage which should get us to 100% 2013-07-03 13:46:31 -04:00
Chris Dodge
9a8c5857e6 change settings to add test course to sandbox whitelist to try to increase diff code coverage 2013-07-03 13:46:31 -04:00
Chris Dodge
0e0dfd22cf add test for customresponse problem type 2013-07-03 13:46:31 -04:00
Chris Dodge
8d858ecb49 add a unit test to exercise the preview_component AJAX callback in the CMS 2013-07-03 13:46:31 -04:00
Chris Dodge
63ed16e118 add a 'can_execute_unsafe_code' callback method (ala LMS) to allow for whitelisting of courses with respect to codejailing 2013-07-03 13:46:31 -04:00
JonahStanley
221db93f01 Revert "Skipping the flakey tests for now" 
This reverts commit d383a8add7.
 2013-07-03 13:39:36 -04:00
JonahStanley
7fabac9a4b Skipped Flakey Tests for now 2013-07-03 13:31:13 -04:00
JonahStanley
d383a8add7 Skipping the flakey tests for now 2013-07-03 13:28:33 -04:00
Chris Dodge
b18fb97eed extend tests to assert that all draft content is cleaned up. Also add assertion that assets are deleted as well 2013-07-03 11:24:30 -04:00
Chris Dodge
bcc2268216 add code to actually go through and delete the draft modules 2013-07-03 11:23:44 -04:00