Commit Graph

66 Commits

Author SHA1 Message Date
Calen Pennington
b353ed2ea2 Better support specifying of modulestore configuration in test cases
The existing pattern of using `override_settings(MODULESTORE=...)` prevented
us from having more than one layer of subclassing in modulestore tests.

In a structure like:

    @override_settings(MODULESTORE=store_a)
    class BaseTestCase(ModuleStoreTestCase):
        def setUp(self):
            # use store

    @override_settings(MODULESTORE=store_b)
    class ChildTestCase(BaseTestCase):
        def setUp(self):
            # use store

In this case, the store actions performed in `BaseTestCase` on behalf of
`ChildTestCase` would still use `store_a`, even though the `ChildTestCase`
had specified to use `store_b`. This is because the `override_settings`
decorator would be the innermost wrapper around the `BaseTestCase.setUp` method,
no matter what `ChildTestCase` does.

To remedy this, we move the call to `override_settings` into the
`ModuleStoreTestCase.setUp` method, and use a cleanup to remove the override.
Subclasses can just defined the `MODULESTORE` class attribute to specify which
modulestore to use _for the entire `setUp` chain_.

[PLAT-419]
2015-02-04 09:09:14 -05:00
Calen Pennington
03a05fd9d4 Always call super(..).setUp() from setUp 2015-02-04 09:09:14 -05:00
Ned Batchelder
fb595c89f3 Fix a number of incorrect translation string uses
These were found by the new pylint checker I wrote! :)
2015-02-02 22:38:27 -05:00
Carson Gee
7347e3bd4a Add missing sysadmin dashboard unicode cast 2015-01-27 11:22:45 -05:00
David Baumgold
36e77c7463 Fixing pep8 issues 2014-12-11 13:04:49 -05:00
Jesse Zoldak
bf3b87bc64 Clean up all modulestore testcases
Move modulestore config for tests to an importable location
Disable pylnt warning for lms imports in common tests
Refactor all testcases that loaded all xml courses
TE-610
TE-489
2014-12-02 07:09:36 -05:00
Sarina Canelake
e45994b2ef s/pylint: disable=R0924/pylint: disable=incomplete-protocol/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
90624ac4ba s/pylint: disable=R0915/pylint: disable=too-many-statements/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
b4d24f36c8 s/pylint: disable=E1103/pylint: disable=maybe-no-member/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
b8c16d5ed7 s/pylint: disable=E1120/pylint: disable=no-value-for-parameter/ 2014-12-01 11:22:09 -05:00
Sarina Canelake
e0f1d3f3f3 s/pylint: disable=C0111/pylint: disable=missing-docstring/ 2014-12-01 11:22:09 -05:00
stv
cf9308144d Fix PEP8: E302 expected 2 blank lines, found 1 2014-11-10 11:00:11 -08:00
muhammad-ammar
fcaa783e43 Unit Test Improvements
TE-489
2014-10-31 11:55:13 +00:00
Brandon DeRosier
c571a2a029 Added handling in gitlog for missing import logs
Fixes a template error that occurs when viewing a course's detailed
git import log. The problem happens for courses imported using methods
other than the `git_add_course` command.
2014-10-10 10:41:06 -04:00
Sarina Canelake
467f2988e1 Quality cleanup 2014-09-08 12:02:31 -04:00
Stephen Sanchez
9ee15bf007 Updating the footer for edx.org and open edx.
Move the open edx logo inside the div

Adding a bunch of placeholder views.

indenting.

Making some styles work against LMS sass.

