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

Poppy #2685

Closed
wants to merge 41 commits into from
Closed

Poppy #2685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
25bd9a5
Master to poppy (#2636)
IhorBohdan Dec 7, 2023
afeb8f5
changed TextArea to TextField
TetianaParanich Dec 8, 2023
abac88a
fixed tests
TetianaParanich Dec 9, 2023
d79be30
added retry
TetianaParanich Dec 9, 2023
cd9e3d8
fixed tests
TetianaParanich Dec 11, 2023
cb06121
fixed test
TetianaParanich Dec 11, 2023
9fda9a3
Spitfire poppy fixes (#2675)
zentestuken Dec 11, 2023
166db3e
fixed tests
TetianaParanich Dec 11, 2023
624b076
Merge branch 'poppy' of https://github.com/folio-org/stripes-testing …
TetianaParanich Dec 11, 2023
3ac8ea7
system tag for vega
ostapwd Dec 12, 2023
20c2a5b
Merge branch 'poppy' of https://github.com/folio-org/stripes-testing …
ostapwd Dec 12, 2023
7e738b3
Fix thunderjet test
kirstaVova Dec 13, 2023
5bd9c48
Spitfire poppy fixes (#2710)
zentestuken Dec 13, 2023
fa12e64
Spitfire poppy fixes (#2712)
zentestuken Dec 13, 2023
63a9149
Spitfire poppy fixes (#2718)
zentestuken Dec 14, 2023
f05c7e9
Spitfire poppy fixes (#2722)
zentestuken Dec 14, 2023
10ce8f4
fixed tests (#2715)
TetianaParanich Dec 15, 2023
e90ba1a
updated package.json
ostapwd Jan 25, 2024
aea013e
fix reset filters button
IhorBohdan Jan 26, 2024
a9fb5e2
add reset filters to it
IhorBohdan Jan 26, 2024
b7c6296
poppy fixes (#3126)
zentestuken Jan 26, 2024
f3d20e9
fixed tests (#3128)
TetianaParanich Jan 29, 2024
76babfd
FAT-11857 fix for pipelines
ostapwd Feb 6, 2024
757d967
minor fixes for 2 tests (#3192)
zentestuken Feb 12, 2024
952a6f7
fixed tests (#3196)
TetianaParanich Feb 13, 2024
263ca91
Change availableProxie (#3194)
sviatlana-stsiapanava Feb 13, 2024
8a010aa
added txc resolution
ostapwd Mar 4, 2024
ca03818
C375256 fix (#3294)
zentestuken Mar 6, 2024
afebb21
spitfire minor fixes (#3307)
zentestuken Mar 11, 2024
37048a3
spitfire-minor-fixes (#3391)
zentestuken Mar 27, 2024
1a3b985
fixes for vega
ostapwd Mar 28, 2024
3dffac6
Merge branch 'poppy' of https://github.com/folio-org/stripes-testing …
ostapwd Mar 28, 2024
06c2759
Poppy folijet fix (#3393)
TetianaParanich Mar 28, 2024
61f7133
fixed tests (#3462)
TetianaParanich Apr 10, 2024
0fe1b88
Thunderjet Poppy fix (#3489)
IhorBohdan Apr 17, 2024
5950658
fix for poppy FAT-12770 (#3490)
ostapwd Apr 17, 2024
ac4379a
Fix test cases for poppy (#3492)
sviatlana-stsiapanava Apr 17, 2024
3867ea2
FAT-12858 (#3521)
nayimovag Apr 24, 2024
ce9ca37
poppy fixes (#3523)
Sherzod-Kenjaev Apr 24, 2024
b9aef03
FAT-12859 Fix test cases for poppy (#3522)
sviatlana-stsiapanava Apr 24, 2024
f3f649e
fixed C380485 (#3526)
TetianaParanich Apr 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .eslintrc
Expand Up @@ -12,9 +12,10 @@
},
"plugins": ["cypress", "import"],
"rules": {
"no-unused-vars": "error",
"cypress/no-assigning-return-values": "error",
"cypress/assertion-before-screenshot": "warn",
"cypress/no-force": "warn",
"cypress/no-async-tests": "error"
"no-duplicate-imports": "error"
}
}
1 change: 0 additions & 1 deletion .github/workflows/build-npm.yml
Expand Up @@ -65,7 +65,6 @@ jobs:

- name: Run yarn lint
run: yarn lint
continue-on-error: true

- name: Run yarn test
run: xvfb-run --server-args="-screen 0 1024x768x24" yarn test $YARN_TEST_OPTIONS
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Expand Up @@ -13,4 +13,5 @@ cypress/screenshots

allure-results

videos
videos
.vs
22 changes: 19 additions & 3 deletions cypress.config.js
@@ -1,8 +1,9 @@
const { defineConfig } = require('cypress');
const path = require('path');
const globby = require('globby');
const { rmdir, unlink } = require('fs');
const csvToJson = require('convert-csv-to-json');
const { downloadFile } = require('cypress-downloadfile/lib/addPlugin');
const { rmdir, unlink } = require('fs');
const fs = require('fs');
const allureWriter = require('@shelex/cypress-allure-plugin/writer');
const { cloudPlugin } = require('cypress-cloud/plugin');
Expand All @@ -18,13 +19,14 @@ module.exports = defineConfig({
video: false,
defaultCommandTimeout: 101000,
pageLoadTimeout: 120000,
downloadsFolder: 'cypress/downloads',
env: {
OKAPI_HOST: 'https://okapi-bugfest-poppy-aqa.int.aws.folio.org',
OKAPI_TENANT: 'fs09000003',
diku_login: 'folio-aqa',
diku_password: 'Folio-aqa1',
is_kiwi_release: false,
downloadTimeout: 1000,
downloadTimeout: 2000,
allure: 'true',
grepFilterSpecs: true,
grepOmitFiltered: true,
Expand All @@ -35,6 +37,12 @@ module.exports = defineConfig({
allureWriter(on, config);

on('task', {
log(message) {
// eslint-disable-next-line no-console
console.log(message);
return null;
},

async findFiles(mask) {
if (!mask) {
throw new Error('Missing a file mask to search');
Expand All @@ -48,6 +56,11 @@ module.exports = defineConfig({

return list;
},

convertCsvToJson(fileName) {
return csvToJson.supportQuotedField(true).fieldDelimiter(',').getJsonFromCsv(fileName);
},

downloadFile,

deleteFolder(folderName) {
Expand Down Expand Up @@ -92,7 +105,10 @@ module.exports = defineConfig({
const configCloud = await cloudPlugin(on, config);

// eslint-disable-next-line global-require
const result = await require('cypress-testrail-simple/src/plugin')(on, configCloud);
const result = require('@cypress/grep/src/plugin')(configCloud);

// eslint-disable-next-line global-require
await require('cypress-testrail-simple/src/plugin')(on, config);

return result;
},
Expand Down
@@ -1,14 +1,12 @@
import permissions from '../../support/dictionary/permissions';
import testType from '../../support/dictionary/testTypes';
import devTeams from '../../support/dictionary/devTeams';
import getRandomPostfix from '../../support/utils/stringTools';
import DateTools from '../../support/utils/dateTools';
import FiscalYears from '../../support/fragments/finance/fiscalYears/fiscalYears';
import TopMenu from '../../support/fragments/topMenu';
import FinanceHelp from '../../support/fragments/finance/financeHelper';
import SettingsMenu from '../../support/fragments/settingsMenu';
import FiscalYears from '../../support/fragments/finance/fiscalYears/fiscalYears';
import AcquisitionUnits from '../../support/fragments/settings/acquisitionUnits/acquisitionUnits';
import SettingsMenu from '../../support/fragments/settingsMenu';
import TopMenu from '../../support/fragments/topMenu';
import Users from '../../support/fragments/users/users';
import DateTools from '../../support/utils/dateTools';
import getRandomPostfix from '../../support/utils/stringTools';

describe('Acquisition Units', () => {
const defaultAcquisitionUnit = { ...AcquisitionUnits.defaultAcquisitionUnit };
Expand Down Expand Up @@ -87,7 +85,7 @@ describe('Acquisition Units', () => {

it(
'C374168 Acquisition unit restrictions for "Fiscal year" records (View, Edit, Create, Delete options are active) when user is assigned to acquisition unit (thunderjet)',
{ tags: [testType.criticalPath, devTeams.thunderjet] },
{ tags: ['criticalPath', 'thunderjet'] },
() => {
FinanceHelp.searchByAll(firstFiscalYear.name);
FiscalYears.selectFisacalYear(firstFiscalYear.name);
Expand Down
@@ -1,11 +1,9 @@
import permissions from '../../support/dictionary/permissions';
import testType from '../../support/dictionary/testTypes';
import devTeams from '../../support/dictionary/devTeams';
import FiscalYears from '../../support/fragments/finance/fiscalYears/fiscalYears';
import TopMenu from '../../support/fragments/topMenu';
import FinanceHelp from '../../support/fragments/finance/financeHelper';
import SettingsMenu from '../../support/fragments/settingsMenu';
import FiscalYears from '../../support/fragments/finance/fiscalYears/fiscalYears';
import AcquisitionUnits from '../../support/fragments/settings/acquisitionUnits/acquisitionUnits';
import SettingsMenu from '../../support/fragments/settingsMenu';
import TopMenu from '../../support/fragments/topMenu';
import Users from '../../support/fragments/users/users';

describe('Acquisition Units', () => {
Expand Down Expand Up @@ -85,7 +83,7 @@ describe('Acquisition Units', () => {

it(
'C375079 Acquisition unit restrictions for "Fiscal year" records (Create, Delete options are active) when user is NOT assigned to acquisition unit (thunderjet)',
{ tags: [testType.criticalPath, devTeams.thunderjet] },
{ tags: ['criticalPath', 'thunderjet'] },
() => {
FinanceHelp.searchByAll(defaultFiscalYear.name);
FiscalYears.selectFisacalYear(defaultFiscalYear.name);
Expand Down
@@ -1,11 +1,9 @@
import permissions from '../../support/dictionary/permissions';
import testType from '../../support/dictionary/testTypes';
import devTeams from '../../support/dictionary/devTeams';
import FiscalYears from '../../support/fragments/finance/fiscalYears/fiscalYears';
import TopMenu from '../../support/fragments/topMenu';
import FinanceHelp from '../../support/fragments/finance/financeHelper';
import SettingsMenu from '../../support/fragments/settingsMenu';
import FiscalYears from '../../support/fragments/finance/fiscalYears/fiscalYears';
import AcquisitionUnits from '../../support/fragments/settings/acquisitionUnits/acquisitionUnits';
import SettingsMenu from '../../support/fragments/settingsMenu';
import TopMenu from '../../support/fragments/topMenu';
import Users from '../../support/fragments/users/users';

describe('Acquisition Units', () => {
Expand Down Expand Up @@ -83,7 +81,7 @@ describe('Acquisition Units', () => {

it(
'C375078 Acquisition unit restrictions for "Fiscal year" records (Edit, Create, Delete options are active) when user is NOT assigned to acquisition unit (thunderjet)',
{ tags: [testType.criticalPath, devTeams.thunderjet] },
{ tags: ['criticalPath', 'thunderjet'] },
() => {
FinanceHelp.searchByAll(defaultFiscalYear.name);
FiscalYears.selectFisacalYear(defaultFiscalYear.name);
Expand Down
@@ -1,11 +1,9 @@
import permissions from '../../support/dictionary/permissions';
import testType from '../../support/dictionary/testTypes';
import devTeams from '../../support/dictionary/devTeams';
import FiscalYears from '../../support/fragments/finance/fiscalYears/fiscalYears';
import TopMenu from '../../support/fragments/topMenu';
import FinanceHelp from '../../support/fragments/finance/financeHelper';
import SettingsMenu from '../../support/fragments/settingsMenu';
import FiscalYears from '../../support/fragments/finance/fiscalYears/fiscalYears';
import AcquisitionUnits from '../../support/fragments/settings/acquisitionUnits/acquisitionUnits';
import SettingsMenu from '../../support/fragments/settingsMenu';
import TopMenu from '../../support/fragments/topMenu';
import Users from '../../support/fragments/users/users';

describe('Acquisition Units', () => {
Expand Down Expand Up @@ -80,8 +78,8 @@ describe('Acquisition Units', () => {
});

it(
'C375073 Acquisition unit restrictions for "Fiscal year" records (View, Edit, Create, Delete options are restricted) when user is NOT assigned to acquisition unit (thunderjet)',
{ tags: [testType.criticalPath, devTeams.thunderjet] },
'C375073 Acquisition unit restrictions for "Fiscal year" records (Edit, Create, Delete options are active) when user is NOT assigned to acquisition unit (thunderjet)',
{ tags: ['criticalPath', 'thunderjet'] },
() => {
FinanceHelp.searchByAll(defaultFiscalYear.name);
FiscalYears.checkNoResultsMessage(
Expand Down
@@ -1,11 +1,10 @@
import Agreements from '../../../support/fragments/agreements/agreements';
import TopMenu from '../../../support/fragments/topMenu';
import AgreementViewDetails from '../../../support/fragments/agreements/agreementViewDetails';
import Agreements from '../../../support/fragments/agreements/agreements';
import EditAgreement from '../../../support/fragments/agreements/editAgreement';
import Users from '../../../support/fragments/users/users';
import TopMenu from '../../../support/fragments/topMenu';
import SelectUser from '../../../support/fragments/users/modal/selectUser';
import Users from '../../../support/fragments/users/users';
import { randomFourDigitNumber } from '../../../support/utils/stringTools';
import { TestTypes, DevTeams } from '../../../support/dictionary';

let agreementId;
const firstUser = {
Expand Down Expand Up @@ -64,7 +63,7 @@ describe('Agreement Internal Contacts', () => {

it(
'C1314 Assign a library staff member to an Agreement (erm) (TaaS)',
{ tags: [TestTypes.extendedPath, DevTeams.erm] },
{ tags: ['extendedPath', 'erm'] },
() => {
AgreementViewDetails.agreementListClick(Agreements.defaultAgreement.name);
AgreementViewDetails.gotoEdit();
Expand Down
@@ -1,10 +1,9 @@
import { including } from '@interactors/html';
import Agreements from '../../../support/fragments/agreements/agreements';
import SearchAndFilterAgreements from '../../../support/fragments/agreements/searchAndFilterAgreements';
import TopMenu from '../../../support/fragments/topMenu';
import Users from '../../../support/fragments/users/users';
import { randomFourDigitNumber } from '../../../support/utils/stringTools';
import { TestTypes, DevTeams } from '../../../support/dictionary';
import SearchAndFilterAgreements from '../../../support/fragments/agreements/searchAndFilterAgreements';

let agreement;
let agreementId;
Expand Down Expand Up @@ -48,7 +47,7 @@ describe('Agreement Internal Contacts', () => {

it(
'C3460 Filter agreements by library staff member assigned (erm) (TaaS)',
{ tags: [TestTypes.extendedPath, DevTeams.erm] },
{ tags: ['extendedPath', 'erm'] },
() => {
SearchAndFilterAgreements.openInternalContactsFilter();
SearchAndFilterAgreements.clickSelectInternalContactButton();
Expand Down
@@ -1,10 +1,9 @@
import Agreements from '../../../support/fragments/agreements/agreements';
import TopMenu from '../../../support/fragments/topMenu';
import { TestTypes, DevTeams } from '../../../support/dictionary';
import AgreementLineInformation from '../../../support/fragments/agreements/agreementLineInformation';
import AgreementLines from '../../../support/fragments/agreements/agreementLines';
import AgreementViewDetails from '../../../support/fragments/agreements/agreementViewDetails';
import Agreements from '../../../support/fragments/agreements/agreements';
import NewAgreementLine from '../../../support/fragments/agreements/newAgreementLine';
import AgreementLineInformation from '../../../support/fragments/agreements/agreementLineInformation';
import TopMenu from '../../../support/fragments/topMenu';
import { randomFourDigitNumber } from '../../../support/utils/stringTools';

let agreementId;
Expand Down Expand Up @@ -32,7 +31,7 @@ describe('Agreement Lines', () => {

it(
'C15829 Add agreement line with description only (erm) (TaaS)',
{ tags: [TestTypes.extendedPath, DevTeams.erm] },
{ tags: ['extendedPath', 'erm'] },
() => {
AgreementViewDetails.agreementListClick(Agreements.defaultAgreement.name);
AgreementViewDetails.verifyAgreementDetailsIsDisplayedByTitle(
Expand Down
@@ -1,9 +1,8 @@
import Agreements from '../../../support/fragments/agreements/agreements';
import TopMenu from '../../../support/fragments/topMenu';
import { TestTypes, DevTeams } from '../../../support/dictionary';
import AgreementLineInformation from '../../../support/fragments/agreements/agreementLineInformation';
import AgreementLines from '../../../support/fragments/agreements/agreementLines';
import AgreementViewDetails from '../../../support/fragments/agreements/agreementViewDetails';
import AgreementLineInformation from '../../../support/fragments/agreements/agreementLineInformation';
import Agreements from '../../../support/fragments/agreements/agreements';
import TopMenu from '../../../support/fragments/topMenu';

let agreementLine;
let agreementId;
Expand Down Expand Up @@ -36,7 +35,7 @@ describe('Agreement Lines', () => {

it(
'C343340 Add tags to an Agreement Line record (erm) (TaaS)',
{ tags: [TestTypes.extendedPath, DevTeams.erm] },
{ tags: ['extendedPath', 'erm'] },
() => {
AgreementViewDetails.agreementListClick(Agreements.defaultAgreement.name);
AgreementViewDetails.verifyAgreementDetailsIsDisplayedByTitle(
Expand Down
57 changes: 25 additions & 32 deletions cypress/e2e/agreements/agreement-lines/delete-agreement-line.cy.js
@@ -1,11 +1,10 @@
import Agreements from '../../../support/fragments/agreements/agreements';
import AgreementLineInformation from '../../../support/fragments/agreements/agreementLineInformation';
import AgreementLines from '../../../support/fragments/agreements/agreementLines';
import TopMenu from '../../../support/fragments/topMenu';
import { DevTeams, TestTypes } from '../../../support/dictionary';
import AgreementViewDetails from '../../../support/fragments/agreements/agreementViewDetails';
import SearchAndFilterAgreementLines from '../../../support/fragments/agreements/searchAndFilterAgreementLines';
import AgreementLineInformation from '../../../support/fragments/agreements/agreementLineInformation';
import Agreements from '../../../support/fragments/agreements/agreements';
import DeleteConfirmationModal from '../../../support/fragments/agreements/modals/deleteConfirmationModal';
import SearchAndFilterAgreementLines from '../../../support/fragments/agreements/searchAndFilterAgreementLines';
import TopMenu from '../../../support/fragments/topMenu';

let agreementLine;
let agreementId;
Expand All @@ -31,31 +30,25 @@ describe('Agreement Lines', () => {
Agreements.deleteViaApi(agreementId);
});

it(
'C405546 Delete Agreement Line (erm) (TaaS)',
{ tags: [TestTypes.extendedPath, DevTeams.erm] },
() => {
AgreementViewDetails.openAgreementLineFilter();
SearchAndFilterAgreementLines.verifyFilterOptions();

SearchAndFilterAgreementLines.search(agreementLine.description);
AgreementLines.verifyAgreementLinesCount(1);

AgreementLines.agreementLinesListClick(agreementLine.description);
AgreementLineInformation.waitLoadingWithExistingLine(agreementLine.description);
AgreementLineInformation.verifyActionsButtons();

AgreementLineInformation.gotoDelete();
DeleteConfirmationModal.waitLoading();

DeleteConfirmationModal.confirmDeleteAgreementLine();
AgreementViewDetails.verifyAgreementDetailsIsDisplayedByTitle(
Agreements.defaultAgreement.name,
);

AgreementViewDetails.openAgreementLineFilter();
SearchAndFilterAgreementLines.search(agreementLine.description);
AgreementLines.verifyAgreementLinesCount(0);
},
);
it('C405546 Delete Agreement Line (erm) (TaaS)', { tags: ['extendedPath', 'erm'] }, () => {
AgreementViewDetails.openAgreementLineFilter();
SearchAndFilterAgreementLines.verifyFilterOptions();

SearchAndFilterAgreementLines.search(agreementLine.description);
AgreementLines.verifyAgreementLinesCount(1);

AgreementLines.agreementLinesListClick(agreementLine.description);
AgreementLineInformation.waitLoadingWithExistingLine(agreementLine.description);
AgreementLineInformation.verifyActionsButtons();

AgreementLineInformation.gotoDelete();
DeleteConfirmationModal.waitLoading();

DeleteConfirmationModal.confirmDeleteAgreementLine();
AgreementViewDetails.verifyAgreementDetailsIsDisplayedByTitle(Agreements.defaultAgreement.name);

AgreementViewDetails.openAgreementLineFilter();
SearchAndFilterAgreementLines.search(agreementLine.description);
AgreementLines.verifyAgreementLinesCount(0);
});
});
29 changes: 11 additions & 18 deletions cypress/e2e/agreements/agreement-lines/view-an-agreement-line.cy.js
@@ -1,8 +1,7 @@
import Agreements from '../../../support/fragments/agreements/agreements';
import TopMenu from '../../../support/fragments/topMenu';
import { TestTypes, DevTeams } from '../../../support/dictionary';
import AgreementLines from '../../../support/fragments/agreements/agreementLines';
import AgreementViewDetails from '../../../support/fragments/agreements/agreementViewDetails';
import Agreements from '../../../support/fragments/agreements/agreements';
import TopMenu from '../../../support/fragments/topMenu';

let agreementLine;
let agreementId;
Expand Down Expand Up @@ -33,20 +32,14 @@ describe('Agreement Lines', () => {
Agreements.deleteViaApi(agreementId);
});

it(
'C761 View an Agreement line (erm) (TaaS)',
{ tags: [TestTypes.extendedPath, DevTeams.erm] },
() => {
AgreementViewDetails.agreementListClick(Agreements.defaultAgreement.name);
AgreementViewDetails.verifyAgreementDetailsIsDisplayedByTitle(
Agreements.defaultAgreement.name,
);
AgreementViewDetails.verifyAgreementLinesCount('1');
it('C761 View an Agreement line (erm) (TaaS)', { tags: ['extendedPath', 'erm'] }, () => {
AgreementViewDetails.agreementListClick(Agreements.defaultAgreement.name);
AgreementViewDetails.verifyAgreementDetailsIsDisplayedByTitle(Agreements.defaultAgreement.name);
AgreementViewDetails.verifyAgreementLinesCount('1');

AgreementViewDetails.openAgreementLineSection();
AgreementViewDetails.verifySpecialAgreementLineRow({
description: agreementLine.description,
});
},
);
AgreementViewDetails.openAgreementLineSection();
AgreementViewDetails.verifySpecialAgreementLineRow({
description: agreementLine.description,
});
});
});