Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,001 Commits 1 Branch 0 Tags
05ab349c883256f68550d607ffe148bb3487dfd9
Commit Graph

7624 Commits

Author SHA1 Message Date
Michael Terry
8e832a3c6a Show Display Name advanced field again 
We had hidden it when using Publisher. But there are valid use
cases for editing it, so we're adding it back again.

DISCO-1390
 2019-10-18 10:40:49 -04:00
aarif
164141def9 replaced json.loads with a util to handle bytes 
changes made to fix jenkins/quality errors

changes made as suggested

added the docstring to fix quality issue

made a few changes to fix some tests

replaced json.loads with a util to handle bytes

changes made to fix jenkins/quality errors

changes made as suggested

added the docstring to fix quality issue

made a few changes to fix some tests

made changes as suggested

made changes as suggested

updated the requirements with make upgrade
 2019-10-16 12:14:01 +05:00
Aarif
6e7f2f61ef Merge pull request #21994 from edx/BOM-914 
Fixed all instances of "TypeError: a bytes-like object is required, not 'str" - BOM-914
 2019-10-16 01:44:31 +05:00
aarif
d176957708 Updated the tests to fix the string/bytes input 
changes made to pass tests with python 2 and other minor changes

Updated the tests to fix the string/bytes input

changes made to pass tests with python 2 and other minor changes

made some changes as suggested

made changes as suggested

changes made as suggested
 2019-10-14 18:47:18 +05:00
aarif
ea4557ff70 removed unnecesary transcript decode 2019-10-14 17:28:47 +05:00
Ayub
c3735cef01 Merge pull request #21874 from edx/BOM-804 
BOM-804
 2019-10-14 12:30:18 +05:00
Aarif
4bce520f29 Merge pull request #21919 from edx/BOM-819 
Updated the items order in response list comparison to work with both python versions - BOM-819
 2019-10-14 11:32:05 +05:00
Ayub khan
44b2414a5d BOM-804 
python3 compatibility
we only need to decode if the xml is bytes
 2019-10-11 13:53:54 +05:00
Ayub
313183f3aa Merge pull request #21986 from edx/BOM-821_BOM-822 
BOM-821_BOM-822 fixed webob issue
 2019-10-11 13:05:59 +05:00
Ayub
e289326172 Merge pull request #21991 from edx/BOM-905 
BOM-905 test_graders.py tests fixed
 2019-10-11 13:02:16 +05:00
Feanil Patel
7fba045ce6 Merge branch 'master' into feanil/fix_xmodule_video_tests 2019-10-10 11:00:54 -04:00
Awais Qureshi
4470a1b487 BOM-910 
There was in issue coming in order of error msg.
fixing bytes issue also.
 2019-10-10 15:01:18 +05:00
Ayub khan
3a760435bc BOM-905 test_graders.py tests fixed 
py3 shows missing argument istead of showing number
 2019-10-10 14:49:27 +05:00
Ayub khan
ba0cc9a87f BOM-821_BOM-822 fixed webob issue 
python2 webob request.post object is equal to webob MultiDict(request.post)
but in python3 its not so updated test cases.
 2019-10-10 12:09:19 +05:00
Feanil Patel
5ef86e2c3c Fix video module tests related to transcript conversion. 2019-10-09 09:51:02 -04:00
Awais Qureshi
eee826ca4b BOM-814 
String comparsion within in raw html were causing tests failures in python3.
The function parses the string and converts into dictionary.
 2019-10-09 15:43:18 +05:00
Ayub
ea8a10e9d8 Merge pull request #21953 from edx/BOM-808 
BOM-808 struct is not defined
 2019-10-09 15:02:18 +05:00
Ayub khan
d1eb51bd71 BOM-808 struct is not defined 
python3 list comprehension variables are not accessible after comprehension
 2019-10-09 12:53:12 +05:00
aarif
8e816fc874 Updated the list comparison to work irrespective of order of items 
Updated the dictionary iteration to make it work with both python versions

Updated the order of expected items for list comparison
 2019-10-09 12:28:48 +05:00
Aarif
4c9aa43c2f Merge pull request #21924 from edx/BOM-813 
Updated the comparison operation to fix None comparison with an integer - BOM-813
 2019-10-09 12:07:13 +05:00
Feanil Patel
92e06d52a6 Delete items by their asset_key instead of _id. 
The _id comes back as a dict and it's in the wrong order compared to the
dict stored in mongo.  This results in lookups for deletion failing when
we use the '_id' as the lookup key.

Luckily the delete function also takes the asset_key as a valid key to
delete by so we just use that instead.
 2019-10-08 15:26:52 -04:00
