foreman_webhooks 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b5922c7ae2630c642e151ea99d59e8fce67ca342a93bd595a3c80d8837db0c7
-  data.tar.gz: c7d0bc6894477642639612f3d7b68974ea90dff25fabb91c3d684316fcd12230
+  metadata.gz: 2504e406a10a1be7d18fe058224497d23d5888a67c73c3a37a79a3c60d14b91d
+  data.tar.gz: f558a5e1d7f670ba489dea28d371c7ddd71a604131ffe0b50206286899794e5c
 SHA512:
-  metadata.gz: 3f8c365cbf5d75887f69a3ffe3c9949e4fdfff3ca3129f12432747dda722ddf017892f700eb712353a2d805e07a53ff1f82f278afe8db3ac92ef6bec802bb76a
-  data.tar.gz: 34717dcb661c339a41377fbaa2c40603d0821bc5a0949f80abfd828497c49c9778543cd87d4505207d2e1b92cc9f684e7adca9c90eca4d854d6267dcce28a964
+  metadata.gz: 3c31f081144dad2899b5b54f9eb6dd7fc04a8314ba684b82925856771d80449872c859e399015c5daaa542d0a743cbe44741d11251b8d1318f1fbed034140453
+  data.tar.gz: a18a91b96ddf51b0989c85fe74a9285c0e4a341253bcdc88ea152bbef3e8cce500dfc5c00f62d8b3fe9765f3e4e4464d59339b939df183d78d7ca418f355485f

data/db/seeds.d/62_shellhooks_proxy_feature.rb

@@ -3,4 +3,4 @@
 proxy_feature = Feature.where(name: 'Shellhooks').first_or_create
 return unless proxy_feature.nil? || proxy_feature.errors.any?
 
-raise "Unable to create proxy feature: #{format_errors proxy_feature}"
+raise "Unable to create proxy feature: #{SeedHelper.format_errors(proxy_feature)}"

data/lib/foreman_webhooks/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanWebhooks
-  VERSION = "6.0.0"
+  VERSION = '6.0.1'
 end

data/webpack/ForemanWebhooks/Routes/Webhooks/WebhooksIndexPage/__tests__/WebhooksIndexPage.fixtures.js

@@ -38,9 +38,10 @@ export const queryParams = {
   ...querySort,
 };
 
