From 9072b0d85d6dd4ad8347391ad146c9b480df4ac1 Mon Sep 17 00:00:00 2001 From: Paul Prescod Date: Wed, 11 Jan 2023 15:57:27 -0800 Subject: [PATCH 1/3] Fix integration test errors --- cumulusci/tasks/sample_data/test_capture_sample_data.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cumulusci/tasks/sample_data/test_capture_sample_data.py b/cumulusci/tasks/sample_data/test_capture_sample_data.py index 1b5673f7ad..01fdfaf695 100644 --- a/cumulusci/tasks/sample_data/test_capture_sample_data.py +++ b/cumulusci/tasks/sample_data/test_capture_sample_data.py @@ -36,14 +36,14 @@ def setup_test(org_config): ), responses.RequestsMock() as rsps: rsps.add( responses.GET, - f"https://orgname.my.salesforce.com/services/data/v{CURRENT_SF_API_VERSION}/tooling/sobjects", + f"{org_config.instance_url}/services/data/v{CURRENT_SF_API_VERSION}/tooling/sobjects", json={"sobjects": [{"name": "WebLink"}]}, status=200, ) yield -class TestCaptureDatasetss: +class TestCaptureDatasets: @mock.patch("cumulusci.tasks.sample_data.capture_sample_data.Dataset") def test_simple_extract( self, @@ -54,6 +54,7 @@ def test_simple_extract( with setup_test(org_config): task = create_task(CaptureSampleData, {}) task() + print("Dataset.mock_calls", Dataset.mock_calls) # default dataset should created Dataset.assert_any_call("default", mock.ANY, mock.ANY, org_config, mock.ANY) # and extracted From 15cfc6e00f8ce1203684af438fc2afbef689e32f Mon Sep 17 00:00:00 2001 From: Paul Prescod Date: Wed, 11 Jan 2023 16:36:59 -0800 Subject: [PATCH 2/3] Fix integration test errors - 2 --- cumulusci/tasks/sample_data/test_load_sample_data.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cumulusci/tasks/sample_data/test_load_sample_data.py b/cumulusci/tasks/sample_data/test_load_sample_data.py index 16b0b230de..275ca839fc 100644 --- a/cumulusci/tasks/sample_data/test_load_sample_data.py +++ b/cumulusci/tasks/sample_data/test_load_sample_data.py @@ -36,7 +36,7 @@ def setup_test(org_config): yield -class TestCaptureDatasets: +class TestLoadDatasets: @mock.patch("cumulusci.tasks.sample_data.load_sample_data.Dataset") def test_simple_extract( self, @@ -47,7 +47,8 @@ def test_simple_extract( with setup_test(org_config): task = create_task(LoadSampleData, {"ignore_row_errors": True}) task() - # default dataset should opened + print(Dataset.mock_calls) + # default dataset should be opened Dataset.assert_any_call("default", mock.ANY, mock.ANY, org_config, mock.ANY) # and loaded Dataset().__enter__().load.assert_called_with( From 1cdc34596adfcec3b1495b9af258f12e7f09c62e Mon Sep 17 00:00:00 2001 From: Paul Prescod Date: Mon, 16 Jan 2023 11:23:50 -0800 Subject: [PATCH 3/3] Fix another test --- cumulusci/tasks/sample_data/test_load_sample_data.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cumulusci/tasks/sample_data/test_load_sample_data.py b/cumulusci/tasks/sample_data/test_load_sample_data.py index 275ca839fc..0de260ec97 100644 --- a/cumulusci/tasks/sample_data/test_load_sample_data.py +++ b/cumulusci/tasks/sample_data/test_load_sample_data.py @@ -45,11 +45,13 @@ def test_simple_extract( org_config, ): with setup_test(org_config): + org_config.config["config_name"] = "dev" task = create_task(LoadSampleData, {"ignore_row_errors": True}) task() - print(Dataset.mock_calls) # default dataset should be opened - Dataset.assert_any_call("default", mock.ANY, mock.ANY, org_config, mock.ANY) + Dataset.assert_any_call( + org_config.config_name, mock.ANY, mock.ANY, org_config, mock.ANY + ) # and loaded Dataset().__enter__().load.assert_called_with( {"ignore_row_errors": True}, task.logger