Skip to content

ROX-12893: Wait for more requests in configmanagement integration tests #3268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pedrottimark merged 14 commits into from
Oct 3, 2022
Merged

ROX-12893: Wait for more requests in configmanagement integration tests #3268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6509872
ROX-12893: Wait for more requests in configmanagement integration tests
Sep 30, 2022
59e1681
Fix mistake in clickOnCountWidget
Sep 30, 2022
a233d6a
Fix mistake in clickOnSingularEntityWidgetInSidePanel
Sep 30, 2022
f38e12f
Fix mistake in clickOnSingleEntityInTable
Sep 30, 2022
e4dcba4
Skip nodes test because request does not fit expected pattern
Sep 30, 2022
79f650c
Add getPolicy_ as exception
Sep 30, 2022
e534bf1
Fix mistake in serviceaccounts test
Sep 30, 2022
df72ad3
Fix RegExp in dashboard tests for number of policies
Oct 2, 2022
1083ac5
Add tableHeaderCount for CIS Controls exception
Oct 2, 2022
911ce24
Do not wait for request from control to nodes list
Oct 2, 2022
0ba38b0
Replace side-panel with panel in policyViolationsBySeverityLinkShould…
Oct 3, 2022
3844b90
Delete skip for test because entityCountMatchesTableRows has its spec…
Oct 3, 2022
08fc9d8
Delete accidental temporary change in another container
Oct 3, 2022
859fe34
Add opposite special case to entityCountMatchesTableRows
Oct 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions ui/apps/platform/cypress/constants/ConfigManagementPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,6 @@
import scopeSelectors from '../helpers/scopeSelectors';
import tableSelectors from '../selectors/table';

const baseURL = '/main/configmanagement';

export const url = {
dashboard: baseURL,
list: {
policies: `${baseURL}/policies`,
controls: `${baseURL}/controls`,
clusters: `${baseURL}/clusters`,
namespaces: `${baseURL}/namespaces`,
nodes: `${baseURL}/nodes`,
deployments: `${baseURL}/deployments`,
images: `${baseURL}/images`,
secrets: `${baseURL}/secrets`,
subjects: `${baseURL}/subjects`,
serviceAccounts: `${baseURL}/serviceaccounts`,
roles: `${baseURL}/roles`,
},
single: {
policy: `${baseURL}/policy`,
control: `${baseURL}/control`,
cluster: `${baseURL}/cluster`,
namespace: `${baseURL}/namespace`,
node: `${baseURL}/node`,
deployment: `${baseURL}/deployment`,
image: `${baseURL}/image`,
secret: `${baseURL}/secret`,
subject: `${baseURL}/subject`,
serviceAccount: `${baseURL}/serviceaccount`,
role: `${baseURL}/role`,
},
};

export const controlStatus = {
pass: 'pass',
fail: 'fail',
Expand Down
39 changes: 0 additions & 39 deletions ui/apps/platform/cypress/constants/apiEndpoints.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,5 @@
import upperFirst from 'lodash/upperFirst';

export const graphql = (operationName) => `/api/graphql?opname=${operationName}`;

// TODO Encapsulate exceptions in test constants for Configuration Management.

const operationNamePlural = {
deployments: 'getDeployments',
roles: 'k8sRoles',
};

const operationNameSingular = {
control: 'controlById',
role: 'k8sRole',
};

/*
* graphqlPluralEntity('serviceAccounts') === 'api/graphql?opname=serviceAccounts'
*/
export function graphqlPluralEntity(entityPlural) {
const operationName = operationNamePlural[entityPlural] ?? entityPlural;
return graphql(operationName);
}

/*
* graphqlSingularEntity('serviceAccount') === 'api/graphql?opname=getServiceAccount'
*
* Note that lodash capitalize converts the remaining characters to lower case.
*/
export function graphqlSingularEntity(entitySingular) {
const operationName =
operationNameSingular[entitySingular] ?? `get${upperFirst(entitySingular)}`;
return graphql(operationName);
}

// TODO graphqlSubentity(entity, subentity)

function searchObjToQuery(searchObj) {
let result = '';
Object.entries(searchObj).forEach(([searchCategory, searchValue], idx) => {
Expand Down Expand Up @@ -201,10 +166,6 @@ export const logs = '/api/logimbue';

export const featureFlags = '/v1/featureflags';

export const configMgmt = {
// Use graphqlPluralEntity or graphqlSingularEntity.
};

export const integrationHealth = {
imageIntegrations: '/v1/integrationhealth/imageintegrations',
signatureIntegrations: '/v1/signatureintegrations',
Expand Down
Loading