fix unit test

elastic · Jul 21, 2020 · 2d07c3b · 2d07c3b
1 parent cb9d6db
commit 2d07c3b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/...ty_solution/public/detections/components/rules/pre_packaged_rules/update_callout.test.tsx b/...ty_solution/public/detections/components/rules/pre_packaged_rules/update_callout.test.tsx
@@ -61,7 +61,7 @@ describe('UpdatePrePackagedRulesCallOut', () => {
   });
 
   it('renders callOutMessage correctly: numberOfUpdatedRules > 0 and numberOfUpdatedTimelines = 0', () => {
-    const wrapper = shallow(
+    shallow(
       <UpdatePrePackagedRulesCallOut
         loading={false}
         numberOfUpdatedRules={1}
@@ -74,7 +74,7 @@ describe('UpdatePrePackagedRulesCallOut', () => {
   });
 
   it('renders buttonTitle correctly: numberOfUpdatedRules > 0 and numberOfUpdatedTimelines = 0', () => {
-    const wrapper = shallow(
+    shallow(
       <UpdatePrePackagedRulesCallOut
         loading={false}
         numberOfUpdatedRules={1}
@@ -87,7 +87,7 @@ describe('UpdatePrePackagedRulesCallOut', () => {
   });
 
   it('renders callOutMessage correctly: numberOfUpdatedRules = 0 and numberOfUpdatedTimelines > 0', () => {
-    const wrapper = shallow(
+    shallow(
       <UpdatePrePackagedRulesCallOut
         loading={false}
         numberOfUpdatedRules={0}
@@ -100,7 +100,7 @@ describe('UpdatePrePackagedRulesCallOut', () => {
   });
 
   it('renders buttonTitle correctly: numberOfUpdatedRules = 0 and numberOfUpdatedTimelines > 0', () => {
-    const wrapper = shallow(
+    shallow(
       <UpdatePrePackagedRulesCallOut
         loading={false}
         numberOfUpdatedRules={0}
@@ -113,7 +113,7 @@ describe('UpdatePrePackagedRulesCallOut', () => {
   });
 
   it('renders callOutMessage correctly: numberOfUpdatedRules > 0 and numberOfUpdatedTimelines > 0', () => {
-    const wrapper = shallow(
+    shallow(
       <UpdatePrePackagedRulesCallOut
         loading={false}
         numberOfUpdatedRules={1}
@@ -126,7 +126,7 @@ describe('UpdatePrePackagedRulesCallOut', () => {
   });
 
   it('renders buttonTitle correctly: numberOfUpdatedRules > 0 and numberOfUpdatedTimelines > 0', () => {
-    const wrapper = shallow(
+    shallow(
       <UpdatePrePackagedRulesCallOut
         loading={false}
         numberOfUpdatedRules={1}

diff --git a/...plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.test.tsx b/...plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.test.tsx
@@ -402,7 +402,7 @@ describe('rule helpers', () => {
       const rulesInstalled = 0;
       const rulesNotInstalled = 1;
       const rulesNotUpdated = 0;
-      const result: boolean = getPrePackagedRuleStatus(
+      const result: string = getPrePackagedRuleStatus(
         rulesInstalled,
         rulesNotInstalled,
         rulesNotUpdated
@@ -415,7 +415,7 @@ describe('rule helpers', () => {
       const rulesInstalled = 1;
       const rulesNotInstalled = 0;
       const rulesNotUpdated = 0;
-      const result: boolean = getPrePackagedRuleStatus(
+      const result: string = getPrePackagedRuleStatus(
         rulesInstalled,
         rulesNotInstalled,
         rulesNotUpdated
@@ -428,7 +428,7 @@ describe('rule helpers', () => {
       const rulesInstalled = 1;
       const rulesNotInstalled = 1;
       const rulesNotUpdated = 0;
-      const result: boolean = getPrePackagedRuleStatus(
+      const result: string = getPrePackagedRuleStatus(
         rulesInstalled,
         rulesNotInstalled,
         rulesNotUpdated
@@ -441,7 +441,7 @@ describe('rule helpers', () => {
       const rulesInstalled = 1;
       const rulesNotInstalled = 0;
       const rulesNotUpdated = 1;
-      const result: boolean = getPrePackagedRuleStatus(
+      const result: string = getPrePackagedRuleStatus(
         rulesInstalled,
         rulesNotInstalled,
         rulesNotUpdated
@@ -456,7 +456,7 @@ describe('rule helpers', () => {
       const rulesInstalled = 0;
       const rulesNotInstalled = 1;
       const rulesNotUpdated = 0;
-      const result: boolean = getPrePackagedTimelineStatus(
+      const result: string = getPrePackagedTimelineStatus(
         rulesInstalled,
         rulesNotInstalled,
         rulesNotUpdated
@@ -469,7 +469,7 @@ describe('rule helpers', () => {
       const rulesInstalled = 1;
       const rulesNotInstalled = 0;
       const rulesNotUpdated = 0;
-      const result: boolean = getPrePackagedTimelineStatus(
+      const result: string = getPrePackagedTimelineStatus(
         rulesInstalled,
         rulesNotInstalled,
         rulesNotUpdated
@@ -482,7 +482,7 @@ describe('rule helpers', () => {
       const rulesInstalled = 1;
       const rulesNotInstalled = 1;
       const rulesNotUpdated = 0;
-      const result: boolean = getPrePackagedTimelineStatus(
+      const result: string = getPrePackagedTimelineStatus(
         rulesInstalled,
         rulesNotInstalled,
         rulesNotUpdated
@@ -495,7 +495,7 @@ describe('rule helpers', () => {
       const rulesInstalled = 1;
       const rulesNotInstalled = 0;
       const rulesNotUpdated = 1;
-      const result: boolean = getPrePackagedTimelineStatus(
+      const result: string = getPrePackagedTimelineStatus(
         rulesInstalled,
         rulesNotInstalled,
         rulesNotUpdated

diff --git a/...ck/plugins/security_solution/server/lib/timeline/routes/utils/compare_timelines_status.ts b/...ck/plugins/security_solution/server/lib/timeline/routes/utils/compare_timelines_status.ts
@@ -80,7 +80,8 @@ export class CompareTimelinesStatus {
           this.isHandlingTemplateTimeline) ||
         (this.templateTimelineObject.isCreatable &&
           !this.timelineObject.isCreatable &&
-          this.timelineObject.getData?.timelineType === this.timelineType))
+          this.timelineObject.getData?.timelineType === this.timelineType &&
+          this.isHandlingTemplateTimeline))
     );
   }