fix tests

lean/commands/cloud/pull.py

@@ -81,4 +81,4 @@ def pull(project: Optional[str], pull_bootcamp: bool, encrypt: Optional[bool], d
         raise RuntimeError(f"Cannot encrypt or decrypt more than one project at a time.")
 
     pull_manager = container.pull_manager
-    pull_manager.pull_projects(projects_to_pull, encryption_action, key, all_projects)
+    pull_manager.pull_projects(projects_to_pull, all_projects, encryption_action, key)

lean/components/cloud/pull_manager.py

@@ -95,8 +95,7 @@ def _get_libraries(self, project: QCProject,
 
         return libraries, inaccessible_libraries
 
-    def pull_projects(self, projects_to_pull: List[QCProject], encryption_action: Optional[ActionType], encryption_key: Optional[Path],
-                      all_cloud_projects: Optional[List[QCProject]] = None) -> None:
+    def pull_projects(self, projects_to_pull: List[QCProject], all_cloud_projects: Optional[List[QCProject]] = None, encryption_action: Optional[ActionType]=None, encryption_key: Optional[Path]=None) -> None:
         """Pulls the given projects from the cloud to the local drive.
 
         This will also pull libraries referenced by the project.

lean/components/cloud/push_manager.py

@@ -48,7 +48,7 @@ def __init__(self,
         self._organization_manager = organization_manager
         self._cloud_projects = []
 
-    def push_project(self, project: Path, encryption_action: Optional[ActionType], encryption_key: Optional[Path]) -> None:
+    def push_project(self, project: Path, encryption_action: Optional[ActionType]=None, encryption_key: Optional[Path]=None) -> None:
         """Pushes the given project from the local drive to the cloud.
 
         It will also push every library referenced by the project and add or remove references.
@@ -58,7 +58,7 @@ def push_project(self, project: Path, encryption_action: Optional[ActionType], e
         libraries = self._project_manager.get_project_libraries(project)
         self.push_projects(libraries + [project], encryption_action, encryption_key)
 
-    def push_projects(self, projects_to_push: List[Path], encryption_action: Optional[ActionType], encryption_key: Optional[Path]) -> None:
+    def push_projects(self, projects_to_push: List[Path], encryption_action: Optional[ActionType]=None, encryption_key: Optional[Path]=None) -> None:
         """Pushes the given projects from the local drive to the cloud.
 
         It will also push every library referenced by each project and add or remove references.
@@ -167,10 +167,10 @@ def _get_files(self, project: Path, encryption_action: Optional[ActionType], enc
         if (encryption_key):
             organization_id = self._organization_manager.try_get_working_organization_id()
             if encryption_action == ActionType.ENCRYPT:
-                data = get_encrypted_file_content_for_project(project, paths, 
+                data = get_encrypted_file_content_for_project(project, paths,
                         encryption_key, self._project_config_manager, organization_id)
             else:
-                data = get_decrypted_file_content_for_project(project, 
+                data = get_decrypted_file_content_for_project(project,
                         paths, encryption_key, self._project_config_manager, organization_id)
             files = [
             {

tests/commands/cloud/test_pull.py

@@ -52,7 +52,7 @@ def test_cloud_pull_pulls_all_non_bootcamp_projects_when_no_options_given() -> N
 
     assert result.exit_code == 0
 
-    pull_manager.pull_projects.assert_called_once_with(cloud_projects[:3], None, None, cloud_projects)
+    pull_manager.pull_projects.assert_called_once_with(cloud_projects[:3], cloud_projects, None, None)
 
 
 def test_cloud_pull_pulls_all_projects_when_pull_bootcamp_option_given() -> None:
@@ -75,7 +75,7 @@ def test_cloud_pull_pulls_all_projects_when_pull_bootcamp_option_given() -> None
 
     assert result.exit_code == 0
 
-    pull_manager.pull_projects.assert_called_once_with(cloud_projects, None, None, cloud_projects)
+    pull_manager.pull_projects.assert_called_once_with(cloud_projects, cloud_projects, None, None)
 
 
 def test_cloud_pull_pulls_project_by_id() -> None:
@@ -122,7 +122,7 @@ def test_cloud_pull_pulls_project_by_name() -> None:
 
     assert result.exit_code == 0
 
-    pull_manager.pull_projects.assert_called_once_with([cloud_projects[0]], None, None, cloud_projects)
+    pull_manager.pull_projects.assert_called_once_with([cloud_projects[0]], cloud_projects, None, None)
 
 
 def test_cloud_pull_aborts_when_project_input_matches_no_cloud_projects() -> None:

tests/components/util/test_pull_manager.py

@@ -32,7 +32,9 @@ def _create_pull_manager(api_client: mock.Mock,
     logger = mock.Mock()
     platform_manager = mock.Mock()
     project_manager = container.project_manager
-    return PullManager(logger, api_client, project_manager, project_config_manager, library_manager, platform_manager)
+    organization_manager = container.organization_manager
+    return PullManager(logger, api_client, project_manager,
+                       project_config_manager, library_manager, platform_manager, organization_manager)
 
 
 def _make_cloud_projects_and_libraries(project_count: int,