foreman-tasks 12.2.3 → 12.2.4

data/webpack/ForemanTasks/Components/TasksDashboard/__tests__/TasksDashboardSelectors.test.js

@@ -1,4 +1,3 @@
-import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
 import {
   selectTasksDashboard,
   selectTime,
@@ -6,6 +5,7 @@ import {
   selectTasksSummary,
   calcStoppedOther,
 } from '../TasksDashboardSelectors';
+import { TASKS_DASHBOARD_AVAILABLE_TIMES } from '../TasksDashboardConstants';
 
 const stoppedResult = {
   error: {
@@ -55,19 +55,107 @@ const state = {
   },
 };
 
-const fixtures = {
-  'should select tasks-dashboard': () => selectTasksDashboard(state),
-  'should select tasks-dashboard when state is empty': () =>
-    selectTasksDashboard({}),
-  'should select time': () => selectTime(state),
-  'should select time when state is empty': () => selectTime({}),
-  'should select query': () => selectQuery(state),
-  'should select query when state is empty': () => selectQuery({}),
-  'should select tasks-summary': () => selectTasksSummary(state),
-  'should select tasks-summary when state is empty': () =>
-    selectTasksSummary({}),
-  'should calcStoppedOther': () => calcStoppedOther(stoppedResult),
+const emptyTasksSummary = {
+  paused: {
+    last: 0,
+    older: 0,
+  },
+  running: {
+    last: 0,
+    older: 0,
+  },
+  scheduled: 0,
+  stopped: {
+    other: 0,
+    results: {
+      error: {
+        last: 0,
+        total: 0,
+      },
+      success: {
+        last: 0,
+        total: 0,
+      },
+      warning: {
+        last: 0,
+        total: 0,
+      },
+    },
+  },
 };
 
-describe('TasksDashboard - Selectors', () =>
-  testSelectorsSnapshotWithFixtures(fixtures));
+describe('TasksDashboard - Selectors', () => {
+  it('should select tasks-dashboard', () => {
+    expect(selectTasksDashboard(state)).toEqual(
+      state.foremanTasks.tasksDashboard
+    );
+  });
+
+  it('should select tasks-dashboard when state is empty', () => {
+    expect(selectTasksDashboard({})).toEqual({});
+  });
+
+  it('should select time', () => {
+    expect(selectTime(state)).toBe('some-time');
+  });
+
+  it('should select time when state is empty', () => {
+    expect(selectTime({})).toBe(TASKS_DASHBOARD_AVAILABLE_TIMES.H24);
+  });
+
+  it('should select query', () => {
+    const query = { state: 'running' };
+    const stateWithQuery = {
+      ...state,
+      foremanTasks: {
+        ...state.foremanTasks,
+        tasksDashboard: { ...state.foremanTasks.tasksDashboard, query },
+      },
+    };
+
+    expect(selectQuery(stateWithQuery)).toEqual(query);
+  });
+
+  it('should select query when state is empty', () => {
+    expect(selectQuery({})).toEqual({});
+  });
+
+  it('should select tasks-summary', () => {
+    expect(selectTasksSummary(state)).toEqual({
+      paused: {
+        last: 2,
+        older: 7,
+      },
+      running: {
+        last: 3,
+        older: 5,
+      },
+      scheduled: 6,
+      stopped: {
+        other: 16,
+        results: {
+          error: {
+            last: 1,
+            total: 9,
+          },
+          success: {
+            last: 3,
+            total: 7,
+          },
+          warning: {
+            last: 2,
+            total: 8,
+          },
+        },
+      },
+    });
+  });
+
+  it('should select tasks-summary when state is empty', () => {
+    expect(selectTasksSummary({})).toEqual(emptyTasksSummary);
+  });
+
+  it('should calcStoppedOther', () => {
+    expect(calcStoppedOther(stoppedResult)).toBe(16);
+  });
+});

data/webpack/ForemanTasks/Components/TasksTable/TasksTableConstants.js

@@ -5,7 +5,7 @@ export const BULK_RESUME_PATH = 'bulk_resume';
 export const BULK_FORCE_CANCEL_PATH = 'bulk_stop';
 
 export const TASKS_SEARCH_PROPS = {
-  ...getControllerSearchProps('tasks'),
+  ...getControllerSearchProps('/foreman_tasks/tasks'),
   controller: 'foreman_tasks_tasks',
 };
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 12.2.3
+  version: 12.2.4
 platform: ruby
 authors:
 - Ivan Nečas
@@ -368,10 +368,10 @@ files:
 - webpack/ForemanTasks/Components/TaskActions/TaskActionHelpers.js
 - webpack/ForemanTasks/Components/TaskActions/TaskActionHelpers.test.js
 - webpack/ForemanTasks/Components/TaskActions/TaskActionsConstants.js
-- webpack/ForemanTasks/Components/TaskActions/__snapshots__/TaskAction.test.js.snap
 - webpack/ForemanTasks/Components/TaskActions/index.js
 - webpack/ForemanTasks/Components/TaskDetails/Components/Dependencies.js
 - webpack/ForemanTasks/Components/TaskDetails/Components/Errors.js
+- webpack/ForemanTasks/Components/TaskDetails/Components/Errors.scss
 - webpack/ForemanTasks/Components/TaskDetails/Components/Locks.js
 - webpack/ForemanTasks/Components/TaskDetails/Components/Raw.js
 - webpack/ForemanTasks/Components/TaskDetails/Components/RunningSteps.js
@@ -447,10 +447,6 @@ files:
 - webpack/ForemanTasks/Components/TasksDashboard/__tests__/TasksDashboardHelper.test.js
 - webpack/ForemanTasks/Components/TasksDashboard/__tests__/TasksDashboardReducer.test.js
 - webpack/ForemanTasks/Components/TasksDashboard/__tests__/TasksDashboardSelectors.test.js
-- webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboard.test.js.snap
-- webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboardActions.test.js.snap
-- webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboardReducer.test.js.snap
-- webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboardSelectors.test.js.snap
 - webpack/ForemanTasks/Components/TasksDashboard/index.js
 - webpack/ForemanTasks/Components/TasksTable/Components/ActionSelectButton.js
 - webpack/ForemanTasks/Components/TasksTable/Components/CellActionButton.js

data/webpack/ForemanTasks/Components/TaskActions/__snapshots__/TaskAction.test.js.snap

@@ -1,233 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Tasks actions should cancelTaskRequest and fail 1`] = `
-Array [
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "Trying to cancel some-name task",
-          "type": "info",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-  Array [
-    Object {
-      "type": "TASKS_CANCEL_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "payload": [Error: Network Error],
-      "type": "TASKS_CANCEL_FAILURE",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "some-name Task execution task has to be cancellable",
-          "type": "warning",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
-`;
-
-exports[`Tasks actions should cancelTaskRequest and succeed 1`] = `
-Array [
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "Trying to cancel some-name task",
-          "type": "info",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-  Array [
-    Object {
-      "type": "TASKS_CANCEL_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "type": "TASKS_CANCEL_SUCCESS",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "some-name Task execution was cancelled",
-          "type": "success",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
-`;
-
-exports[`Tasks actions should forceCancelTaskRequest and fail 1`] = `
-Array [
-  Array [
-    Object {
-      "type": "TASKS_FORCE_CANCEL_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "type": "TASKS_FORCE_CANCEL_FAILURE",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "some-name Task execution cannot be cancelled with force at the moment.",
-          "type": "warning",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
-`;
-
-exports[`Tasks actions should forceCancelTaskRequest and succeed 1`] = `
-Array [
-  Array [
-    Object {
-      "type": "TASKS_FORCE_CANCEL_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "type": "TASKS_FORCE_CANCEL_SUCCESS",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "some-name Task execution resources were unlocked with force.",
-          "type": "success",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
-`;
-
-exports[`Tasks actions should resumeTaskRequest and fail 1`] = `
-Array [
-  Array [
-    Object {
-      "type": "TASKS_RESUME_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "payload": [Error: Network Error],
-      "type": "TASKS_RESUME_FAILURE",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "some-name Task execution could not be resumed",
-          "type": "error",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
-`;
-
-exports[`Tasks actions should resumeTaskRequest and succeed 1`] = `
-Array [
-  Array [
-    Object {
-      "type": "TASKS_RESUME_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "type": "TASKS_RESUME_SUCCESS",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "some-name Task execution was resumed",
-          "type": "success",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
-`;
-
-exports[`Tasks actions should unlockTaskRequest and fail 1`] = `
-Array [
-  Array [
-    Object {
-      "type": "TASKS_FORCE_CANCEL_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "type": "TASKS_FORCE_CANCEL_FAILURE",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "some-name Task execution cannot be cancelled with force at the moment.",
-          "type": "warning",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
-`;
-
-exports[`Tasks actions should unlockTaskRequest and succeed 1`] = `
-Array [
-  Array [
-    Object {
-      "type": "TASKS_UNLOCK_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "type": "TASKS_UNLOCK_SUCCESS",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "message": Object {
-          "message": "some-name Task execution resources were unlocked ",
-          "type": "success",
-        },
-      },
-      "type": "TOASTS_ADD",
-    },
-  ],
-]
-`;

data/webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboard.test.js.snap

@@ -1,51 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`TasksDashboard rendering render without Props 1`] = `
-<div
-  className="tasks-dashboard-grid"
->
-  <TasksTimeRow
-    time="H24"
-    updateTime={[Function]}
-  />
-  <TasksCardsGrid
-    data={
-      Object {
-        "paused": Object {
-          "last": 0,
-          "older": 0,
-        },
-        "running": Object {
-          "last": 0,
-          "older": 0,
-        },
-        "scheduled": 0,
-        "stopped": Object {
-          "other": 0,
-          "results": Object {
-            "error": Object {
-              "last": 0,
-              "total": 0,
-            },
-            "success": Object {
-              "last": 0,
-              "total": 0,
-            },
-            "warning": Object {
-              "last": 0,
-              "total": 0,
-            },
-          },
-        },
-      }
-    }
-    query={Object {}}
-    time="H24"
-    updateQuery={[Function]}
-  />
-  <TasksLabelsRow
-    query={Object {}}
-    updateQuery={[Function]}
-  />
-</div>
-`;

data/webpack/ForemanTasks/Components/TasksDashboard/__tests__/__snapshots__/TasksDashboardActions.test.js.snap

@@ -1,151 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`TasksDashboard - Actions should fetch-tasks-summary and fail 1`] = `
-Array [
-  Array [
-    Object {
-      "type": "FOREMAN_TASKS_DASHBOARD_FETCH_TASKS_SUMMARY_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "payload": [Error: wrong time],
-      "type": "FOREMAN_TASKS_DASHBOARD_FETCH_TASKS_SUMMARY_FAILURE",
-    },
-  ],
-]
-`;
-
-exports[`TasksDashboard - Actions should fetch-tasks-summary and success 1`] = `
-Array [
-  Array [
-    Object {
-      "type": "FOREMAN_TASKS_DASHBOARD_FETCH_TASKS_SUMMARY_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "tasksSummary": Object {
-          "paused": Object {
-            "recent": 0,
-            "total": 54,
-          },
-          "running": Object {
-            "recent": 0,
-            "total": 3,
-          },
-          "scheduled": Object {
-            "recent": 0,
-            "total": 7,
-          },
-          "stopped": Object {
-            "by_result": Object {
-              "cancelled": Object {
-                "recent": 0,
-                "total": 105,
-              },
-              "error": Object {
-                "recent": 0,
-                "total": 121,
-              },
-              "success": Object {
-                "recent": 0,
-                "total": 532,
-              },
-              "warning": Object {
-                "recent": 0,
-                "total": 10,
-              },
-            },
-            "recent": 0,
-            "total": 768,
-          },
-        },
-      },
-      "type": "FOREMAN_TASKS_DASHBOARD_FETCH_TASKS_SUMMARY_SUCCESS",
-    },
-  ],
-]
-`;
-
-exports[`TasksDashboard - Actions should fetch-tasks-summary for subtasks and success 1`] = `
-Array [
-  Array [
-    Object {
-      "type": "FOREMAN_TASKS_DASHBOARD_FETCH_TASKS_SUMMARY_REQUEST",
-    },
-  ],
-  Array [
-    Object {
-      "payload": Object {
-        "tasksSummary": Object {
-          "paused": Object {
-            "recent": 0,
-            "total": 7,
-          },
-          "running": Object {
-            "recent": 0,
-            "total": 3,
-          },
-          "scheduled": Object {
-            "recent": 0,
-            "total": 7,
-          },
-          "stopped": Object {
-            "by_result": Object {
-              "cancelled": Object {
-                "recent": 0,
-                "total": 0,
-              },
-              "error": Object {
-                "recent": 0,
-                "total": 0,
-              },
-              "success": Object {
-                "recent": 0,
-                "total": 0,
-              },
-              "warning": Object {
-                "recent": 0,
-                "total": 0,
-              },
-            },
-            "recent": 0,
-            "total": 0,
-          },
-        },
-      },
-      "type": "FOREMAN_TASKS_DASHBOARD_FETCH_TASKS_SUMMARY_SUCCESS",
-    },
-  ],
-]
-`;
-
-exports[`TasksDashboard - Actions should initialize-dashboard 1`] = `
-Object {
-  "payload": Object {
-    "query": "some-query",
-    "time": "some-time",
-  },
-  "type": "FOREMAN_TASKS_DASHBOARD_INIT",
-}
-`;
-
-exports[`TasksDashboard - Actions should update-query 1`] = `
-Array [
-  Array [
-    Object {
-      "payload": "some-query",
-      "type": "FOREMAN_TASKS_DASHBOARD_UPDATE_QUERY",
-    },
-  ],
-]
-`;
-
-exports[`TasksDashboard - Actions should update-time 1`] = `
-Object {
-  "payload": "some-time",
-  "type": "FOREMAN_TASKS_DASHBOARD_UPDATE_TIME",
-}
-`;