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

Fix Certificates import and signals code

Browse Source
This commit is contained in:
Nimisha Asthagiri
2018-01-15 12:09:47 -05:00
parent dfdf1a4ad3
commit 2e9efe6472
69 changed files with 175 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/djangoapps/entitlements/models.py
View File

@@ -7,7 +7,7 @@ from django.contrib.sites.models import Site
from django.db import models
from django.utils.timezone import now
from certificates.models import GeneratedCertificate
from lms.djangoapps.certificates.models import GeneratedCertificate
from model_utils.models import TimeStampedModel
from openedx.core.djangoapps.content.course_overviews.models import CourseOverview

2
common/djangoapps/entitlements/tests/test_models.py
View File

@@ -7,7 +7,7 @@ from django.conf import settings
from django.test import TestCase
from django.utils.timezone import now
from certificates.models import CertificateStatuses # pylint: disable=import-error
from lms.djangoapps.certificates.models import CertificateStatuses # pylint: disable=import-error
from lms.djangoapps.certificates.api import MODES
from lms.djangoapps.certificates.tests.factories import GeneratedCertificateFactory
from openedx.core.djangoapps.content.course_overviews.tests.factories import CourseOverviewFactory

2
common/djangoapps/pipeline_mako/templates/static_content.html
View File

@@ -19,7 +19,7 @@ from openedx.core.djangoapps.theming.helpers import (
get_template_path,
is_request_in_themed_site,
)
from certificates.api import get_asset_url_by_slug
from lms.djangoapps.certificates.api import get_asset_url_by_slug
from webpack_loader.templatetags.webpack_loader import render_bundle
logger = logging.getLogger(__name__)
%>

2
common/djangoapps/student/models.py
View File

@@ -50,7 +50,7 @@ import dogstats_wrapper as dog_stats_api
import lms.lib.comment_client as cc
import request_cache
from student.signals import UNENROLL_DONE, ENROLL_STATUS_CHANGE, ENROLLMENT_TRACK_UPDATED
from certificates.models import GeneratedCertificate
from lms.djangoapps.certificates.models import GeneratedCertificate
from course_modes.models import CourseMode
from courseware.models import (
CourseDynamicUpgradeDeadlineConfiguration,

6
common/djangoapps/student/tests/test_certificates.py
View File

@@ -11,9 +11,9 @@ from django.test.utils import override_settings
from mock import patch
from pytz import UTC
from certificates.api import get_certificate_url # pylint: disable=import-error
from certificates.models import CertificateStatuses # pylint: disable=import-error
from certificates.tests.factories import GeneratedCertificateFactory # pylint: disable=import-error
from lms.djangoapps.certificates.api import get_certificate_url # pylint: disable=import-error
from lms.djangoapps.certificates.models import CertificateStatuses # pylint: disable=import-error
from lms.djangoapps.certificates.tests.factories import GeneratedCertificateFactory # pylint: disable=import-error
from course_modes.models import CourseMode
from student.models import LinkedInAddToProfileConfiguration
from student.tests.factories import CourseEnrollmentFactory, UserFactory

4
common/djangoapps/student/tests/test_refunds.py
View File

@@ -16,8 +16,8 @@ from django.test.client import Client
from django.test.utils import override_settings
from mock import patch
from certificates.models import CertificateStatuses, GeneratedCertificate
from certificates.tests.factories import GeneratedCertificateFactory
from lms.djangoapps.certificates.models import CertificateStatuses, GeneratedCertificate
from lms.djangoapps.certificates.tests.factories import GeneratedCertificateFactory
# These imports refer to lms djangoapps.
# Their testcases are only run under lms.
from course_modes.tests.factories import CourseModeFactory

5
common/djangoapps/student/tests/test_views.py
View File

@@ -121,7 +121,10 @@ class TestStudentDashboardUnenrollments(SharedModuleStoreTestCase):
def test_cant_unenroll_status(self):
""" Assert that the dashboard loads when cert_status does not allow for unenrollment"""
with patch('certificates.models.certificate_status_for_student', return_value={'status': 'downloadable'}):
with patch(
'lms.djangoapps.certificates.models.certificate_status_for_student',
return_value={'status': 'downloadable'},
):
response = self.client.get(reverse('dashboard'))
self.assertEqual(response.status_code, 200)

4
common/djangoapps/student/tests/tests.py
View File

@@ -25,8 +25,8 @@ from six import text_type
import shoppingcart # pylint: disable=import-error
from bulk_email.models import Optout # pylint: disable=import-error
from certificates.models import CertificateStatuses # pylint: disable=import-error
from certificates.tests.factories import GeneratedCertificateFactory # pylint: disable=import-error
from lms.djangoapps.certificates.models import CertificateStatuses # pylint: disable=import-error
from lms.djangoapps.certificates.tests.factories import GeneratedCertificateFactory # pylint: disable=import-error
from course_modes.models import CourseMode
from course_modes.tests.factories import CourseModeFactory
from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification

4
common/djangoapps/student/views.py
View File

@@ -56,8 +56,8 @@ import third_party_auth
from third_party_auth.saml import SAP_SUCCESSFACTORS_SAML_KEY
import track.views
from bulk_email.models import BulkEmailFlag, Optout # pylint: disable=import-error
from certificates.api import get_certificate_url, has_html_certificates_enabled # pylint: disable=import-error
from certificates.models import ( # pylint: disable=import-error
from lms.djangoapps.certificates.api import get_certificate_url, has_html_certificates_enabled # pylint: disable=import-error
from lms.djangoapps.certificates.models import ( # pylint: disable=import-error
CertificateStatuses,
GeneratedCertificate,
certificate_status_for_student