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

8948 Commits

Author SHA1 Message Date
Jeremy Bowman
d4b0968e3a Fix JSON parsing in edxnotes.helpers BOM-990 (#22122) 2019-10-22 17:57:01 -04:00
Feanil Patel
9946fd3918 Merge pull request #22099 from edx/revert-22058-julianajlk/REV-980/first-purchase-discount-courseware 
Revert "add first purchase discount to courseware (#22058)"
 2019-10-22 09:39:08 -04:00
Manjinder Singh
936e1d48a3 BOM-928: Fixing test error due to dict ordering (#22055) 
* Fixing test error due to dict ordering

* Dict ordering fixes

* replacing dict with list to maintain consistency

* better html parsing
 2019-10-22 09:30:24 -04:00
julianajlk
98f907f23c Revert "add first purchase discount to courseware (#22058)" 
This reverts commit 059b619794.
 2019-10-21 13:57:18 -04:00
julianajlk
059b619794 add first purchase discount to courseware (#22058) 
REV-980.
* moved get_first_purchase_offer_banner_fragment to Discounts utils.py
* added banner wrapper method
* updated banner with time limit
 2019-10-21 13:56:38 -04:00
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
6304aa5b9b Merge pull request #22030 from edx/BOM-922 
Fixed - " AttributeError: 'str' object has no attribute 'decode' " - BOM-922
 2019-10-15 16:21:25 +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
Ayub
8aa2fad4ec Merge pull request #21988 from edx/BOM-898 
BOM fix remaining capa module issues
 2019-10-14 17:33:27 +05:00
aarif
ea4557ff70 removed unnecesary transcript decode 2019-10-14 17:28:47 +05:00
Ayub
dbc27fd57d Merge pull request #21921 from edx/BOM-805 
BOM-805
 2019-10-14 16:42:26 +05:00
Ayub khan
8717510d35 BOM-805 
python3 compatibility: Before comparison with unicode decode text if its type is bytes.
 2019-10-14 15:15:28 +05:00
Ayub khan
e9c4c22e6a BOM fixed remaining capa module issues 
BOM-898 fix test_responsetypes.py issues
Updated safe_exec to use random2 library instead of random.
As python3 random generates different results as compared to
python2, which causes a lot of test failures and if we use
python3 random and fix tests it will cause state invalidation
of capa problems, So random2 was uses to make the behaviour same
in python3.

BOM-899 name xrange is not defined
xrange is used in safe_exec and there might be old courses where
this is being used in capa problems. All those tests fail in python3
as this was renamed to range. Used six.moves.xrange so that code
works for python3 and if there is any old code using xrange it
works too.
 2019-10-14 13:29:12 +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
Awais Qureshi
19342524d5 Merge pull request #21963 from edx/awais786/BOM-799 
BOM-799
 2019-10-10 12:36:09 +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
Awais Qureshi
a231876493 BOM-799 
\\n\\n was coming inside the html. Clean it.
 2019-10-09 11:45:14 +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
Ayub
7537283048 Merge pull request #21935 from edx/BOM-capa-random-python3-combatibility 
BOM Project Capa Module Python3 Compatibility
 2019-10-08 11:11:02 +05:00
Feanil Patel
847758a7da Merge pull request #21938 from edx/feanil/fix_contentstore_tests 
Feanil/fix contentstore views tests
 2019-10-07 16:21:42 -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
Jeremy Bowman
71e9c85dca Fix capa problem i18n BOM-775 (#21832) 2019-10-07 11:19:49 -04:00
Ayub khan
bb242c4b22 BOM Project Capa Module Python3 Compatibility 
Python3 RNG produces different results as compared to python2
In capa problems we save seed value and generate random state
using the seed. Python3 random generates a different state as
compared to python2. Thats why using random2 library to make
state genration consistent in both python versions.
 2019-10-07 16:39:47 +05:00
Aarif
9a8f0cee1d Merge pull request #21894 from edx/BOM-802 
Updated the comparison operation to calculate MongoDB's connection version - BOM-802
 2019-10-07 12:22:30 +05:00
aarif
af20d0f7d2 Updated the comparison operation to fix None comparison with integer 2019-10-03 15:52:52 +05:00
Ayub khan
277afeb85e BOM-788 
python3 compatibility: etree returns a bytes type string so in py3 we need to decode it
to compare with a unicode string
 2019-10-03 15:26:36 +05:00
Feanil Patel
cf989502a1 Merge pull request #21830 from edx/jmbowman/BOM-774 
Fix deprecated drag and drop grading BOM-774
 2019-10-02 10:58:10 -04: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
27aa7e4abf Merge pull request #21806 from edx/BOM-609 
BOM-609
 2019-10-01 12:10:38 +05:00
Ayub khan
b5dc95a30d BOM-609 
python3 compatibility
 2019-10-01 11:33:37 +05:00
Ayub khan
c29b7520a1 BOM-850 
python3 compatibility
 2019-10-01 10:56:00 +05:00
Ayub
2de3667c85 Merge pull request #21804 from edx/BOM-613 
BOM-613
 2019-10-01 10:41:31 +05:00
Ayub
58b43cafd0 Merge pull request #21850 from edx/BOM-806 
BOM-806
 2019-10-01 10:38:53 +05:00