-export const stateFactory = state => ({
+export const stateFactory = (state = {}, { status } = {}) => ({
   API: {
     [WEBHOOKS_API_REQUEST_KEY]: {
+      ...(status !== undefined && { status }),
       response: {
         ...stateParams,
         ...state,

data/webpack/ForemanWebhooks/Routes/Webhooks/__tests__/WebhooksPageSelectors.test.js

@@ -1,4 +1,4 @@
-import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
+import { STATUS } from 'foremanReact/constants';
 
 import {
   selectWebhooks,
@@ -11,6 +11,7 @@ import {
   selectIsLoading,
   selectSubtotal,
   selectMessage,
+  selectCanCreate,
 } from '../WebhooksPageSelectors';
 
 import {
@@ -18,28 +19,132 @@ import {
   webhooks,
 } from '../WebhooksIndexPage/__tests__/WebhooksIndexPage.fixtures';
 
-const state = stateFactory({
+const populatedState = stateFactory({
   results: webhooks,
   sort: { by: 'name', order: 'DESC' },
   page: 1,
   perPage: 1,
   search: 'name ~ foo',
   subtotal: 42,
-  message: { type: 'error', text: 'This is error' },
+  canCreate: true,
+  message: { type: 'info', text: 'Saved successfully' },
 });
 
-const fixtures = {
-  'should return webhooks': () => selectWebhooks(state),
-  'should return page': () => selectPage(state),
-  'should return perPage': () => selectPerPage(state),
-  'should return search': () => selectSearch(state),
-  'should return sort': () => selectSort(state),
-  'should return hasData': () => selectHasData(state),
-  'should return hasError': () => selectHasError(state),
-  'should return isLoading': () => selectIsLoading(state),
-  'should return subtotal': () => selectSubtotal(state),
-  'should return message': () => selectMessage(state),
+const resolvedState = stateFactory(
+  { results: webhooks, subtotal: webhooks.length },
+  { status: STATUS.RESOLVED }
+);
+
+const pendingState = stateFactory({ results: [] }, { status: STATUS.PENDING });
+
+const errorState = {
+  API: {
+    webhooks: {
+      status: STATUS.ERROR,
+      response: {
+        message: 'Request failed with status code 500',
+        response: {
+          data: { error: { message: 'Unable to load webhooks' } },
+        },
+      },
+    },
+  },
 };
 
-describe('WebhooksPage selectors', () =>
-  testSelectorsSnapshotWithFixtures(fixtures));
+describe('WebhooksPage selectors', () => {
+  it('returns webhooks from the API response', () => {
+    expect(selectWebhooks(populatedState)).toEqual(webhooks);
+  });
+
+  it('returns page from the API response', () => {
+    expect(selectPage(populatedState)).toBe(1);
+  });
+
+  it('returns perPage from the API response', () => {
+    expect(selectPerPage(populatedState)).toBe(1);
+  });
+
+  it('returns search from the API response', () => {
+    expect(selectSearch(populatedState)).toBe('name ~ foo');
+  });
+
+  it('returns sort with camelCased column name', () => {
+    expect(selectSort(populatedState)).toEqual({ by: 'name', order: 'DESC' });
+  });
+
+  it('camelCases snake_case sort column names', () => {
+    const state = stateFactory({
+      sort: { by: 'target_url', order: 'ASC' },
+    });
+
+    expect(selectSort(state)).toEqual({ by: 'targetUrl', order: 'ASC' });
+  });
+
+  it('returns hasData as false when the API request is not resolved', () => {
+    expect(selectHasData(populatedState)).toBe(false);
+  });
+
+  it('returns hasData as true when the API request is resolved with results', () => {
+    expect(selectHasData(resolvedState)).toBe(true);
+  });
+
+  it('returns hasError as false for a successful API response', () => {
+    expect(selectHasError(populatedState)).toBe(false);
+  });
+
+  it('returns hasError as true when the API request failed', () => {
+    expect(selectHasError(errorState)).toBe(true);
+  });
+
+  it('returns isLoading as true when the API status is missing or pending', () => {
+    expect(selectIsLoading(populatedState)).toBe(true);
+    expect(selectIsLoading(pendingState)).toBe(true);
+  });
+
+  it('returns isLoading as false when the API request is resolved', () => {
+    expect(selectIsLoading(resolvedState)).toBe(false);
+  });
+
+  it('returns subtotal from the API response', () => {
+    expect(selectSubtotal(populatedState)).toBe(42);
+  });
+
+  it('returns message from the API response when there is no error', () => {
+    expect(selectMessage(populatedState)).toEqual({
+      type: 'info',
+      text: 'Saved successfully',
+    });
+  });
+
+  it('returns an error message from the API when the request failed', () => {
+    expect(selectMessage(errorState)).toEqual({
+      type: 'error',
+      text: 'Unable to load webhooks',
+    });
+  });
+
+  it('returns an empty webhook list when the API request failed', () => {
+    expect(selectWebhooks(errorState)).toEqual([]);
+  });
+
+  it('returns canCreate from the API response', () => {
+    expect(selectCanCreate(populatedState)).toBe(true);
+  });
+
+  it('returns default pagination values when the API response is empty', () => {
+    const emptyState = {
+      API: {
+        webhooks: {
+          status: STATUS.RESOLVED,
+          response: {},
+        },
+      },
+    };
+
+    expect(selectPage(emptyState)).toBe(1);
+    expect(selectPerPage(emptyState)).toBe(20);
+    expect(selectWebhooks(emptyState)).toEqual([]);
+    expect(selectSubtotal(emptyState)).toBe(0);
+    expect(selectCanCreate(emptyState)).toBe(false);
+  });
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_webhooks
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Timo Goebel
@@ -168,7 +168,6 @@ files:
 - webpack/ForemanWebhooks/Routes/Webhooks/WebhooksPageSelectors.js
 - webpack/ForemanWebhooks/Routes/Webhooks/__tests__/WebhooksPageHelpers.test.js
 - webpack/ForemanWebhooks/Routes/Webhooks/__tests__/WebhooksPageSelectors.test.js
-- webpack/ForemanWebhooks/Routes/Webhooks/__tests__/__snapshots__/WebhooksPageSelectors.test.js.snap
 - webpack/ForemanWebhooks/Routes/Webhooks/constants.js
 - webpack/index.js
 - webpack/routes_index.js
@@ -195,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Configure webhooks for Foreman.
 test_files:

data/webpack/ForemanWebhooks/Routes/Webhooks/__tests__/__snapshots__/WebhooksPageSelectors.test.js.snap

@@ -1,50 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`WebhooksPage selectors should return hasData 1`] = `false`;
-
-exports[`WebhooksPage selectors should return hasError 1`] = `false`;
-
-exports[`WebhooksPage selectors should return isLoading 1`] = `true`;
-
-exports[`WebhooksPage selectors should return message 1`] = `
-Object {
-  "text": "This is error",
-  "type": "error",
-}
-`;
-
-exports[`WebhooksPage selectors should return page 1`] = `1`;
-
-exports[`WebhooksPage selectors should return perPage 1`] = `1`;
-
-exports[`WebhooksPage selectors should return search 1`] = `"name ~ foo"`;
-
-exports[`WebhooksPage selectors should return sort 1`] = `
-Object {
-  "by": "name",
-  "order": "DESC",
-}
-`;
-
-exports[`WebhooksPage selectors should return subtotal 1`] = `42`;
-
-exports[`WebhooksPage selectors should return webhooks 1`] = `
-Array [
-  Object {
-    "canDelete": true,
-    "canEdit": true,
-    "enabled": true,
-    "id": 1,
-    "name": "my-webhook",
-    "targetUrl": "https://my-machine.example.com",
-  },
-  Object {
-    "canDelete": false,
-    "canEdit": false,
-    "enabled": false,
-    "id": 2,
-    "name": "your-webhook",
-    "targetUrl": "https://your-machine.example.com",
-  },
-]
-`;