Fix tests for other courses - create default discussion roles on demand if they don't exist

lms/djangoapps/django_comment_client/permissions.py

@@ -11,9 +11,9 @@ from util.cache import cache
 @receiver(post_save, sender=CourseEnrollment)
 def assign_default_role(sender, instance, **kwargs):
     if instance.user.is_staff:
-        role = Role.objects.get(course_id=instance.course_id, name="Moderator")
+        role = Role.objects.get_or_create(course_id=instance.course_id, name="Moderator")[0]
     else:
-        role = Role.objects.get(course_id=instance.course_id, name="Student")
+        role = Role.objects.get_or_create(course_id=instance.course_id, name="Student")[0]
 
     logging.info("assign_default_role: adding %s as %s" % (instance.user, role))
     instance.user.roles.add(role)

lms/templates/courseware/courseware.html

@@ -21,7 +21,7 @@
 
    <%static:js group='courseware'/>
 
-  <%include file="discussion/_js_dependencies.html" />
+  <%include file="../discussion/_js_dependencies.html" />
   <%include file="/mathjax_include.html" />
 
   <!-- TODO: http://docs.jquery.com/Plugins/Validation -->