Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

58450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Holt
5cc8da127a REV-935 mobile upsell and tests (#21687) 
Positive test case and improvements including: requires course id to be correctly encoded in the url params, only checks entitlements of the course in question, better source for the basket url, check enrollment upgrade deadline
 2019-09-19 14:59:07 -04:00
Feanil Patel
9740e2e077 BOM-618 Don't decode string objects. 2019-09-19 14:14:23 -04:00
Feanil Patel
24c0974f78 BOM-619 Fix csv encoding/decoding in management command test. 2019-09-19 14:14:22 -04:00
Jeremy Bowman
ae2c3b8edf Fix mocks of open() - BOM-597 2019-09-19 13:53:37 -04:00
Jansen Kantor
b0f40a111c add requesting_user to simple-history model (#21683) 2019-09-19 13:43:35 -04:00
Nick
01ba7f6f20 Merge pull request #21696 from edx/ndalfonso/DISCO-1342-hide-fields 
DISCO-1342 hide fields
 2019-09-19 12:35:48 -04:00
Nicholas D'Alfonso
039b7aed29 DISCO-1342 hide fields 
hide course card image, course about page image, and course
display name when publisher flag is turned on
 2019-09-19 11:56:00 -04:00
Jeremy Bowman
fc57bf9763 Use bytes with GridFS when not specifying an encoding - BOM-157 2019-09-19 11:17:01 -04:00
Feanil Patel
cbf35593ac BOM-618 Decode to utf-8 before loading as json in tests. 2019-09-19 11:15:11 -04:00
Feanil Patel
3a83760909 Run make upgrade 2019-09-19 11:15:11 -04:00
Awais Qureshi
112a0c7af6 Merge pull request #21694 from edx/awais786/BOM-437 
BOM-437
 2019-09-19 20:03:38 +05:00
Matt Hughes
09d5c87647 Fix bug with override removal conditions 
This was failing to delete overrides stemming from proctoring which
pre-date the corresponding change.

JIRA:PROD-704
 2019-09-19 10:44:18 -04:00
Jeremy Bowman
91c87fd65b Fixed last lms/djangoapps/discussion test failures - BOM-680 2019-09-19 10:38:49 -04:00
Ned Batchelder
a8a88c534a make upgrade 2019-09-19 10:34:20 -04:00
Ned Batchelder
a2b2431944 make upgrade 2019-09-19 10:33:37 -04:00
Jeremy Bowman
23870802c6 Replace usage of UUID.get_hex() - BOM-672 2019-09-19 10:32:23 -04:00
Jeremy Bowman
1b6e6634cb Fix edxnotes stub tests BOM-633 2019-09-19 10:32:23 -04:00
Ned Batchelder
835a84f33c Use bytestrings to create SimpleUploadedFiles. BOM-616 2019-09-19 10:32:23 -04:00
Feanil Patel
f259a911c7 BOM-618 Decode content we get from test requests. 2019-09-19 10:32:23 -04:00
Feanil Patel
dab38a5ef3 Merge pull request #21701 from edx/python3-swarm 
Python3 swarm
 2019-09-19 10:23:04 -04:00
Feanil Patel
8ae1f7ba1d Merge pull request #21705 from edx/jenkins/upgrade-python-requirements-5801f00 
Python Requirements Update
 2019-09-19 10:04:09 -04:00
Michael Terry
3dcc2bdcfe Merge pull request #21700 from edx/mikix/delay-msg 
Add Studio note about mktg site delay
 2019-09-19 09:47:52 -04:00
Ayub khan
7d5f66853d BOM-647 
python3 compatibility
 2019-09-19 18:47:43 +05:00
Ayub khan
22916323a1 BOM-574 2019-09-19 18:18:49 +05:00
Ayub
70152513cf Merge pull request #21710 from edx/BOM-630 
BOM-630
 2019-09-19 18:04:27 +05:00
Ayub khan
28cb3c9a71 BOM-630 
python3 compatibility
 2019-09-19 17:19:04 +05:00
Ayub khan
d1b5c51be2 BOM-629 
python3 compatibility
 2019-09-19 17:03:22 +05:00
Ayub khan
00a1db4109 BOM-723 
python3 compatibility
 2019-09-19 15:51:20 +05:00
edX requirements bot
3dee5a5aac Updating Python Requirements 2019-09-19 06:48:26 -04:00
aarif
048d7740b5 python 3 fixes 2019-09-19 15:08:05 +05:00
Ayub khan
a075e44e72 BOM-273 
tests fixed
 2019-09-19 14:26:07 +05:00
Aarif
5801f00006 Merge pull request #21681 from edx/BOM-484 
BOM-484
 2019-09-19 14:11:33 +05:00
Ayub
edd8322ec2 Merge pull request #21693 from edx/BOM-432 
BOM-432
 2019-09-19 12:22:30 +05:00
Feanil Patel
bab6b87eb8 Fix pylint error. 2019-09-18 17:28:12 -04:00
Jeremy Bowman
10d9bb22b5 Fix oauth_dispatch tests BOM-732 2019-09-18 17:02:38 -04:00
Jeremy Bowman
f08a2ed88d Fix text representation of VerifiedTrackCohortedCourse BOM-733 2019-09-18 16:55:00 -04:00
Ned Batchelder
71ce73d98e Merge pull request #21207 from edx/nedbat/api-docs 
REST API docs
 2019-09-18 16:42:10 -04:00
Jeremy Bowman
83eb9e7f1a Fix auth_exchange tests BOM-648 2019-09-18 16:37:52 -04:00
Michael Terry
1f024c406b Add Studio note about mktg site delay 
Add a note when marketing site is enabled that there is a delay
from changes in Studio appearing on the marketing site.

DISCO-1356
 2019-09-18 16:31:36 -04:00
Feanil Patel
93142ebd2d Update the ssencrypt logic for python3. 
We updated the underlying methods to always be passing unicode strings
aronud and only encode them to bytes when we need to hash them.
 2019-09-18 16:28:11 -04:00
Feanil Patel
3427c1abf3 BOM-618 Pass unicode to json.loads 2019-09-18 16:28:11 -04:00
Ned Batchelder
6408f96e18 Use explicit values in test assertions. BOM-683 
Python 3 changed how rounding is performed. In Python 2, .625 rounded to
.63 (as our grading code rounds it, so the test passed).  In Python 3,
.625 rounds to .62.  This fixes the test by avoiding round() to
calculate the expected value, and instead simply using the value we
expect.
 2019-09-18 16:13:40 -04:00
Feanil Patel
90838d27aa BOM-618 update dependency to fix test mixins. 2019-09-18 15:14:07 -04:00
Feanil Patel
de0eafa0ba BOM-618 Decode test client content. 
The django test client returns bytes, and many of our tests start using
it like a string. This was fine in python 2 but not in python3.
 2019-09-18 14:58:30 -04:00
Ned Batchelder
456ab68986 Check for ascii with an explicit ascii encode. BOM-728 2019-09-18 14:49:03 -04:00
Ned Batchelder
1c6ed4026e Test JSON data without relying on arbitrary ordering. BOM-734 2019-09-18 14:34:16 -04:00
Jeremy Bowman
07ab555d05 Fix most common/djangoapps/util tests 2019-09-18 14:26:41 -04:00
Alex Dusenbery
44c96b4e9b Minor correction of grade freeze ADR. 2019-09-18 14:24:40 -04:00
Ned Batchelder
7281fed719 Test JSON data without relying on arbitrary ordering. BOM-735 2019-09-18 14:24:37 -04:00
Feanil Patel
cb64fed1af BOM-489 Studio tests with byte/str mismatch. 2019-09-18 14:21:16 -04:00