Skip to content
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.

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

Remove story points check #780

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ describe(["@tier1"], "Binary Analysis", () => {
application.downloadReport("HTML");
application.downloadReport("CSV");
application.openReport();
application.validateStoryPoints();
});

after("Perform test data clean up", function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ describe(["@tier1"], "Source Analysis", () => {
checkSuccessAlert(infoAlertMessage, `Submitted for analysis`);
application.verifyAnalysisStatus("Completed");
application.openReport();
application.validateStoryPoints();
});

it("Source + dependencies analysis on tackletest app", function () {
Expand All @@ -118,7 +117,6 @@ describe(["@tier1"], "Source Analysis", () => {
application.analyze();
application.verifyAnalysisStatus("Completed");
application.openReport();
application.validateStoryPoints();
});

it("Source + dependencies analysis on daytrader app", function () {
Expand All @@ -136,7 +134,6 @@ describe(["@tier1"], "Source Analysis", () => {
application.analyze();
application.verifyAnalysisStatus("Completed");
application.openReport();
application.validateStoryPoints();
});

it("Analysis on daytrader app with maven credentials", function () {
Expand All @@ -155,7 +152,6 @@ describe(["@tier1"], "Source Analysis", () => {
application.analyze();
application.verifyAnalysisStatus("Completed");
application.openReport();
application.validateStoryPoints();
});

it("Source Analysis on tackle testapp", function () {
Expand All @@ -174,7 +170,6 @@ describe(["@tier1"], "Source Analysis", () => {
application.analyze();
application.verifyAnalysisStatus("Completed");
application.openReport();
application.validateStoryPoints();
});

it("Analysis on tackle test app with ssh credentials", function () {
Expand All @@ -200,7 +195,6 @@ describe(["@tier1"], "Source Analysis", () => {
application.analyze();
application.verifyAnalysisStatus("Completed");
application.openReport();
application.validateStoryPoints();
});

it("Source Analysis on tackle testapp for svn repo type", function () {
Expand All @@ -219,7 +213,6 @@ describe(["@tier1"], "Source Analysis", () => {
application.analyze();
application.verifyAnalysisStatus("Completed");
application.openReport();
application.validateStoryPoints();
});

it("Analysis for known Open Source libraries on tackleTest app", function () {
Expand All @@ -238,7 +231,6 @@ describe(["@tier1"], "Source Analysis", () => {
application.analyze();
application.verifyAnalysisStatus("Completed");
application.openReport();
application.validateStoryPoints();
});

it("Automated tagging using Source Analysis on tackle testapp", function () {
Expand Down Expand Up @@ -295,7 +287,6 @@ describe(["@tier1"], "Source Analysis", () => {
application.analyze();
application.verifyAnalysisStatus(AnalysisStatuses.completed);
application.openReport();
application.validateStoryPoints();
});

after("Perform test data clean up", function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ describe(["@tier1"], "Upload Binary Analysis", () => {
application.verifyAnalysisStatus("Completed");
application.downloadReport("HTML");
application.openReport();
application.validateStoryPoints();
});

it("Custom rules with custom targets", function () {
Expand All @@ -89,7 +88,6 @@ describe(["@tier1"], "Upload Binary Analysis", () => {
application.verifyAnalysisStatus("Completed");
application.downloadReport("CSV");
application.openReport();
application.validateStoryPoints();
});

it("DIVA report generation", function () {
Expand All @@ -105,7 +103,6 @@ describe(["@tier1"], "Upload Binary Analysis", () => {
application.analyze();
application.verifyAnalysisStatus("Completed");
application.openReport();
application.validateStoryPoints();
application.validateTransactionReport();
});

Expand All @@ -123,7 +120,6 @@ describe(["@tier1"], "Upload Binary Analysis", () => {
application.analyze();
application.verifyAnalysisStatus("Completed");
application.openReport();
application.validateIncidents();
});

it("Analysis for camunda-bpm-spring-boot-starter", function () {
Expand All @@ -138,8 +134,6 @@ describe(["@tier1"], "Upload Binary Analysis", () => {
application.analyze();
application.verifyAnalysisStatus("Completed");
application.openReport();
application.validateStoryPoints();
application.validateIncidents();
});

it("Analysis for complete-duke app upload binary ", function () {
Expand All @@ -156,8 +150,6 @@ describe(["@tier1"], "Upload Binary Analysis", () => {
application.analyze();
application.verifyAnalysisStatus("Completed");
application.openReport();
application.validateStoryPoints();
application.validateIncidents();
});

it("Analysis for kafka-clients-sb app ", function () {
Expand All @@ -172,8 +164,6 @@ describe(["@tier1"], "Upload Binary Analysis", () => {
application.analyze();
application.verifyAnalysisStatus("Completed");
application.openReport();
application.validateStoryPoints();
application.validateIncidents();
});

after("Perform test data clean up", function () {
Expand Down
3 changes: 2 additions & 1 deletion cypress/e2e/tests/rbac/architect.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import { Analysis } from "../../models/migration/applicationinventory/analysis";
import { CredentialsSourceControlUsername } from "../../models/administration/credentials/credentialsSourceControlUsername";
import { CredentialType } from "../../types/constants";
import { Application } from "../../models/migration/applicationinventory/application";
import { Stakeholders } from "../../models/migration/controls/stakeholders";
import { Assessment } from "../../models/migration/applicationinventory/assessment";
import { Stakeholders } from "../../models/migration/controls/stakeholders";
import * as data from "../../../utils/data_utils";

describe(["@tier2", "@rhsso"], "Architect RBAC operations", function () {
Expand All @@ -38,6 +38,7 @@ describe(["@tier2", "@rhsso"], "Architect RBAC operations", function () {
);

before("Creating RBAC users, adding roles for them", function () {
//Need to log in as admin and create simple app with known name to use it for tests
login();
// Navigate to stakeholders control tab and create new stakeholder
const stakeholder = new Stakeholders(data.getEmail(), data.getFullName());
Expand Down
15 changes: 5 additions & 10 deletions cypress/e2e/tests/rbac/custom-migration-target.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,13 @@ import {
clickByText,
getRandomAnalysisData,
getRandomApplicationData,
hasToBeSkipped,
login,
logout,
preservecookies,
resetURL,
selectItemsPerPage,
} from "../../../utils/utils";
import {
analyzeButton,
application,
button,
SEC,
CustomRuleType,
Expand Down Expand Up @@ -56,7 +53,7 @@ describe(["tier2", "@dc"], "Custom Migration Targets RBAC operations", function

login();
cy.fixture("custom-rules").then((customMigrationTargets) => {
const targetData = customMigrationTargets.rules_from_bookServerApp;
const targetData = customMigrationTargets["rules_from_bookServerApp"];
const repositoryData: RulesRepositoryFields = {
...targetData.repository,
type: CustomRuleType.Repository,
Expand All @@ -72,8 +69,6 @@ describe(["tier2", "@dc"], "Custom Migration Targets RBAC operations", function
});

beforeEach("Persist session", function () {
preservecookies();

cy.fixture("application").then(function (appData) {
this.appData = appData;
});
Expand Down Expand Up @@ -108,14 +103,14 @@ describe(["tier2", "@dc"], "Custom Migration Targets RBAC operations", function
it("Look for created target on an analysis as architect user", function () {
architect.login();
assertTargetIsVisible(analysis, target);
analyzeAndVerify(analysis);
analyzeAndVerify(analysis, architect);
architect.logout();
});

it("Look for created target on an analysis as migrator user", function () {
migrator.login();
assertTargetIsVisible(analysis, target);
analyzeAndVerify(analysis);
analyzeAndVerify(analysis, migrator);
migrator.logout();
});

Expand Down Expand Up @@ -150,11 +145,11 @@ describe(["tier2", "@dc"], "Custom Migration Targets RBAC operations", function
clickByText(button, "Cancel");
};

const analyzeAndVerify = (analysis: Analysis) => {
const analyzeAndVerify = (analysis: Analysis, user?: User) => {
analysis.analyze();
cy.wait(10 * SEC);
analysis.verifyAnalysisStatus(AnalysisStatuses.completed);
analysis.openReport();
resetURL();
resetURL(user);
};
});
6 changes: 6 additions & 0 deletions cypress/e2e/tests/rbac/custom-rules.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,15 @@ describe(["@tier2"], "Custom Rules RBAC operations", function () {
logout();
});


it("Bug MTA-458 | Architect, Rules from public repository", function () {
architect.login();
analyzeAndVerify(analysisWithPublicRules, AnalysisStatuses.completed);
});

it("Architect, Rules from private repository with credentials", function () {
// Moved login here cause previous test should be skipped
architect.login();
analyzeAndVerify(analysisWithPrivateRules, AnalysisStatuses.completed);
});

Expand All @@ -146,12 +149,15 @@ describe(["@tier2"], "Custom Rules RBAC operations", function () {
architect.logout();
});


it("Bug MTA-458 | Migrator, Rules from public repository", function () {
migrator.login();
analyzeAndVerify(analysisWithPublicRules, AnalysisStatuses.completed);
});

it("Migrator, Rules from private repository with credentials", function () {
// Moved login here cause previous test should be skipped
migrator.login();
analyzeAndVerify(analysisWithPrivateRules, AnalysisStatuses.completed);
});

Expand Down
10 changes: 7 additions & 3 deletions cypress/utils/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,14 @@ export function logout(userName?: string): void {
cy.get("h1", { timeout: 15 * SEC }).contains("Sign in to your account");
}

export function resetURL(): void {
export function resetURL(user?: User): void {
cy.url().then(($url) => {
if ($url.includes("report") || $url.includes("tasks")) {
login();
if (!user) {
login();
} else {
user.login();
}
}
});
}
Expand Down Expand Up @@ -786,7 +790,7 @@ export function deleteAllMigrationWaves(currentPage = false): void {
cy.get(".pf-c-dropdown__toggle-button").click({ force: true });
clickByText(button, "Select page");
} else {
cy.get("input#bulk-selected-items-checkbox", {
cy.get("input#bulk-selected-apps-checkbox", {
timeout: 10 * SEC,
}).check({ force: true });
}
Expand Down
Loading