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

1757 Commits

Author SHA1 Message Date
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
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
3aaa2868c0 Process uploaded chunks. 
Also adds lockfile for asynchronous status updates.
 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
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
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
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
JonahStanley
876651009e Logging out no longer uses cookies. 
Removed other cookie reference
 2013-08-21 16:05:00 -04:00
Peter Fogg
7fc8fcde7b Merge pull request #752 from edx/peter-fogg/unlimited-graceperiod 
Allow grace periods of > 24 hours.
 2013-08-21 13:00:15 -07:00
Jonah Stanley
0138c08288 Merge pull request #758 from edx/jonahstanley/fix-courseteam-test 
Made the lambda statement more resistant to errors
 2013-08-21 12:47:35 -07:00
JonahStanley
af028efd00 Made the lambda statement more resistant to errors 
Made the statement better

pylint fix

Accidently left off parameter

Removed logout
 2013-08-21 15:01:33 -04:00
Chris Dodge
21f4b05813 fix some gaps which would allow the temporary xml attributes 'parent_sequential_url' and 'index_in_children_list' to get persisted in the database, whereas they are meant to be only scoped during export/import 2013-08-21 14:46:38 -04:00
Peter Fogg
eb5b6cc6ea Allow grace periods of > 24 hours. 2013-08-21 14:37:12 -04:00
Peter Fogg
e177270d0d Merge pull request #700 from edx/peter-fogg/course-image-upload 
WIP: Peter fogg/course image upload
 2013-08-21 11:17:12 -07:00
ichuang
42af561a17 pep8 and pylint for tests of nostatic import 2013-08-21 11:23:00 -04:00
Julian Arni
7bf734221c Fix var name issue 2013-08-21 10:49:48 -04:00
Peter Fogg
9632f4fed8 Address PR comments: 
- Internationalize upload errors.
- Move upload tests into their own files.
- Refactor upload dialog acceptance tests.
 2013-08-21 09:42:00 -04:00
Peter Fogg
e4302e62d2 Allow course image uploads in the settings page. 
Authors can upload an image (or choose an existing one) from the
settings page, using the in-context uploader from PDF
textbooks. Includes tests for backwards compatibility with XML courses
-- they used a magic filename (images/course_image.jpg) which is
mapped to a location in the Mongo contentstore.

Still needs some UX work, though the backend plumbing is there.
 2013-08-21 09:42:00 -04:00
ichuang
8a84e6790b clean up test_import_nostatic.py 2013-08-20 23:44:33 -04:00
ichuang
0d938d3940 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static 
Conflicts:
	lms/djangoapps/courseware/tests/test_module_render.py
 2013-08-20 23:40:09 -04:00
ichuang
95952bd693 add tests of static_asset_path and importing with no static; 
fix (again) static_replace to work with static_asset_path
 2013-08-20 23:30:26 -04:00
Chris Dodge
d523167bdd add another piece of test data. just an img tag. 2013-08-20 23:16:39 -04:00
Chris Dodge
5a7bcd7bb3 always serialize out HTML content to a separate .html file 2013-08-20 22:43:53 -04:00
Chris Dodge
5989bf6bdc update the PDF textbook url paths as well as update wiki_slug when importing 2013-08-20 21:50:28 -04:00