Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,200 Commits 1 Branch 0 Tags
869d09220c19ee1dfd11fd58a33cacda53de9798
Commit Graph

955 Commits

Author SHA1 Message Date
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
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
Adam Palay
d347390c24 fix error logging for unenrolling if enrollment not found 2013-08-26 09:39:16 -04: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
Diana Huang
dee127360b Clean up models, add some error handling 2013-08-22 15:39:56 -04:00
Jason Bau
6f70c9b9ce Adding migration to store purchased mode in PaidCourseRegistration 2013-08-22 15:39:55 -04:00
Jason Bau
5fbb12cb61 make PaidCourseRegistration mode aware 2013-08-22 15:39:55 -04:00
Jason Bau
3f9c52cd1c Move shopping cart from session into model/db 2013-08-22 15:39:54 -04:00
Jason Bau
988a7a1fba initial commit of shopping cart and cybersource integration 2013-08-22 15:39:54 -04:00
Will Daly
736b3e0ecd Common djangoapps no longer access courseware; other cleanup 2013-08-22 14:08:35 -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
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
Will Daly
8165a033b1 Pep8/pylint fixes 
Fixed test_masquerade failure due to not clearing the modulestore
between tests.
 2013-08-21 19:42:59 -04:00
Will Daly
151782acf0 LMS acceptance tests use mixed modulestore 2013-08-21 16:23:48 -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
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
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
ee23b9d161 Changed method of obtaining feature flags to environment variables 
Conflicts:
	common/djangoapps/terrain/browser.py
 2013-08-21 16:05:02 -04:00
JonahStanley
9fb0529036 Sauce can only connect on certain ports 2013-08-21 16:05:02 -04:00
JonahStanley
3cf8083717 Upgraded selenium version for sauce 2013-08-21 16:05:01 -04:00
JonahStanley
2812b9cd5c Fixed how config was obtained 
Added comment about the feature
 2013-08-21 16:05:01 -04:00
JonahStanley
682d85c2f3 Changed feature to being one dictionary 
Conflicts:
	common/djangoapps/terrain/browser.py
 2013-08-21 16:05:01 -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
97df5aa997 Added feature flag for device type. Needed for android tablets 2013-08-21 16:05:01 -04:00
JonahStanley
1d7284b7cd Refactored out more for feature flags 
Refactored more for feature flags
 2013-08-21 16:05:01 -04:00
JonahStanley
010fd5771d Pass/Fail status updated properly 
Conflicts:
	common/djangoapps/terrain/browser.py
 2013-08-21 16:05:00 -04:00
JonahStanley
28d9bbaff2 Change build name generation 
Browser Matrix Data only applies to latest build information
 2013-08-21 16:05:00 -04:00
JonahStanley
f4c19919cd Beginnings of a feature flag 
Conflicts:
	common/djangoapps/terrain/browser.py

Changed way feature flag was checked

Conflicts:
	common/djangoapps/terrain/browser.py
 2013-08-21 16:05:00 -04:00
JonahStanley
876651009e Logging out no longer uses cookies. 
Removed other cookie reference
 2013-08-21 16:05:00 -04:00
JonahStanley
eb7fe7c927 Added browser matrix (might not display yet) 
Added build information.  Status image will now display properly
 2013-08-21 16:05:00 -04:00
Jay Zoldak
81151ab67a Prototype for running acceptance tests via Sauce Labs Connector 
Added in more desired capabilities and fixed the browser creation

Sauce Labs is now updated if the test suite passes or fails
 2013-08-21 16:05:00 -04:00
Will Daly
96c2a50370 Merge branch 'master' into will/use-mixed-modulestore-in-tests 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/django.py
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/courseware/tests/tests.py
 2013-08-21 10:12:24 -04:00
Diana Huang
70e1c70e4f Move course modes to common and enable in Studio 2013-08-21 09:59:15 -04:00
Will Daly
48c6daacb8 Removed unnecessary settings wrangling from ModuleStoreTestCase. 
Modified navigation tests to use MixedModulestore
Updated factories to find editable modulestore

Updated test_submitting_problems

Updated test_tabs.py

Updated test_view_authentication

Updated test_views

Updated courseware/tests/tests.py

Updated test_masquerade

Updated test_module_render

Pylint fixes

Updated video and word cloud tests

Updated course wiki tests

Updated license and open_ended tests.
One open_ended test still failing due to Mako initialization issues

Updated staticbook

Updated django_comment_client tests

Updated instructor tests

Updated instructor task tests

Updated external_auth tests

Updated course_groups
 2013-08-21 09:36:45 -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
ichuang
220ec522a1 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static 
Conflicts:
	common/djangoapps/static_replace/__init__.py
	common/djangoapps/xmodule_modifiers.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/module_render.py
 2013-08-19 08:24:35 -04:00
Chris Dodge
033f922ec0 add a try catch around the staticstorage lookup, which can throw an exception 2013-08-17 10:33:59 -04:00
chrisndodge
594a73d437 Merge pull request #722 from edx/feature/cdodge/add-a-mixed-modulestore 
Feature/cdodge/add a mixed modulestore
 2013-08-17 07:32:51 -07:00
chrisndodge
8ba3214cd4 Merge pull request #496 from edx/feature/cdodge/add-a-mixed-modulestore 
Add a 'MixedModuleStore' which aggregates between XML and Mongo Modulestores
 2013-08-16 13:02:31 -07:00
James Tauber
b985722255 fixed encoding 
xgettext seems to only like `utf-8` not `utf8` so string extraction
was failing without this
 2013-08-16 13:52:07 -04:00
Chris Dodge
7bdc4c5134 fix errant conflict resolution 2013-08-15 22:58:03 -04:00
Chris Dodge
54bd3170bc remove another debug logging message 2013-08-15 22:58:03 -04:00
Chris Dodge
fa61bdf69f remove debugging logging 2013-08-15 22:58:02 -04:00
Chris Dodge
5298f54f4c fix tests 2013-08-15 22:58:02 -04:00
Chris Dodge
cff93d324b WIP 2013-08-15 22:58:02 -04:00
Chris Dodge
82988972ad WIP: added a get_modulestore_type. Added some unit tests. changed over the isinstance() with respect to modulestores to use this get_modulestore_type() 2013-08-15 22:58:02 -04:00
John Jarvis
4c469cc414 Merge pull request #666 from edx/jarv/add-get-grades 
adding django-admin commands to dump grades to a csv file
 2013-08-14 11:42:51 -07:00