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

FAT-10294-C422050 #3217

Open
wants to merge 129 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
48ab214
Prepare framework for consortia
IhorBohdan Oct 31, 2023
33f56ab
Prepare framework for consortia
IhorBohdan Nov 2, 2023
b2abaa0
Prepare framework for consortia
IhorBohdan Nov 3, 2023
5ae1ee7
Prepare framework for consortia
IhorBohdan Nov 3, 2023
3151d32
Implementing of FAT-9484 (#2211)
IhorBohdan Nov 7, 2023
1829cd1
first implementation
ostapwd Nov 16, 2023
a1cd04f
add permissions to another affiliate
ostapwd Nov 14, 2023
359f68f
fixed merge conflicts
ostapwd Nov 17, 2023
64077c1
reset configs
ostapwd Nov 17, 2023
6937cd9
FAT-9550-C405520-consortia (#2432)
zentestuken Nov 30, 2023
715e147
FAT-9621/C405547 (#2540)
Sherzod-Kenjaev Dec 4, 2023
cda84cb
Implementing of FAT-9489 (#2587)
IhorBohdan Dec 5, 2023
2b6e658
Implementing of FAT-9485 (#2719)
IhorBohdan Dec 14, 2023
50672aa
FAT-9600-C397343 (#2729)
zentestuken Dec 15, 2023
3a68e30
Implementing of FAT-9488
IhorBohdan Dec 15, 2023
63d908b
Merge branch 'consortium_permissions' of https://github.com/folio-org…
IhorBohdan Dec 15, 2023
2ff965e
FAT-10165: test added (#2795)
zentestuken Dec 20, 2023
03d8506
FAT-9622/C422124-Consortia (#2801)
Sherzod-Kenjaev Dec 21, 2023
fcaec1e
C407751 (#2820)
nayimovag Dec 22, 2023
61a6277
FAT-9761-C407746 (#2738)
TetianaParanich Dec 22, 2023
d9692b5
added test C422141 (#2872)
Sherzod-Kenjaev Dec 26, 2023
4e3688f
C418647 (#2878)
nayimovag Dec 26, 2023
7c8f4fb
added test C405507 (#2906)
Sherzod-Kenjaev Dec 27, 2023
0e042f4
FAT-10216-C405531 (#2939)
TetianaParanich Jan 2, 2024
79d2dd5
FAT-9763-C407749 (#2846)
TetianaParanich Jan 2, 2024
2a3e32c
FAT-10432-C402767-Consortia (#2954)
zentestuken Jan 3, 2024
f608fac
added test C407654 (#2956)
Sherzod-Kenjaev Jan 5, 2024
441cca9
Implementing of FAT-10199 (#2979)
IhorBohdan Jan 5, 2024
1108baf
Implementing of FAT-9488 (#2985)
IhorBohdan Jan 5, 2024
7d2b21f
FAT-10468/C414981-Consortia (#2997)
Sherzod-Kenjaev Jan 8, 2024
7e59bc3
added test C414980 (#3015)
Sherzod-Kenjaev Jan 10, 2024
3bd4bf6
FAT-11144-C422238-Consortia (#3049)
zentestuken Jan 11, 2024
b31176e
C405119: Imported "MARC authority" record from Central tenant is disc…
sviatlana-stsiapanava Jan 11, 2024
32bb22d
Fat 10214 (#3053)
ostapwd Jan 11, 2024
03593bd
fixed merge conflicts
ostapwd Jan 14, 2024
a3151de
prettier and lint checks
ostapwd Jan 14, 2024
9bf3af9
updated tags
ostapwd Jan 14, 2024
5214858
added test C405559 (#3074)
Sherzod-Kenjaev Jan 15, 2024
5b363e9
fixed patron group
ostapwd Jan 15, 2024
162b08f
FAT-10497-C405142-Consortia (#3072)
zentestuken Jan 15, 2024
fa89cc3
C404390 (#3077)
nayimovag Jan 15, 2024
fc4b1bd
FAT-10201/C405560-Consortia (#3076)
Sherzod-Kenjaev Jan 16, 2024
8f0ea6e
C405519: Imported "MARC authority" record from Member tenant is not d…
sviatlana-stsiapanava Jan 16, 2024
2ff67b1
Implementing of FAT-10862 (#3079)
IhorBohdan Jan 16, 2024
2ae4d01
FAT-10096-C402769-Consortia (#3078)
zentestuken Jan 16, 2024
1a1dff7
Implementation of FAT-10196 (#3052)
IhorBohdan Jan 16, 2024
3761d32
FAT-10217-C405532 (#3022)
TetianaParanich Jan 16, 2024
1b59f04
FAT-10215-C405528 (#3021)
TetianaParanich Jan 16, 2024
7d8a733
C404400 (#3080)
nayimovag Jan 16, 2024
c1eeed4
Fat 10345 fat 10347 fat 10349 fat 10351 (#3082)
ostapwd Jan 17, 2024
86281f7
Merge branch 'consortium_permissions' of https://github.com/folio-org…
ostapwd Jan 17, 2024
19a331c
Fat 10346 fat 10348 fat 10350 fat 10352 (#3084)
ostapwd Jan 17, 2024
81639f4
Merge branch 'consortium_permissions' of https://github.com/folio-org…
ostapwd Jan 17, 2024
bfa1afa
added test C410814 (#3083)
Sherzod-Kenjaev Jan 18, 2024
1f6568c
FAT-10218-C405534 (#3023)
TetianaParanich Jan 18, 2024
a4d4e71
Implement FAT-10863 (#3088)
IhorBohdan Jan 18, 2024
a739a82
FAT-10219-C411726 (#3087)
TetianaParanich Jan 18, 2024
74a260f
Fat 10437 (#3089)
nayimovag Jan 18, 2024
87050af
FAT-10205/C397335 (#3090)
re-jas Jan 18, 2024
063a7b8
Implement of FAT-10864 (#3092)
IhorBohdan Jan 19, 2024
a5feeeb
FAT-10434: test added (#3091)
zentestuken Jan 19, 2024
3322431
added test C410819 (#3097)
Sherzod-Kenjaev Jan 21, 2024
50252fc
added test C405549 (#3103)
Sherzod-Kenjaev Jan 22, 2024
eaca1e9
test fixes (#3106)
zentestuken Jan 22, 2024
589931c
ECS tests fixes (#3107)
Sherzod-Kenjaev Jan 22, 2024
0a0e050
FAT-10276-C402335 (#3101)
TetianaParanich Jan 22, 2024
46cfe8e
FAT-10277-C402376 (#3102)
TetianaParanich Jan 22, 2024
c947a11
FAT-10281-C402763 (#3110)
TetianaParanich Jan 23, 2024
5e927ca
FAT-10278-C402760 (#3104)
TetianaParanich Jan 23, 2024
a247ba2
added test (#3109)
TetianaParanich Jan 23, 2024
ddc7ccb
FAT-10279-C402761 (#3108)
TetianaParanich Jan 23, 2024
578093a
FAT-10284-C409516 (#3117)
TetianaParanich Jan 24, 2024
69dc37b
added test (#3118)
TetianaParanich Jan 25, 2024
34d0b9e
FAT-10498-C405513-ECS (#3120)
zentestuken Jan 25, 2024
405f658
Implementing of FAT-10866 (#3121)
IhorBohdan Jan 25, 2024
91fd997
C410834 (#3122)
nayimovag Jan 26, 2024
d57ca07
Merge branch 'consortium_permissions' of https://github.com/folio-org…
ostapwd Jan 29, 2024
9a2a934
fixed merge conflicts
ostapwd Jan 30, 2024
332170d
FAT-10439 (#3131)
nayimovag Jan 30, 2024
503a4f2
FAT-10427/C402334-Consortia (#3130)
Sherzod-Kenjaev Jan 30, 2024
dd8bd7b
FAT-10481: test added (#3134)
zentestuken Jan 31, 2024
2c6c08d
added test C407696 (#3143)
Sherzod-Kenjaev Feb 1, 2024
881a17d
added test C411802 (#3144)
Sherzod-Kenjaev Feb 1, 2024
b6934a3
Fat 10440 (#3145)
nayimovag Feb 1, 2024
6eab893
Implement FAT-10226 (#3142)
IhorBohdan Feb 1, 2024
f800687
C405522: Imported "MARC authority" record from Member 1 tenant is not…
sviatlana-stsiapanava Feb 2, 2024
e0be614
FAT-10543-C402777 (#3148)
zentestuken Feb 2, 2024
862635f
FAT-10273-C411794 (#3149)
TetianaParanich Feb 2, 2024
04b121e
C404421: Apply "Shared" facet to the search result list in "Member" t…
sviatlana-stsiapanava Feb 5, 2024
8241203
Implementing of FAT-10876 (#3155)
IhorBohdan Feb 5, 2024
a3038dd
esc test fixes (#3156)
zentestuken Feb 5, 2024
f8804b9
FAT-10488/C405927 (#3157)
Sherzod-Kenjaev Feb 5, 2024
30f8a5a
FAT-10501-C405537 (#3159)
zentestuken Feb 5, 2024
b420755
C407754 (#3160)
nayimovag Feb 5, 2024
4f17437
FAT-10283 FAT-11369 FAT-10213 (#3158)
ostapwd Feb 5, 2024
742da5a
added test C407633 (#3161)
Sherzod-Kenjaev Feb 5, 2024
d7006b0
ecs test fixes (#3163)
Sherzod-Kenjaev Feb 5, 2024
ba13f7e
Implement FAT-10231 (#3162)
IhorBohdan Feb 5, 2024
60c0198
fixed C411384 (#3164)
TetianaParanich Feb 6, 2024
44fadc4
FAT-10288-C418582 (#3167)
TetianaParanich Feb 6, 2024
b3bcc9b
FAT-10502-C405544 (#3170)
zentestuken Feb 6, 2024
592ba5a
FAT-10475/C410818-Consortia (#3173)
Sherzod-Kenjaev Feb 7, 2024
8d65c27
FAT-11857 fix for pipelines
ostapwd Feb 6, 2024
8c2d4e4
FAT-10425/C400663-Consortia (#3175)
Sherzod-Kenjaev Feb 8, 2024
af37729
FAT-10289-C418583 (#3168)
TetianaParanich Feb 8, 2024
7606f3d
FAT-10271-C411791 (#3099)
TetianaParanich Feb 8, 2024
fc33cb9
FAT-10454-C404353 (#3181)
zentestuken Feb 9, 2024
3333647
FAT-10879/C410841 (#3182)
re-jas Feb 9, 2024
81e84ad
Add test case (#3186)
sviatlana-stsiapanava Feb 9, 2024
47f4f27
FAT-10479/C410739 (#3187)
Sherzod-Kenjaev Feb 12, 2024
795c185
FAT-10455: test added (#3189)
zentestuken Feb 12, 2024
bed679c
added test C410744 (#3199)
Sherzod-Kenjaev Feb 13, 2024
0b9f559
C402330 Use "Shared" facet when Search was not executed in "Member" t…
sviatlana-stsiapanava Feb 14, 2024
b696e38
FAT-11956-C422237 (#3200)
zentestuken Feb 14, 2024
224b73a
C410855 (#3202)
nayimovag Feb 14, 2024
beccff4
FAT-10314
ostapwd Feb 15, 2024
c8ea46d
Merge branch 'consortium_permissions' of https://github.com/folio-org…
ostapwd Feb 15, 2024
1bcefb3
added test for FAT-11380 (#3203)
ostapwd Feb 15, 2024
ca1044d
FAT-10318 (#3204)
ostapwd Feb 15, 2024
9528da5
C404449 Apply "Shared" facet to the browse result list in "Member" te…
sviatlana-stsiapanava Feb 15, 2024
1b5de8e
Fat 10317 fat 10315 (#3207)
ostapwd Feb 15, 2024
269c1a2
C410856 (#3209)
nayimovag Feb 16, 2024
7b60003
Implement FAT-10232 (#3206)
IhorBohdan Feb 16, 2024
2e5e275
added test
TetianaParanich Feb 17, 2024
458fd1e
added checks
TetianaParanich Feb 19, 2024
70714d9
fixed method
TetianaParanich Mar 4, 2024
7fec26c
Merge branch 'master' of https://github.com/folio-org/stripes-testing…
TetianaParanich Mar 18, 2024
37948fb
Merge branch 'master' of https://github.com/folio-org/stripes-testing…
TetianaParanich Apr 15, 2024
781b72a
uncommented code
TetianaParanich Apr 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions cypress.config.js
Expand Up @@ -21,9 +21,9 @@ module.exports = defineConfig({
pageLoadTimeout: 60000,
downloadsFolder: 'cypress/downloads',
env: {
OKAPI_HOST: 'https://folio-testing-cypress-okapi.ci.folio.org',
OKAPI_TENANT: 'diku',
diku_login: 'diku_admin',
OKAPI_HOST: 'https://folio-testing-sprint-okapi.ci.folio.org',
OKAPI_TENANT: 'cs00000int',
diku_login: 'ECSAdmin',
diku_password: 'admin',
is_kiwi_release: false,
downloadTimeout: 2000,
Expand Down Expand Up @@ -114,7 +114,7 @@ module.exports = defineConfig({

return result;
},
baseUrl: 'https://folio-testing-cypress-diku.ci.folio.org',
baseUrl: 'https://folio-testing-sprint-cs00000int.ci.folio.org',
testIsolation: false,
},
});
@@ -1,12 +1,12 @@
import Affiliations, { tenantNames } from '../../../support/dictionary/affiliations';
import Permissions from '../../../support/dictionary/permissions';
import Arrays from '../../../support/utils/arrays';
import Users from '../../../support/fragments/users/users';
import ConsortiumManager, {
settingsItems,
} from '../../../support/fragments/consortium-manager/consortiumManagerApp';
import SelectMembers from '../../../support/fragments/consortium-manager/modal/select-members';
import TopMenuNavigation from '../../../support/fragments/topMenuNavigation';
import Affiliations, { tenantNames } from '../../../support/dictionary/affiliations';
import Users from '../../../support/fragments/users/users';
import Arrays from '../../../support/utils/arrays';

describe('Consortia', () => {
describe('Consortium manager', () => {
Expand Down
@@ -1,12 +1,12 @@
import { tenantNames } from '../../../support/dictionary/affiliations';
import Permissions from '../../../support/dictionary/permissions';
import Arrays from '../../../support/utils/arrays';
import Users from '../../../support/fragments/users/users';
import ConsortiumManager, {
settingsItems,
} from '../../../support/fragments/consortium-manager/consortiumManagerApp';
import SelectMembers from '../../../support/fragments/consortium-manager/modal/select-members';
import TopMenuNavigation from '../../../support/fragments/topMenuNavigation';
import { tenantNames } from '../../../support/dictionary/affiliations';
import Users from '../../../support/fragments/users/users';
import Arrays from '../../../support/utils/arrays';

describe('Consortia', () => {
describe('Consortium manager', () => {
Expand Down
@@ -1,12 +1,12 @@
import Affiliations, { tenantNames } from '../../../support/dictionary/affiliations';
import Permissions from '../../../support/dictionary/permissions';
import Arrays from '../../../support/utils/arrays';
import Users from '../../../support/fragments/users/users';
import ConsortiumManager, {
settingsItems,
} from '../../../support/fragments/consortium-manager/consortiumManagerApp';
import SelectMembers from '../../../support/fragments/consortium-manager/modal/select-members';
import TopMenuNavigation from '../../../support/fragments/topMenuNavigation';
import Affiliations, { tenantNames } from '../../../support/dictionary/affiliations';
import Users from '../../../support/fragments/users/users';
import Arrays from '../../../support/utils/arrays';

describe('Consortia', () => {
describe('Consortium manager', () => {
Expand Down
Expand Up @@ -60,7 +60,9 @@ describe('Inventory', () => {
InstanceRecordView.edit();
InstanceRecordEdit.waitLoading();

InstanceRecordEdit.checkInstanceHeader(` Edit shared instance • ${testData.instance.instanceTitle}`);
InstanceRecordEdit.checkInstanceHeader(
` Edit shared instance • ${testData.instance.instanceTitle}`,
);
},
);
});
Expand Down
@@ -0,0 +1,183 @@
import moment from 'moment';
import uuid from 'uuid';
import Affiliations, { tenantNames } from '../../../../support/dictionary/affiliations';
import Permissions from '../../../../support/dictionary/permissions';
import InventoryInstances from '../../../../support/fragments/inventory/inventoryInstances';
import ConsortiumManager from '../../../../support/fragments/settings/consortium-manager/consortium-manager';
import TopMenu from '../../../../support/fragments/topMenu';
import DateTools from '../../../../support/utils/dateTools';
import InventoryInstance from '../../../../support/fragments/inventory/inventoryInstance';
import getRandomPostfix from '../../../../support/utils/stringTools';
// import InventorySearchAndFilter from '../../../../support/fragments/inventory/inventorySearchAndFilter';

describe('Inventory', () => {
describe('Instance', () => {
let user;
// let instanceHRID;
const instanceData = {
today: DateTools.getFormattedDate({ date: new Date() }, 'YYYY-MM-DD'),
instanceStatusTerm: 'Batch Loaded (consortium: batch)',
instanceStatusTermUI: 'Batch Loaded',
instanceTitle: `C422050 instanceTitle${getRandomPostfix()}`,
statisticalCode: 'ARL (Collection stats): books - Book, print (books)',
adminNote: `Instance admin note${getRandomPostfix()}`,
instanceIdentifier: [
{ type: 'ISBN', value: uuid() },
{ type: 'ISBN', value: uuid() },
{ type: 'ISBN', value: uuid() },
],
contributor: {
name: `autotest_contributor${getRandomPostfix()}`,
nameType: 'Personal name',
},
publication: { place: 'autotest_publication_place', date: moment.utc().format() },
edition: '2023',
};

before('Create test data', () => {
cy.getAdminToken();
cy.createTempUser([Permissions.inventoryAll.gui]).then((userProperties) => {
user = userProperties;

cy.assignAffiliationToUser(Affiliations.College, user.userId);
cy.setTenant(Affiliations.College);
cy.assignPermissionsToExistingUser(user.userId, [
Permissions.inventoryAll.gui,
Permissions.consortiaInventoryShareLocalInstance.gui,
]);
cy.resetTenant();

cy.login(user.username, user.password, {
path: TopMenu.inventoryPath,
waiter: InventoryInstances.waitContentLoading,
});
ConsortiumManager.switchActiveAffiliation(tenantNames.central, tenantNames.college);
ConsortiumManager.checkCurrentTenantInTopMenu(tenantNames.college);
});
});

// after('Delete test data', () => {
// cy.resetTenant();
// cy.getAdminToken();
// Users.deleteViaApi(user.userId);
// cy.setTenant(Affiliations.College);
// InventoryHoldings.deleteHoldingRecordViaApi(testData.holding.id);
// Locations.deleteViaApi(testData.collegeLocation);
// InventoryInstance.deleteInstanceViaApi(testData.instanceIds[0]);
// });

// const verifyCreatedInstanceDetails = () => {}

it(
'C422050 (Consortia) Verify the instance data is not lost, when promoting Source = FOLIO instance (consortia) (folijet)',
{ tags: ['criticalPathECS', 'folijet'] },
() => {
const InventoryNewInstance = InventoryInstances.addNewInventory();
InventoryNewInstance.fillInstanceFields({
catalogedDate: instanceData.today,
instanceStatus: instanceData.instanceStatusTermUI,
statisticalCode: instanceData.statisticalCode,
adminNote: instanceData.adminNote,
title: instanceData.instanceTitle,
instanceIdentifier: instanceData.instanceIdentifier,
contributor: instanceData.contributor,
publication: instanceData.publication,
edition: instanceData.edition,
description: 'autotest_physical_description',
resourceType: 'other',
natureOfContent: ['audiobook', 'audiobook', 'audiobook'],
format: ['audio -- other', 'audio -- other', 'audio -- other'],
language: 'English',
frequency: [
`Publication frequency${getRandomPostfix()}`,
`Publication frequency${getRandomPostfix()}`,
`Publication frequency${getRandomPostfix()}`,
],
instanceNote: [
{ type: 'Bibliography note', value: `Instance note ${getRandomPostfix()}` },
{ type: 'Bibliography note', value: `Instance note ${getRandomPostfix()}` },
{ type: 'Bibliography note', value: `Instance note ${getRandomPostfix()}` },
],
electronicAccess: {
relationship: 'Resource',
uri: 'test@mail.com',
linkText: 'test@mail.com',
},
subject: ['test', 'test', 'test'],
classification: [
{ type: 'Dewey', value: `classification${getRandomPostfix()}` },
{ type: 'Dewey', value: `classification${getRandomPostfix()}` },
{ type: 'Dewey', value: `classification${getRandomPostfix()}` },
],
});
InventoryNewInstance.clickSaveAndCloseButton();
InventoryInstance.checkInstanceDetails2([
{ key: 'Cataloged date', value: instanceData.today },
{ key: 'Instance status term', value: instanceData.instanceStatusTerm },
{ key: 'Resource title', value: instanceData.title },
]);
// instanceData.statisticalCode,
// instanceData.adminNote,
// instanceData.instanceTitle,
// // instanceData.instanceIdentifier,
// instanceData.contributor,
// instanceData.publication,
// instanceData.edition,

// description: 'autotest_physical_description',
// resourceType: 'other',
// { key: 'Resource title', value: instanceData.title },
// natureOfContent: ['audiobook', 'audiobook', 'audiobook'],
// format: ['audio -- other', 'audio -- other', 'audio -- other'],
// language: 'English',
// frequency: [
// `Publication frequency${getRandomPostfix()}`,
// `Publication frequency${getRandomPostfix()}`,
// `Publication frequency${getRandomPostfix()}`,
// ],
// instanceNote: [
// { type: 'Bibliography note', value: `Instance note ${getRandomPostfix()}` },
// { type: 'Bibliography note', value: `Instance note ${getRandomPostfix()}` },
// { type: 'Bibliography note', value: `Instance note ${getRandomPostfix()}` },
// ],
// electronicAccess: {
// relationship: 'Resource',
// uri: 'test@mail.com',
// linkText: 'test@mail.com',
// },
// subject: ['test', 'test', 'test'],
// classification: [
// { type: 'Dewey', value: `classification${getRandomPostfix()}` },
// { type: 'Dewey', value: `classification${getRandomPostfix()}` },
// { type: 'Dewey', value: `classification${getRandomPostfix()}` },
// ],
// { key: 'Statistical code', value: 'Book, print (books)' },
// { key: 'Administrative note', value: instanceData.adminNote },
// ]);

// InventoryInstance.shareInstance();
// InventoryInstance.verifyCalloutMessage(
// `Local instance ${instanceData.instanceTitle} has been successfully shared`,
// );
// InventoryInstance.waitInstanceRecordViewOpened(instanceData.instanceTitle);
// cy.reload();
// InventoryInstance.getAssignedHRID().then((initialInstanceHrId) => {
// instanceHRID = initialInstanceHrId;

// InventoryInstance.checkInstanceDetails([
// // { key: 'Source', value: INSTANCE_SOURCE_NAMES.FOLIO },
// ]);

// ConsortiumManager.checkCurrentTenantInTopMenu(tenantNames.college);
// ConsortiumManager.switchActiveAffiliation(tenantNames.college, tenantNames.central);
// inventorySearchAndFilter.searchInstanceByHRID(instanceHRID);
// InventoryInstances.selectInstance();
// InventoryInstance.waitLoading();
// InventoryInstance.checkInstanceDetails([
// // { key: 'Source', value: INSTANCE_SOURCE_NAMES.FOLIO },
// ]);
// });
},
);
});
});
Expand Up @@ -110,7 +110,11 @@ describe('Data Import', () => {
QuickMarcEditor.waitLoading();
QuickMarcEditor.checkContent('$9 000442923', 6);
QuickMarcEditor.checkPaneheaderContains(`Source: ${user.username}`);
QuickMarcEditor.selectFieldsDropdownOption('LDR', 'Item', MARC_HOLDING_LDR_FIELD_ITEM_DROPDOWN.I);
QuickMarcEditor.selectFieldsDropdownOption(
'LDR',
'Item',
MARC_HOLDING_LDR_FIELD_ITEM_DROPDOWN.I,
);
QuickMarcEditor.addValuesToExistingField(
6,
'852',
Expand Down