diff --git a/jardin.py b/jardin.py index 3e314a4..93d6a34 100755 --- a/jardin.py +++ b/jardin.py @@ -66,8 +66,8 @@ def main(email, password, directory): login_with_password(browser, email, password) click_go_to_your_garden(browser) garden_filenames = get_garden_filenames(browser) - get_local_filenames(directory) - # Get list of files in target upload directory that don't exist in File Garden (test based on filename? size? file contents?) + local_filenames = get_local_filenames(directory) + get_missing_filenames(local_filenames, garden_filenames) # For each file in the second list, go through the file upload process #browser.close() diff --git a/test_jardin.py b/test_jardin.py index 2ae58ce..2dcbd2e 100755 --- a/test_jardin.py +++ b/test_jardin.py @@ -139,7 +139,9 @@ class TestJardin(unittest.TestCase): @patch("jardin.click_go_to_your_garden") @patch("jardin.get_garden_filenames") @patch("jardin.get_local_filenames") + @patch("jardin.get_missing_filenames") def test_main_calls_methods_in_correct_order(self, + mockGetMissingFilenames, mockGetLocalFilenames, mockGetGardenFilenames, mockClickGoToYourGarden, @@ -158,6 +160,7 @@ class TestJardin(unittest.TestCase): mockClickGoToYourGarden.assert_called_once_with(mockInitializeWebdriver.return_value) mockGetGardenFilenames.assert_called_once_with(mockInitializeWebdriver.return_value) mockGetLocalFilenames.assert_called_once_with(mockDirectory) + mockGetMissingFilenames.assert_called_once_with(mockGetLocalFilenames.return_value, mockGetGardenFilenames.return_value) #mockInitializeWebdriver.return_value.close.assert_called_once()