Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,562 Commits 1 Branch 0 Tags
6f1c05e28c94de0b084ebb2602bdcdf61961c3f1
Commit Graph

20160 Commits

Author SHA1 Message Date
Matt Hughes
0ad8753cd6 Add waffle for hiding bulk management in masters courses 2019-08-20 16:32:13 -04:00
Feanil Patel
73a146fbbe Revert "assertItemsEqual() moved to assertCountEqual()" 
This reverts commit 3d2617983b.

The change was not quite right because the method six provides needs to
have `self` be passed in as well.  See the docs here:
https://six.readthedocs.io/#unittest-assertions

Reverting for now and we can fix it in smaller chunks later.
 2019-08-20 15:31:20 -04:00
Diana Huang
c94ffcdc72 Remove the microsites djangoapp. 2019-08-20 12:31:51 -04:00
Awais Qureshi
3f3caba0da Merge pull request #21360 from edx/awais786/BOM-88 
BOM-88
 2019-08-20 20:51:32 +05:00
Feanil Patel
6e6c489f1f Merge pull request #21372 from edx/feanil/fix_cmp_issues 
Fix a few issues we run into when running tests in python 3.
 2019-08-20 11:28:23 -04:00
Feanil Patel
74904339dd Go from a courselocator to a unicode string. 
We don't need the ignore since courselocators sholud be
managing unicode already.
 2019-08-20 10:59:42 -04:00
