fix(pipelines): prevent pipelineConfig pollution caused by retrying a…

… trigger unsuccessfully. (#8287) * fix(pipelines): prevent pipelineConfig pollution caused by retrying a trigger unsuccessfully. * fix(pipelines): fix broken unit test * fix(pipelines): update test case
spinnaker · May 26, 2020 · 3f2afb7 · 3f2afb7
1 parent f4d5ea8
commit 3f2afb7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app/scripts/modules/core/src/pipeline/config/pipelineConfig.controller.js b/app/scripts/modules/core/src/pipeline/config/pipelineConfig.controller.js
@@ -74,7 +74,7 @@ module(CORE_PIPELINE_CONFIG_PIPELINECONFIG_CONTROLLER, [UIROUTER_ANGULARJS]).con
     if (!app.notFound && !app.hasError) {
       app.pipelineConfigs.activate();
       app.pipelineConfigs
-        .ready()
+        .refresh()
         .then(this.initialize)
         .then(() => (this.state.pipelinesLoaded = true));
     }

diff --git a/app/scripts/modules/core/src/pipeline/config/pipelineConfig.controller.spec.js b/app/scripts/modules/core/src/pipeline/config/pipelineConfig.controller.spec.js
@@ -13,7 +13,7 @@ describe('Controller: PipelineConfigCtrl', function() {
     }),
   );
 
-  it('should initialize immediately if pipeline configs are already present', function() {
+  it('should reload pipeline configs even if are already loaded before initializing', function() {
     const application = ApplicationModelBuilder.createApplicationForTests('app', {
       key: 'pipelineConfigs',
       lazy: true,
@@ -29,6 +29,11 @@ describe('Controller: PipelineConfigCtrl', function() {
       },
       app: application,
     });
+    application.pipelineConfigs.activate();
+    application.pipelineConfigs.refresh();
+    application.pipelineConfigs.data.push({ id: 'a' });
+    application.pipelineConfigs.dataUpdated();
+
     scope.$digest();
     expect(vm.state.pipelinesLoaded).toBe(true);
   });