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
Calen Pennington
4b1fa6b316
Merge pull request #690 from cpennington/one-time-startup
...
One time startup centralization
2013-08-27 12:19:42 -07:00
Will Daly
e50a2414b2
Studio ModuleStoreTestCase subclasses now use randomized Mongo
...
collection names
2013-08-27 12:57:14 -04:00
Calen Pennington
407b02b358
Centralize startup code, and execute in all contexts
...
Inspired by: http://eldarion.com/blog/2013/02/14/entry-point-hook-django-projects/
Moves startup code to lms.startup and cms.startup, and calls the startup
methods in wsgi.py and manage.py for both projects.
2013-08-27 12:12:20 -04:00
Julian Arni
cee44501f5
Merge remote-tracking branch 'origin/release'
...
Contains hotfix/2013-18-21
2013-08-27 11:05:13 -04:00
Anton Stupak
dd9b16c2cf
Replace the description in the studio editing module.
2013-08-27 15:22:47 +03:00
Will Daly
fe72730969
Integrate js-test-tool into testing infrastructure
2013-08-26 20:21:18 -04:00
Julian Arni
1e44e01629
Remove assert2xx
2013-08-25 22:50:26 -04:00
Julian Arni
03b140d538
Review fixes
2013-08-25 22:40:11 -04:00
Julian Arni
509a861459
Clear contentstore
...
Signed-off-by: Julian Arni <julian@edx.org >
2013-08-25 22:40:11 -04:00
Julian Arni
a28b02ae2c
Pep8 and pylint fixes
2013-08-25 22:40:11 -04:00
Julian Arni
fcd11d93d5
Handle nginx 499s and double requests
2013-08-25 22:40:11 -04:00
Julian Arni
8a8bcf289f
remove repeated warnings
2013-08-25 22:40:10 -04:00
Julian Arni
ef0828fc66
Behave properly on non-tar-gz files
2013-08-25 22:40:10 -04:00
Julian Arni
eaa4b3ef99
Pep8 and pylint fixes
2013-08-25 22:40:10 -04:00
Julian Arni
d991595ecb
Split import-export into new file
2013-08-25 22:40:10 -04:00
Julian Arni
993b92bc47
Add import tests
2013-08-25 22:40:10 -04:00
Julian Arni
7666aad042
Check download integrity
2013-08-25 22:40:10 -04:00
Julian Arni
513b6cab3e
Small review fixes.
...
Comments, httpresponse -> jsonresponse; make sure errors get relayed.
2013-08-25 22:40:09 -04:00
Julian Arni
798d07a8d9
Fix confusing message
2013-08-25 22:40:09 -04:00
Julian Arni
3aaa2868c0
Process uploaded chunks.
...
Also adds lockfile for asynchronous status updates.
2013-08-25 22:40:09 -04:00
Julian Arni
50934d4d45
Make client-side use jquery-file-upload
2013-08-25 22:40:09 -04:00
Peter Fogg
5cb1b2594f
Merge pull request #787 from edx/peter-fogg/static-page-delete
...
Add delete confirmation to static pages.
2013-08-23 11:52:37 -07:00
Will Daly
d89279f6b3
Merge pull request #773 from edx/lapentab/fix_network_tests
...
Remove network calls in tests
2013-08-23 09:07:31 -07:00
Will Daly
42ac76ce0c
Merge branch 'master' into lapentab/fix_network_tests
...
Conflicts:
lms/djangoapps/courseware/tests/tests.py
2013-08-23 11:48:38 -04:00
Jonah Stanley
bda814fb8c
Merge pull request #785 from edx/jonahstanley/fix-image-upload
...
Changed error message on failure and made test more robust
2013-08-23 08:48:00 -07:00
Will Daly
c680dfdd40
Merge pull request #768 from edx/will/use-mixed-modulestore-in-tests
...
Will/use mixed modulestore in tests
2013-08-23 08:38:09 -07:00
JonahStanley
473cc3624b
Changed error message on failure and made test more robust
...
Better error message
2013-08-23 11:33:52 -04:00
Chris Dodge
7edfd185b7
teardown the content database after tests
2013-08-22 17:35:38 -04:00
David Ormsbee
52d33c0dee
Merge branch 'master' into ormsbee/verifyuser_func
2013-08-22 17:33:20 -04:00
Peter Fogg
75b76b37ef
Add delete confirmation to static pages.
...
We used to use a regular JS `confirm`; this makes the UI consistent
with the rest of Studio.
2013-08-22 16:41:07 -04:00
chrisndodge
0191ae9417
Merge pull request #652 from edx/feature/ichuang/import-with-no-static
...
Enable mongodb to be used as back-end for git-based authoring workflow
2013-08-22 11:05:02 -07:00
chrisndodge
1e9621cf4f
Merge pull request #763 from edx/fix/cdodge/strip-transient-draft-serialization-attributes
...
fix some gaps which would allow the temporary xml attributes 'parent_seq...
2013-08-22 11:00:55 -07:00
David Ormsbee
0dd5819683
basic flow from enroll mode selection to verify screen
2013-08-22 13:56:23 -04:00
Chris Dodge
bd412182c7
verticals shouldn't have 'data'
2013-08-22 12:01:17 -04:00
chrisndodge
2699ba65ba
Merge pull request #756 from edx/fix/cdodge/incorrect-html-serialization
...
Fix/cdodge/incorrect html serialization
2013-08-22 08:58:56 -07:00
JonahStanley
d96595318a
Stylistic changes
...
CMS tests should now run on IE
CMS tests will now run on Safari
Rebased wrong
Forgot to update the test_acceptance.sh
Changed way of string splitting
2013-08-22 10:08:35 -04:00
lapentab
d894a065df
Stylistic changes
2013-08-22 09:28:37 -04:00
lapentab
1759191370
Remove network calls in tests
2013-08-22 08:43:28 -04:00
Chris Dodge
0c1c3f11af
loop in static import testing into common/* tests
2013-08-21 20:48:56 -04:00
Chris Dodge
fb3a5bf9db
remove unused class
2013-08-21 20:10:36 -04:00
Chris Dodge
ef98c54f5b
fix some pylint violations
2013-08-21 20:06:10 -04:00
Chris Dodge
2ba0d40d7b
fix pep8 violations
2013-08-21 20:02:58 -04:00
Will Daly
109d3c3d10
Refactored to remove test#XXX methods from ModuleStoreTestCase
2013-08-21 19:00:32 -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
bb7cbf4d62
If sauce is not enabled, allow full range of ports
...
Forgot an import
2013-08-21 16:05:03 -04:00
JonahStanley
22b3f2b161
Factored out Sauce related things to one file
...
LMS was arbitrarily chosen for now.
Fixed up pylint and pep8 errors
Fixed up pylint and pep8 errors
Changed naming to be better
Changed Sauce Info to obtaining a JSON string
2013-08-21 16:05:03 -04:00
JonahStanley
35e5f4cab5
Moved global things in browser.py to functions
2013-08-21 16:05:02 -04:00
JonahStanley
0b6e62984e
Using requests instead of a HTTPConnect
2013-08-21 16:05:02 -04:00