arbisoft
44c798feb2 Fixing encode/decode issues for python3. 2019-08-20 14:10:37 +05:00
Dave St.Germain
3d2617983b assertItemsEqual() moved to assertCountEqual() 2019-08-19 17:00:17 -04:00
Dave St.Germain
c51db6c92d Must compare with bytes 2019-08-19 16:35:41 -04:00
Dave St.Germain
8e725c9eee Prevent comparison to None 2019-08-19 16:21:28 -04:00
Dave St.Germain
521cdbe309 Response content is bytes 2019-08-19 16:16:31 -04:00
Feanil Patel
5ea74e0282 Ensure that the course_id is unicode. 2019-08-19 15:28:37 -04:00
Dave St.Germain
eccfeef94b Convert from utf8 2019-08-19 15:13:37 -04:00
Dave St.Germain
9d8db8e4ca Convert to utf-8 before JSON decoding 2019-08-19 15:10:56 -04:00
Dave St.Germain
e64c61160e Iterating dictionaries 2019-08-19 14:54:03 -04:00
Nimisha Asthagiri
d564af8301 Fix for decode errors in bulk_email.tests.test_course_optout.py 2019-08-19 14:26:48 -04:00
David Ormsbee
95a4e9ba3c Fix BlockTransformer Py3 issues (#21376) 
Django's reverse can handle Unicode for arguments.
 2019-08-19 12:16:39 -04:00
Feanil Patel
68933ec089 Fix quality issues. 2019-08-19 11:51:30 -04:00
Nimisha Asthagiri
1951d2eab8 Fix byte encoding of Grades hashes 2019-08-19 11:42:36 -04:00
Feanil Patel
7a3230a260 Fix another discussions test. 2019-08-19 11:16:26 -04:00
Nimisha Asthagiri
38333624ac Fixes for test_retire_order.py 2019-08-19 11:06:00 -04:00
David Ormsbee
9a1385585f Convert response bytes to str before JSON parsing. (#21375) 
Convert response bytes to str before JSON parsing.
 2019-08-19 11:01:55 -04:00
Feanil Patel
65eebe63e7 Hash byte strings. 2019-08-19 11:00:22 -04:00
Dave St.Germain
3275388276 Merge branch 'feanil/fix_cmp_issues' of github.com:edx/edx-platform into feanil/fix_cmp_issues 2019-08-19 10:54:46 -04:00
Dave St.Germain
0267b5c85f Fix issue of out of order calls 2019-08-19 10:54:39 -04:00
Nimisha Asthagiri
b7019bddff CourseInfoTestCase fixes for "a bytes-like object is required, not 'str'" 2019-08-19 10:54:12 -04:00
Feanil Patel
1bfa575ada Update discussion api tests. 
json doesn't do any magic with byte strings in python 3.  In python 2 it
used to convert str objects to unicode automatically.
 2019-08-19 10:48:30 -04:00
Dave St.Germain
5febcce20c Fix python3 compatibility in SafeCookieData and elsewhere 2019-08-19 10:24:15 -04:00
Feanil Patel
269a57445d Fix a few issues we run into when running the discussion tests. 2019-08-19 10:14:29 -04:00
Ayub khan
ea0c6922fe BOM-87 
Fixed the test for py3.
 2019-08-19 18:52:19 +05:00
adeelehsan
1eda18a317 Merge pull request #21367 from edx/private_to_public_76a13fa 
Mergeback PR from private to public.
 2019-08-19 15:06:30 +05:00
adeelehsan
76a13fae73 Merge pull request #156 from edx/aehsan/prod-349/remove_google_api_key_from_github 
Removed google api key from github
 2019-08-19 14:32:26 +05:00
Feanil Patel
9925aaadb9 Be able to override this setting from yaml. 2019-08-16 15:09:13 -04:00
Ayub
658cd5c62e BOM-70 (#21327) 
* Update Financial Assistance logic

Use the zendesk proxy app instead of the unsupported zendesk library.

* Move to pre-fetching the group IDs.

Rather than making extra requests to zendesk to list all groups and find
a specific group ID. Just make a pre-filled list of group IDs for the
groups we care about.  When a group name is passed in, it is checked
against this list and the ticket is created in the correct group so the
right people can respond to it.
 2019-08-16 13:05:35 -04:00
Feanil Patel
f5f875401a Fix some of the common test collection issues. (#21340) 
* Remove old  performance tests that we haven't been running.

As far as I can tell, these tests to capture HAR files were created 5
years ago and not being run as a part of our suite?  They capture HAR
data that we do nothing with so even if they were running we should
remove them until we're ready to care about consuming this kind of
information.

* Update password test unicode string.
* Add ugettext translation helper function.
* Fix lambda syntax that is not valid in python 3.
* Fix ur raw strings which his not valid in python 3
* Use edx_six.get_gettext instead of ugettext.
* Fix a few other encoding issues.
* Don't use old form of sorted funciton.

This form which uses a 'cmp' method is not available in python 3.
 2019-08-16 11:31:36 -04:00
Diana Huang
5d7d3f7770 Merge pull request #21336 from edx/diana/remove-microsites 
Remove microsite djangoapp and configuration.
 2019-08-16 10:55:56 -04:00
Matt Hughes
c3a1a70d4f Correct discrepancy between grade data sources for gradebook 2019-08-16 10:02:46 -04:00
Diana Huang
bf7dad15e4 Remove microsite djangoapp except migrations and configuration. 2019-08-16 09:42:57 -04:00
Manjinder Singh
65b858e3e7 Merge pull request #21209 from edx/msingh/discussion_topic_validation2 
PROD-145: Added validation to discussion topic input in studio, testing 2
 2019-08-15 19:53:17 -04:00
jinder1s
e7fb13a74f Added validation to discussion topic input in studio 2019-08-15 16:13:37 -04:00
Feanil Patel
dd361bf938 Merge pull request #21337 from edx/feanil/fix_lms_test_collection 
Get LMS test collection working in python 3.
 2019-08-14 14:44:10 -04:00
Michael Roytman
ee17f8a3fc Merge pull request #21341 from edx/mroytman/EDUCATOR-4432-make-course-grade-filter-more-robust 
make course grade filter robust against missing minimum filter as wel…
 2019-08-14 14:14:21 -04:00
Zachary Hancock
96f99bc053 reset integration environment endpoint (#21319) 2019-08-14 13:19:45 -04:00
Chris Pappas
4829fd4fde ENT-2117 | Creating new endpoint for enterprise learner portal. Includes small refactor of programs_enrollment GET logic, sowe do not need to duplicate the logic (#21258) 
Adding new course_overview internal api

CourseOverview serializer work

Removing enterprise learner portal djangoapp from this repo

Removing ent learner portal url

Minor cleanups

Updating serializers again

typo

adding some tests and quality fixes

more quality fixes

Fixing test

Adding in an import i removed
 2019-08-14 11:27:12 -04:00
Michael Roytman
05a67400ac make course grade filter robust against missing minimum filter as well as 0 minimum filter 2019-08-14 10:19:21 -04:00
Feanil Patel
dc078bb5da Create a new SRT file for this test. 
Usingthe shared file with the other tests wolud sometimes cause this
test to fail.  Made this change to make it less flaky.
 2019-08-13 16:33:09 -04:00
Feanil Patel
9d7f0ca46e Get LMS test collection working in python 3. 
This should be all the changes needed to get test collection working in
python 3 for the `lms` folder.
 2019-08-13 16:32:40 -04:00
Michael Roytman
df634ab7e3 add course level min and max filters to gradebook API 2019-08-13 15:32:12 -04:00
Matt Hughes
828c2fdc93 Add limit stops for assignment grade filtering for gradebook api 
JIRA:EDUCATOR-4541
 2019-08-13 15:05:03 -04:00
Jansen Kantor
ecb65a4fff Jkantor/link program enrollments (#21330) 
* add management command to link program enrollments to users
 2019-08-13 13:37:11 -04:00