Adds one more test for Entitlement enrollment.

common/djangoapps/enrollment/tests/test_views.py

@@ -5,6 +5,7 @@ import datetime
 import itertools
 import json
 import unittest
+import uuid
 
 import ddt
 import httpretty
@@ -210,6 +211,21 @@ class EntitlementEnrollmentTest(EnrollmentTestMixin, ModuleStoreTestCase, APITes
         entitlement.refresh_from_db()
         self.assertIsNone(entitlement.enrollment_course_run)
 
+    def test_enroll_no_entitlement(self):
+        resp = self.assert_enrollment_status(
+            course_id=unicode(self.course.id),
+            course_uuid=str(uuid.uuid4()),
+            is_active=True,
+            mode=None,
+            max_mongo_calls=4,
+            expected_status=status.HTTP_400_BAD_REQUEST
+        )
+        data = json.loads(resp.content)
+        self.assertEqual(self.course.display_name_with_default, data['course_details']['course_name'])
+
+        # Verify that the enrollment was created correctly
+        self.assertFalse(CourseEnrollment.is_enrolled(self.user, self.course.id))
+
 
 @attr(shard=3)
 @override_settings(EDX_API_KEY="i am a key")

common/djangoapps/entitlements/models.py

@@ -223,7 +223,6 @@ class CourseEntitlement(TimeStampedModel):
             entitlement = cls.objects.get(
                 user=user,
                 course_uuid=course_uuid,
-                expired_at=None,
             )
             return entitlement
         except cls.DoesNotExist: