From cbe72da11a029a97ede385bc4f0ceff10bf47d77 Mon Sep 17 00:00:00 2001 From: Yuri Bochkarev Date: Fri, 29 Jan 2016 21:58:40 +0300 Subject: [PATCH] Update tests --- coursera/test/test_parsing.py | 7 ++++--- coursera/test/test_utils.py | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/coursera/test/test_parsing.py b/coursera/test/test_parsing.py index c28f353..492aa8a 100644 --- a/coursera/test/test_parsing.py +++ b/coursera/test/test_parsing.py @@ -13,6 +13,7 @@ from six import iteritems from mock import patch, Mock, mock_open from coursera import coursera_dl +from coursera import api # JSon Handling @@ -116,7 +117,7 @@ def test_parse(get_old_style_video, filename, num_sections, num_lectures, assert sum(r for f, r in resources if f == "mp4") == num_videos -@patch('coursera.coursera_dl.get_page') +@patch('coursera.api.get_page') def test_get_on_demand_supplement_url_accumulates_assets(mocked): input = open( os.path.join(os.path.dirname(__file__), @@ -125,8 +126,8 @@ def test_get_on_demand_supplement_url_accumulates_assets(mocked): os.path.join(os.path.dirname(__file__), "fixtures", "json", "supplement-multiple-assets-output.json"))) mocked.return_value = input - output = coursera_dl.get_on_demand_supplement_url( - 'session', 'course_id', 'element_id') + course = api.CourseraOnDemand(session=None, course_json={'id': 0}) + output = course.extract_files_from_supplement('element_id') # This is the easiest way to convert nested tuples to lists output = json.loads(json.dumps(output)) diff --git a/coursera/test/test_utils.py b/coursera/test/test_utils.py index 8ea1cc2..cf73c81 100644 --- a/coursera/test/test_utils.py +++ b/coursera/test/test_utils.py @@ -16,6 +16,7 @@ import six from mock import Mock from coursera import utils from coursera import coursera_dl +from coursera import api @pytest.mark.parametrize( @@ -230,7 +231,8 @@ def test_extract_supplement_links(input, output): page_text = open(input_filename).read() expected_output = json.load(open(output_filename)) - output = utils.extract_supplement_links(page_text) + course = api.CourseraOnDemand(session=None, course_json={'id': 0}) + output = course._extract_supplement_links(page_text) # This is the easiest way to convert nested tuples to lists output = json.loads(json.dumps(output))