Revert "chore: Mock GET groups related requests (RedHatInsights#1793)"

This reverts commit a82ed4f.
gkarat · Apr 26, 2023 · fb6d33f · fb6d33f
1 parent b3e8fa5
commit fb6d33f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 67 deletions.
diff --git a/cypress/fixtures/groups/Ba8B79ab5adC8E41e255D5f8aDb8f1F3.json b/cypress/fixtures/groups/Ba8B79ab5adC8E41e255D5f8aDb8f1F3.json
diff --git a/src/components/InventoryGroups/utils/api.js b/src/components/InventoryGroups/utils/api.js
@@ -4,22 +4,14 @@ import { INVENTORY_API_BASE } from '../../../api';
 import { TABLE_DEFAULT_PAGINATION } from '../../../constants';
 import PropTypes from 'prop-types';
 import union from 'lodash/union';
-import fixtureGroups from '../../../../cypress/fixtures/groups.json';
-import fixtureGroupsDetails from '../../../../cypress/fixtures/groups/Ba8B79ab5adC8E41e255D5f8aDb8f1F3.json';
 
-// eslint-disable-next-line camelcase
-export const getGroups = (search = {}, pagination = { page: 1, per_page: TABLE_DEFAULT_PAGINATION }) => {
-    if (window.Cypress) {
-        const parameters = new URLSearchParams({
-            ...search,
-            ...pagination
-        }).toString();
+export const getGroups = (search = {}, pagination = { page: 1, perPage: TABLE_DEFAULT_PAGINATION }) => {
+    const parameters = new URLSearchParams({
+        ...search,
+        ...pagination
+    }).toString();
 
-        return instance.get(`${INVENTORY_API_BASE}/groups?${parameters}`);
-    }
-
-    // FIXME: remove mock data when API is implemented
-    return Promise.resolve(fixtureGroups);
+    return instance.get(`${INVENTORY_API_BASE}/groups?${parameters}` /* , { headers: { Prefer: 'code=404' } } */);
 };
 
 export const createGroup = (payload) => {
@@ -31,22 +23,12 @@ export const createGroup = (payload) => {
 };
 
 export const validateGroupName = (name) => {
-    if (window.Cypress) {
-        return instance.get(`${INVENTORY_API_BASE}/groups`)
-        .then((resp) => resp?.results.some((group) => group.name === name));
-    }
-
-    // FIXME: remove mock data when API is implemented
-    return Promise.resolve(fixtureGroups).then((resp) => resp?.results.some((group) => group.name === name));
+    return instance.get(`${INVENTORY_API_BASE}/groups`)
+    .then((resp) => resp?.results.some((group) => group.name === name));
 };
 
 export const getGroupDetail = (groupId) => {
-    if (window.Cypress) {
-        return instance.get(`${INVENTORY_API_BASE}/groups/${groupId}`);
-    }
-
-    // FIXME: remove mock data when API is implemented
-    return Promise.resolve(fixtureGroupsDetails);
+    return instance.get(`${INVENTORY_API_BASE}/groups/${groupId}`);
 };
 
 export const updateGroupById = (id, payload) => {

diff --git a/src/store/actions.test.js b/src/store/actions.test.js
@@ -2,7 +2,7 @@
 import { editAnsibleHost, editDisplayName, fetchGroups, systemProfile } from './actions';
 import { hosts } from '../api';
 import mockedData from '../__mocks__/mockedData.json';
-import fixturesGroups from '../../cypress/fixtures/groups.json';
+import mockedGroups from '../__mocks__/mockedGroups.json';
 import MockAdapter from 'axios-mock-adapter';
 
 const mocked = new MockAdapter(hosts.axios);
@@ -65,10 +65,10 @@ describe('editAnsibleHost', () => {
 describe('fetchGroups', () => {
     it('should call correct endpoint', async () => {
         mocked.onGet(new RegExp('/api/inventory/v1/groups*')).reply(() => {
-            return [200, fixturesGroups];
+            return [200, mockedGroups];
         });
         const { type, payload } = await fetchGroups();
         expect(type).toBe('GROUPS');
-        expect(await payload).toEqual(fixturesGroups);
+        expect(await payload).toEqual(mockedGroups);
     });
 });