Merge pull request #2277 from SFDO-Tooling/feature/fix-unmanaged-depe…

…ndency-autoinject fix automatic namespace injection for unmanaged dependencies
SFDO-Tooling · Dec 30, 2020 · e2f0bc7 · e2f0bc7
2 parents 128efa8 + 2e7dc80
commit e2f0bc7
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/cumulusci/tasks/salesforce/tests/test_update_dependencies.py b/cumulusci/tasks/salesforce/tests/test_update_dependencies.py
@@ -315,6 +315,40 @@ def test_run_task__metadata_bundle(self):
         )
         api.assert_called_once()
 
+    @mock.patch(
+        "cumulusci.tasks.salesforce.update_dependencies.MetadataPackageZipBuilder"
+    )
+    def test_install_dependency__autoinject(self, MetadataPackageZipBuilder):
+        project_config = create_project_config(namespace="ns")
+        project_config.get_github_api = mock.Mock()
+        task = create_task(
+            UpdateDependencies,
+            {},
+            project_config=project_config,
+        )
+        task.org_config._installed_packages = {"ns": "1.0"}
+        task._download_extract_github = make_fake_zipfile
+        api = mock.Mock()
+        task.api_class = mock.Mock(return_value=api)
+        task._install_dependency(
+            {
+                "repo_owner": "SFDO-Tooling",
+                "repo_name": "CumulusCI-Test",
+                "ref": "abcdef",
+                "subfolder": "src",
+                "namespace_inject": "ns",
+            }
+        )
+        assert MetadataPackageZipBuilder.from_zipfile.call_args[1]["options"] == {
+            "repo_owner": "SFDO-Tooling",
+            "repo_name": "CumulusCI-Test",
+            "ref": "abcdef",
+            "subfolder": "src",
+            "namespace_inject": "ns",
+            "unmanaged": False,
+        }
+        api.assert_called_once()
+
     def test_run_task__version_id(self):
         project_config = create_project_config()
         project_config.get_github_api = mock.Mock()

diff --git a/cumulusci/tasks/salesforce/update_dependencies.py b/cumulusci/tasks/salesforce/update_dependencies.py
@@ -287,7 +287,7 @@ def _install_dependency(self, dependency):
                 ) or namespace not in self.org_config.installed_packages
 
             package_zip = MetadataPackageZipBuilder.from_zipfile(
-                zip_src, options=dependency, logger=self.logger
+                zip_src, options=options, logger=self.logger
             ).as_base64()
         elif "namespace" in dependency:
             self.logger.info(