Feanil Patel
9610aab0f8 Fix more cms contentstore tests. 2019-10-08 15:26:52 -04:00
Feanil Patel
5a9a5ba918 Catch another place where we were passing in byte data into transcript conversion module. 2019-10-07 13:49:25 -04:00
Feanil Patel
66382961a7 Fix all transcript related tests. 
Treat transcript content as unicode strings and convert them at any edge
where we encounter them.  One decision made here was to not update
edx-val it treats transcripts as byte but is much closer to the actual
files so it makes more sense over there. But within the platform they
are generally passed around as serialized json and so it's much better
for them to be unicode.
 2019-10-07 13:49:25 -04:00
aarif
af20d0f7d2 Updated the comparison operation to fix None comparison with integer 2019-10-03 15:52:52 +05:00
aarif
c7a05ecf77 Updated the comparison operation to properly calculate mongo connection version 
minor changes made to fix quality issues

changes made as suggested

removed unused import statement
 2019-10-02 13:41:19 +05:00
Ayub khan
c29b7520a1 BOM-850 
python3 compatibility
 2019-10-01 10:56:00 +05:00
Ayub
58b43cafd0 Merge pull request #21850 from edx/BOM-806 
BOM-806
 2019-10-01 10:38:53 +05:00
Ayub
c02678a2d0 Merge pull request #21851 from edx/BOM-812 
BOM-812
 2019-10-01 10:37:48 +05:00
Ayub
ac3718055a Merge pull request #21855 from edx/BOM-842 
BOM-842
 2019-10-01 10:37:15 +05:00
Ayub
42b6aa977c Merge pull request #21857 from edx/BOM-807 
BOM-807
 2019-10-01 10:36:39 +05:00
Ayub
cb926b65af Merge pull request #21858 from edx/BOM-823 
BOM-823
 2019-10-01 10:35:49 +05:00
Ayub khan
9dc5866464 BOM-823 
python3 compatibility
 2019-09-30 16:12:32 +05:00
Ayub khan
3ae2e44af4 BOM-807 
python3 compatibility
 2019-09-30 16:04:00 +05:00
Ayub khan
73a453d3c2 BOM-842 2019-09-30 15:59:36 +05:00
Ayub khan
b83d6adb5a BOM-812 
python3 compatibility
 2019-09-30 15:20:20 +05:00
Ayub khan
c56de3d37d BOM-806 
python3 compatibility
 2019-09-30 15:11:07 +05:00
Aarif
e7dadeb26c Merge pull request #21818 from edx/BOM-748 
BOM-748
 2019-09-30 13:00:43 +05:00
Feanil Patel
b26d1050a5 Merge pull request #21825 from edx/feanil/fix_error_validation 
Explicitly set the test string to unicode.
 2019-09-27 15:55:01 -04:00
Feanil Patel
07df64eb8c Fix the rest of these. 2019-09-27 14:36:40 -04:00
Feanil Patel
16cce5f389 BOM-843 Fix reraise call. 2019-09-27 14:19:40 -04:00
Feanil Patel
a4447da5e0 Explicitly set the test string to unicode. 2019-09-27 14:06:49 -04:00
aarif
4e0ca7c381 python 3 fixes 2019-09-27 18:43:46 +05:00
Feanil Patel
a847620e88 Merge pull request #21797 from edx/feanil/fix_xmodule_format_failure 
Division changed in python3 to produce floats even when you divide tw…
 2019-09-26 15:49:25 -04:00
Ned Batchelder
b3845b2b96 Merge pull request #21581 from edx/nedbat/fix-courseware-warning 
Finally import courseware properly everywhere to get rid of a warning
 2019-09-26 14:25:27 -04:00
Jeremy Bowman
4babc5ee1c Fix CorruptGridFile in Python 3 tests BOM-375 (#21794) 2019-09-26 13:43:26 -04:00
Feanil Patel
093e5a543a Division changed in python3 to produce floats even when you divide two ints. 2019-09-26 13:23:15 -04:00
Dave St.Germain
26026782b0 Merge pull request #21538 from edx/dcs/component-tweaks 
Studio Component Editor Tweaks
 2019-09-26 10:05:23 -04:00
Ned Batchelder
efba6e45e8 Finally import courseware properly everywhere to get rid of a warning 2019-09-26 09:40:15 -04:00
Dave St.Germain
ea3232feac TNL-6920 Component Editor Efficiency Improvements 
* Enlarges component modal for easier editing
* Allows display name to be edited in place
* Improves markdown button labeling
* Moves markdown cheatsheet to the edit modal, for quick reference
 2019-09-26 09:34:14 -04:00