Adding back the old edx footer and associated icons, with a feature flag.
2014-08-25 15:33:43 +00:00
Jason Bau
b55362b925 make unit tests respect mongo port/host settings (with default)
settings are read in from environment variable
2014-08-11 14:17:29 -07:00
Nimisha Asthagiri
ea32529866 Fix all modulestore calls to pass in user ids. 2014-07-09 21:10:12 -04:00
Nimisha Asthagiri
f5abef88c2 LMS-2947 remove get_error_courses in Split.
LMS-2950 move delete_course to Mongo.
2014-07-09 21:10:12 -04:00
David Baumgold
ded1a752a8 Merge pull request #4210 from bdero/bdero/fix-sysadmin-dashboard-gitlog-timezone
Make sysadmin dashboard gitlog date timezone-aware
2014-06-30 14:33:01 -04:00
Nimisha Asthagiri
eecff6e0aa ModulestoreEnum class. 2014-06-27 14:37:35 -04:00
Brandon DeRosier
36873ffc92 Datetime localized on gitlog page of sysadmin dashboard 2014-06-27 12:27:50 -04:00
Nimisha Asthagiri
a9213509c3 Enable Mixed Modulestore STUD-1540
Refactor get_parent_locations STUD-1663
2014-06-26 18:00:11 -04:00
Sarina Canelake
30c8da1596 Fix variable names to give context for translators
fix other various i18n issues
2014-06-18 23:28:39 -04:00
Sarina Canelake
c68fce1f0a Fix i18n translation issues 2014-06-17 12:03:27 -04:00
Dave St.Germain
f2fb57e196 Added manual refund page for support.
PR-615
2014-06-17 08:24:02 -04:00
Jay Zoldak
ac17e809ee Fix some translation tags 2014-06-03 15:50:11 -04:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library
[LMS-2757]
2014-05-29 17:03:35 -04:00
Sarina Canelake
b3462d1c67 Fix issues with psychometrics and git import 2014-05-16 11:47:14 -04:00
Calen Pennington
7e55d5eb5c Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 2014-05-14 10:00:16 -04:00
Waheed Ahmed
2b8fafec56 Text changed in admin_dashboard for course enrollments.
LMS-1596
2014-05-14 15:40:50 +05:00
Calen Pennington
a4df0e1515 Fix failing tests 2014-05-12 14:45:38 -04:00
Calen Pennington
85ca7db7a6 Fix merge conflicts relative to master 2014-05-12 11:42:21 -04:00
Calen Pennington
19acdd31e8 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
	cms/djangoapps/contentstore/views/public.py
	common/djangoapps/external_auth/tests/test_ssl.py
	common/djangoapps/student/views.py
	lms/djangoapps/dashboard/sysadmin.py
	lms/templates/notes.html
2014-05-12 11:35:03 -04:00
Calen Pennington
ac7675be2c Make dashboard.tests a python module 2014-05-09 09:23:52 -04:00
Calen Pennington
6334d7ddaa Clean up how courses are iterated on instructor dashboard 2014-05-09 09:23:51 -04:00
Calen Pennington
cd746bf8e5 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit adds the non-courseware lms/djangoapps and lms/lib.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-08 12:09:23 -04:00
Carson Gee
e311dfa847 Adding additonal path to search for git information on sysadmin dashboard
When viewing the sysadmin dashboard courses tag, we also search the git
repository directory in addition to the DATA_DIR to try and find
the course git repo to get hash, last commit, and last editor information
for each loaded course if available.
2014-05-05 12:03:18 -04:00
zubiar-arbi
00bf5e4fce use unicode strings for slug and regex
STUD-1433
2014-03-21 15:48:29 +05:00
Carson Gee
b67b89e562 Fixed bug of checking out the same branch multiple times and code review fixes
Translator comments and language fixes
2014-03-06 17:30:07 -05:00
Carson Gee
9d55c88c76 Add option for importing a course from a named branch of a git repo 2014-03-06 16:26:25 -05:00
Don Mitchell
81a92e4bfc Consolidate course_id triple parsing 2014-02-24 11:45:59 -05:00
cahrens
09d90b16af Clean up of modulestore references (primarly LMS).
STUD-1151
2014-02-11 14:29:22 -05:00
Carson Gee
8cbe263ca0 Rename of feature AUTH_USE_MIT_CERTIFICATES to AUTH_USE_CERTIFICATES across platform.
Caution! This is backwards incompatible
2014-02-04 10:50:48 -05:00
Julia Hansbrough
0b7594178b Moved reverification windows into common
Added verification sidebar, banner for major courseware sections, quality & test improvements
2014-01-31 22:08:08 +00:00
Carson Gee
ef8671ad7e Merge pull request #2263 from carsongee/cg/gitlog_course_not_found_exception
Correct exception raising bug for non global staff accessing missing course git logs
2014-01-22 12:25:58 -08:00
Carson Gee
7d86124586 Add additional logging for importing course from git 2014-01-22 14:22:06 -05:00
Carson Gee
3aecac7adb Correct exception raising bug for non global staff accessing missing course git logs 2014-01-22 14:03:06 -05:00
Don Mitchell
858e354a6d Moved roles.py to common student 2014-01-14 17:04:43 -05:00
Carson Gee
ab151f9e7b Several code enhancements to sysadmin dashboard
Improved testing (cleaning up afterwards, catching stdout)
Refactored import function to it's own file
Removed monkey patch to log capturing, but still needs work
Translation fixes
Removal of several gettext phrases
2014-01-10 09:31:53 -05:00