Commit 2fd9ccec by Will Daly

Fixed whitespace issues; removed a test that made no assertions

parent 437aadb2
...@@ -30,8 +30,6 @@ class ProgessTests(TestCase): ...@@ -30,8 +30,6 @@ class ProgessTests(TestCase):
'questions_incorrect': 1, 'questions_incorrect': 1,
'questions_total': 0}) 'questions_total': 0})
self.oth = dict({'duration_total': 0, self.oth = dict({'duration_total': 0,
'duration_watched': 0, 'duration_watched': 0,
'done': True, 'done': True,
...@@ -48,6 +46,7 @@ class ProgessTests(TestCase): ...@@ -48,6 +46,7 @@ class ProgessTests(TestCase):
'questions_correct': 4, 'questions_correct': 4,
'questions_incorrect': 0, 'questions_incorrect': 0,
'questions_total': 7} 'questions_total': 7}
def test_getitem(self): def test_getitem(self):
self.assertEqual(self.c.__getitem__('duration_watched'), 0) self.assertEqual(self.c.__getitem__('duration_watched'), 0)
......
...@@ -84,22 +84,12 @@ class ViewsTestCase(TestCase): ...@@ -84,22 +84,12 @@ class ViewsTestCase(TestCase):
chapter = 'Overview' chapter = 'Overview'
self.chapter_url = '%s/%s/%s' % ('/courses', self.course_id, chapter) self.chapter_url = '%s/%s/%s' % ('/courses', self.course_id, chapter)
def test_user_groups(self): def test_user_groups(self):
# depreciated function # depreciated function
mock_user = MagicMock() mock_user = MagicMock()
mock_user.is_authenticated.return_value = False mock_user.is_authenticated.return_value = False
self.assertEquals(views.user_groups(mock_user),[]) self.assertEquals(views.user_groups(mock_user),[])
@override_settings(DEBUG = True)
def test_user_groups_debug(self):
mock_user = MagicMock()
mock_user.is_authenticated.return_value = True
pass
#views.user_groups(mock_user)
#Keep going later
def test_get_current_child(self): def test_get_current_child(self):
self.assertIsNone(views.get_current_child(Stub())) self.assertIsNone(views.get_current_child(Stub()))
mock_xmodule = MagicMock() mock_xmodule = MagicMock()
...@@ -119,7 +109,6 @@ class ViewsTestCase(TestCase): ...@@ -119,7 +109,6 @@ class ViewsTestCase(TestCase):
self.assertRaises(Http404, views.redirect_to_course_position, self.assertRaises(Http404, views.redirect_to_course_position,
mock_module, True) mock_module, True)
def test_registered_for_course(self): def test_registered_for_course(self):
self.assertFalse(views.registered_for_course('Basketweaving', None)) self.assertFalse(views.registered_for_course('Basketweaving', None))
mock_user = MagicMock() mock_user = MagicMock()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment