Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
singingwolfboy committed Dec 6, 2016
1 parent bba7fff commit 96a5015
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cms/serializers_test.py
Expand Up @@ -52,7 +52,7 @@ def test_program_page_serializer(self):
"""
Test program page serializer
"""
program = ProgramFactory.create(title="Supply Chain Management")
program = ProgramFactory.create(title="Supply Chain Management", course=None)
course = CourseFactory.create(program=program, title="Learning How to Supply")
page = ProgramPageFactory.create(program=program, title=program.title)
faculty = FacultyFactory.create(
Expand Down
5 changes: 4 additions & 1 deletion courses/factories.py
Expand Up @@ -7,7 +7,8 @@
from factory import fuzzy
from factory.django import DjangoModelFactory

from .models import Program, Course, CourseRun
from courses.models import Program, Course, CourseRun
from ecommerce.models import CoursePrice

FAKE = faker.Factory.create()

Expand All @@ -25,6 +26,7 @@ class ProgramFactory(DjangoModelFactory):
def ecommerce(self, create, extracted, **kwargs): # pylint: disable=unused-argument
if not extracted:
return self
from ecommerce.factories import CoursePriceFactory
price = 0
course_runs = CourseRun.objects.filter(course__program=self)
for course_run in course_runs:
Expand All @@ -35,6 +37,7 @@ def ecommerce(self, create, extracted, **kwargs): # pylint: disable=unused-argu
)
price = course_price.price
if self.financial_aid_availability:
from financialaid.factories import TierProgramFactory
finaid_values = [
(0, 1000),
int(price / 10),
Expand Down
2 changes: 1 addition & 1 deletion courses/models_test.py
Expand Up @@ -45,7 +45,7 @@ class CourseModelTests(ESTestCase):
@classmethod
def setUpTestData(cls):
super(CourseModelTests, cls).setUpTestData()
cls.course = CourseFactory.create(title="Title")
cls.course = CourseFactory.create(title="Title", course_run=None)

def setUp(self):
super(CourseModelTests, self).setUp()
Expand Down
2 changes: 1 addition & 1 deletion dashboard/api_edx_cache_test.py
Expand Up @@ -43,7 +43,7 @@ def setUpTestData(cls):
cls.p1_course_run_keys = ['p1_course_run']
cls.p2_course_run_keys = ['p2_course_run_1', 'p2_course_run_2']
cls.p1_course_run = CourseRunFactory.create(edx_course_key=cls.p1_course_run_keys[0])
p2 = ProgramFactory.create(full=True)
p2 = ProgramFactory.create()
first_course = p2.course_set.first()
extra_course = CourseFactory.create(program=p2)
cls.p2_course_run_1 = CourseRunFactory.create(course=first_course, edx_course_key=cls.p2_course_run_keys[0])
Expand Down

0 comments on commit 96a5015

Please sign in to comment.