Commit 1778c1fc by Ben Patterson Committed by Brian Jacobel

Fix paver tests for watcher.

parent 6e5769f2
...@@ -167,17 +167,19 @@ class TestPaverWatchAssetTasks(TestCase): ...@@ -167,17 +167,19 @@ class TestPaverWatchAssetTasks(TestCase):
""" """
with patch('pavelib.assets.SassWatcher.register') as mock_register: with patch('pavelib.assets.SassWatcher.register') as mock_register:
with patch('pavelib.assets.PollingObserver.start'): with patch('pavelib.assets.PollingObserver.start'):
call_task( with patch('pavelib.assets.execute_webpack_watch') as mock_webpack:
'pavelib.assets.watch_assets', call_task(
options={"background": True}, 'pavelib.assets.watch_assets',
) options={"background": True},
self.assertEqual(mock_register.call_count, 2) )
self.assertEqual(mock_register.call_count, 2)
self.assertEqual(mock_webpack.call_count, 1)
sass_watcher_args = mock_register.call_args_list[0][0] sass_watcher_args = mock_register.call_args_list[0][0]
self.assertIsInstance(sass_watcher_args[0], PollingObserver) self.assertIsInstance(sass_watcher_args[0], PollingObserver)
self.assertIsInstance(sass_watcher_args[1], list) self.assertIsInstance(sass_watcher_args[1], list)
self.assertItemsEqual(sass_watcher_args[1], self.expected_sass_directories) self.assertItemsEqual(sass_watcher_args[1], self.expected_sass_directories)
def test_watch_theme_assets(self): def test_watch_theme_assets(self):
""" """
...@@ -192,17 +194,19 @@ class TestPaverWatchAssetTasks(TestCase): ...@@ -192,17 +194,19 @@ class TestPaverWatchAssetTasks(TestCase):
with patch('pavelib.assets.SassWatcher.register') as mock_register: with patch('pavelib.assets.SassWatcher.register') as mock_register:
with patch('pavelib.assets.PollingObserver.start'): with patch('pavelib.assets.PollingObserver.start'):
call_task( with patch('pavelib.assets.execute_webpack_watch') as mock_webpack:
'pavelib.assets.watch_assets', call_task(
options={"background": True, "theme_dirs": [TEST_THEME.dirname()], 'pavelib.assets.watch_assets',
"themes": [TEST_THEME.basename()]}, options={"background": True, "theme_dirs": [TEST_THEME.dirname()],
) "themes": [TEST_THEME.basename()]},
self.assertEqual(mock_register.call_count, 2) )
self.assertEqual(mock_register.call_count, 2)
sass_watcher_args = mock_register.call_args_list[0][0] self.assertEqual(mock_webpack.call_count, 1)
self.assertIsInstance(sass_watcher_args[0], PollingObserver)
self.assertIsInstance(sass_watcher_args[1], list) sass_watcher_args = mock_register.call_args_list[0][0]
self.assertItemsEqual(sass_watcher_args[1], self.expected_sass_directories) self.assertIsInstance(sass_watcher_args[0], PollingObserver)
self.assertIsInstance(sass_watcher_args[1], list)
self.assertItemsEqual(sass_watcher_args[1], self.expected_sass_directories)
@ddt.ddt @ddt.ddt
......
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