Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15709 from edx/release-mergeback-to-master

Browse Source 
Merge release back to master
This commit is contained in:
Calen Pennington
2017-08-01 13:45:08 -04:00
committed by GitHub
parent 903bb6ab3f 68df7b80e3
commit fb905e547b
16 changed files with 281 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openedx/features/course_experience/tests/views/test_course_home.py
View File

@@ -160,7 +160,7 @@ class TestCourseHomePage(CourseHomePageTestCase):
course_home_url(self.course)
# Fetch the view and verify the query counts
with self.assertNumQueries(40, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST):
with self.assertNumQueries(41, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST):
with check_mongo_calls(4):
url = course_home_url(self.course)
self.client.get(url)

2
openedx/features/course_experience/tests/views/test_course_updates.py
View File

@@ -127,7 +127,7 @@ class TestCourseUpdatesPage(SharedModuleStoreTestCase):
course_updates_url(self.course)
# Fetch the view and verify that the query counts haven't changed
with self.assertNumQueries(31, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST):
with self.assertNumQueries(32, table_blacklist=QUERY_COUNT_TABLE_BLACKLIST):
with check_mongo_calls(4):
url = course_updates_url(self.course)
self.client.get(url)

3
openedx/features/course_experience/views/course_sock.py
View File

@@ -6,9 +6,8 @@ from opaque_keys.edx.keys import CourseKey
from web_fragments.fragment import Fragment
from student.models import CourseEnrollment
from course_modes.models import CourseMode
from course_modes.models import CourseMode, get_cosmetic_verified_display_price
from courseware.date_summary import VerifiedUpgradeDeadlineDate
from courseware.views.views import get_cosmetic_verified_display_price
from openedx.core.djangoapps.plugin_api.views import EdxFragmentView