Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: lint issue
Browse files Browse the repository at this point in the history
@ngunner15
ngunner15 committed Jan 14, 2025
1 parent be67f62 commit 82a937c
Showing 6 changed files with 78 additions and 75 deletions.
5 changes: 2 additions & 3 deletions frontend/cypress/e2e/smoke-test/a-class-seedlot-reg-form-orchard.cy.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import prefix from '../../../src/styles/classPrefix';
import { THIRTY_SECONDS } from '../../constants';
import { THIRTY_SECONDS, TYPE_DELAY } from '../../constants';
import { SeedlotRegFixtureType } from '../../definitions';
import { TYPE_DELAY } from '../../constants';

describe('A Class Seedlot Registration form, Orchard', () => {
let regFormData: {
@@ -558,7 +557,7 @@ describe('A Class Seedlot Registration form, Orchard', () => {

cy.get('#orchard-is-regional')
.should('be.checked');

cy.get('#orchard-breading-perc-helper-text')
.should('have.text', regFormData.orchard.pollenHelperText);

4 changes: 2 additions & 2 deletions frontend/cypress/e2e/smoke-test/a-class-seedlot-reg-form-ownership.cy.ts
View file
Original file line number Diff line number Diff line change
@@ -68,14 +68,14 @@ describe('A Class Seedlot Registration form, Ownership', () => {

// Check the checkbox if unchecked
cy.get('#default-owner-checkbox')
.then($checkbox => {
.then(($checkbox) => {
if ($checkbox.is(':not(:checked)')) {
cy.get('#default-owner-checkbox').check({ force: true });
// Save changes
cy.saveSeedlotRegFormProgress();
}
})
.should("be.checked");
.should('be.checked');

cy.get(`.${prefix}--accordion__title`)
.find('.item-title-section')
10 changes: 6 additions & 4 deletions ...end/cypress/e2e/smoke-test/a-class-seedlot-reg-form-parent-tree-calculations-part-1.cy.ts
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable no-loop-func */
import prefix from '../../../src/styles/classPrefix';

describe('A Class Seedlot Registration form, Parent Tree Calculations Part 1', () => {
@@ -108,8 +109,7 @@ describe('A Class Seedlot Registration form, Parent Tree Calculations Part 1', (
.find('td:nth-child(2) input')
.invoke('val')
.then(($value: any) => {
totalConeCount = totalConeCount + Number($value);

totalConeCount += Number($value);
if (i === (totalParentTrees - 1)) {
// Check total cone counts
cy.get('#totalnumber\\ of\\ cone\\ count')
@@ -126,7 +126,7 @@ describe('A Class Seedlot Registration form, Parent Tree Calculations Part 1', (
.find('td:nth-child(3) input')
.invoke('val')
.then(($value) => {
totalPollenCount = totalPollenCount + Number($value);
totalPollenCount += Number($value);

if (i === (totalParentTrees - 1)) {
// Check total pollen counts
@@ -143,6 +143,7 @@ describe('A Class Seedlot Registration form, Parent Tree Calculations Part 1', (
.contains('Calculate metrics')
.click();

// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(3000);

// Store Ne value to a variable
@@ -204,12 +205,13 @@ describe('A Class Seedlot Registration form, Parent Tree Calculations Part 1', (
.contains('Calculate metrics')
.click();

// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(3000);

// Check Ne value after clearing first parent tree row
cy.get('#effectivepopulation\\ size\\ \\(ne\\)')
.invoke('val')
.then($value => {
.then(($value) => {
expect(Number($value)).to.be.lessThan(Number(effectivePopulationSize));
});
});
36 changes: 18 additions & 18 deletions frontend/cypress/e2e/smoke-test/a-class-seedlot-reg-form-parent-tree-part-1.cy.ts
View file
Original file line number Diff line number Diff line change
@@ -43,15 +43,15 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-1(Cone and

// Check primary orchard
cy.get('#primary-orchard-selection')
.then($input => {
.then(($input) => {
const value = $input.val();
if (value === '') {
cy.log('Primary input is empty');
// Do something if the input is empty
cy.get('#primary-orchard-selection')
.siblings(`button.${prefix}--list-box__menu-icon[title="Open"]`)
.click();

cy.get(`.${prefix}--list-box--expanded`)
.find('ul li')
.contains('219 - VERNON - S - PRD')
@@ -79,15 +79,15 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-1(Cone and

// Check secondary orchard
cy.get('#secondary-orchard-selection')
.then($input => {
.then(($input) => {
const value = $input.val();
if (value === '') {
cy.log('Secondary input is empty');
// Do something if the input is empty
cy.get('#secondary-orchard-selection')
.siblings(`button.${prefix}--list-box__menu-icon[title="Open"]`)
.click();

cy.get(`.${prefix}--list-box--expanded`)
.find('ul li')
.contains('222 - VERNON - S - PRD')
@@ -220,7 +220,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-1(Cone and
.clear()
.type('0.00000000001')
.blur();

cy.get('@errorDialog')
.should('have.text', regFormData.parentTree.coneErrorMsg);

@@ -229,7 +229,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-1(Cone and
.clear()
.type('1')
.blur();

cy.get(`.${prefix}--actionable-notification--error`)
.should('not.exist');

@@ -249,16 +249,16 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-1(Cone and
.clear()
.type('10000000001')
.blur();

cy.get('@errorDialog')
.should('have.text', regFormData.parentTree.pollenErrorMsg);

// Check error message for Pollen count value > 10 decimal places
cy.get('#212-pollenCount-value-input')
.clear()
.type('0.00000000001')
.blur();

cy.get('@errorDialog')
.should('have.text', regFormData.parentTree.pollenErrorMsg);

@@ -300,7 +300,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-1(Cone and
.eq(0)
.find('button')
.as('clickShowHideBtn')
.click({force: true});
.click({ force: true });

cy.get('ul.parent-tree-table-toggle-menu')
.find('li')
@@ -318,7 +318,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-1(Cone and

// Click 'Comandra blister rust (DSC)' checkbox
cy.get('@clickShowHideBtn')
.click({force: true});
.click({ force: true });

cy.get('ul.parent-tree-table-toggle-menu')
.find('li')
@@ -334,7 +334,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-1(Cone and

// Click 'Western gall rust (DSG)' checkbox
cy.get('@clickShowHideBtn')
.click({force: true});
.click({ force: true });

cy.get('ul.parent-tree-table-toggle-menu')
.find('li')
@@ -350,7 +350,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-1(Cone and

// Click 'Volume growth (GVO)' checkbox
cy.get('@clickShowHideBtn')
.click({force: true});
.click({ force: true });

cy.get('ul.parent-tree-table-toggle-menu')
.find('li')
@@ -392,7 +392,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-1(Cone and
.click();

cy.readFile(`${Cypress.config('downloadsFolder')}/Seedlot_composition_template.csv`);

// Enter values in Cone count and Pollen count columns of the table
cy.get('#212-coneCount-value-input')
.clear()
@@ -492,14 +492,14 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-1(Cone and

// Check file upload functionality
cy.get('button.upload-button')
.click({force: true});
.click({ force: true });

cy.get(`.${prefix}--modal-container[aria-label="Seedlot registration"]`)
.should('be.visible');

cy.get(`.${prefix}--file`)
.find(`input.${prefix}--file-input`)
.selectFile('cypress/fixtures/Seedlot_composition_template.csv', {force: true});
.selectFile('cypress/fixtures/Seedlot_composition_template.csv', { force: true });

cy.get('button')
.contains('Import file and continue')
@@ -552,7 +552,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-1(Cone and
cy.get(`table.${prefix}--data-table tbody`)
.find('tr')
.then(($row) => {
expect($row.length).equal(parseInt(dropdownNumber));
expect($row.length).equal(parseInt(dropdownNumber, 10));
});

// Page number dropdown
@@ -572,7 +572,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-1(Cone and
cy.get(`.${prefix}--pagination__control-buttons`)
.find(`button.${prefix}--pagination__button--forward`)
.click();

cy.get(`.${prefix}--pagination__right`)
.find(`select.${prefix}--select-input`)
.should('have.value', '2');
25 changes: 13 additions & 12 deletions frontend/cypress/e2e/smoke-test/a-class-seedlot-reg-form-parent-tree-part-2.cy.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import prefix from '../../../src/styles/classPrefix';
import { THIRTY_SECONDS } from '../../constants';

describe('A Class Seedlot Registration form, Parent Tree and SMP part-2(SMP success on parent)', () => {
let regFormData: {
@@ -55,7 +54,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-2(SMP succ
.should('not.be.checked');

cy.get('#smp-default-vals-checkbox')
.check({ force: true});
.check({ force: true });

cy.get('.smp-default-input-row')
.should('be.visible');
@@ -66,7 +65,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-2(SMP succ
cy.get('#parentTreeNumber', { timeout: 10000 });

cy.get('#smp-default-vals-checkbox')
.check({force: true});
.check({ force: true });

cy.get('.smp-default-input-row')
.should('be.visible');
@@ -230,7 +229,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-2(SMP succ
.eq(0)
.find('button')
.as('clickShowHideBtn')
.click({force: true});
.click({ force: true });

cy.get('ul.parent-tree-table-toggle-menu')
.find('li')
@@ -248,7 +247,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-2(SMP succ

// Click 'Comandra blister rust (DSC)' checkbox
cy.get('@clickShowHideBtn')
.click({force: true});
.click({ force: true });

cy.get('ul.parent-tree-table-toggle-menu')
.find('li')
@@ -264,7 +263,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-2(SMP succ

// Click 'Western gall rust (DSG)' checkbox
cy.get('@clickShowHideBtn')
.click({force: true});
.click({ force: true });

cy.get('ul.parent-tree-table-toggle-menu')
.find('li')
@@ -280,7 +279,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-2(SMP succ

// Click 'Volume growth (GVO)' checkbox
cy.get('@clickShowHideBtn')
.click({force: true});
.click({ force: true });

cy.get('ul.parent-tree-table-toggle-menu')
.find('li')
@@ -362,7 +361,8 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-2(SMP succ
.contains('Clean table data')
.click();

// Check values in 'SMP success on parent (%)' and 'Non-orchard pollen contam. (%)' columns of the table
// Check values in 'SMP success on parent (%)'
// and 'Non-orchard pollen contam. (%)' columns of the table
cy.get('#212-smpSuccessPerc-value-input')
.should('have.value', '');

@@ -377,7 +377,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-2(SMP succ

// Check upload button functionality
cy.get('button.upload-button')
.click({force: true});
.click({ force: true });

cy.get(`.${prefix}--modal-container[aria-label="Seedlot registration"]`)
.should('be.visible');
@@ -391,20 +391,21 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-2(SMP succ

// Check file upload functionality
cy.get('button.upload-button')
.click({force: true});
.click({ force: true });

cy.get(`.${prefix}--modal-container[aria-label="Seedlot registration"]`)
.should('be.visible');

cy.get(`.${prefix}--file`)
.find(`input.${prefix}--file-input`)
.selectFile('cypress/fixtures/Seedlot_composition_template_02.csv', {force: true});
.selectFile('cypress/fixtures/Seedlot_composition_template_02.csv', { force: true });

cy.get('button')
.contains('Import file and continue')
.click();

// Compare values in 'SMP success on parent (%)' and 'Non-orchard pollen contam. (%)' columns of the table with the csv file
// Compare values in 'SMP success on parent (%)'
// and 'Non-orchard pollen contam. (%)' columns of the table with the csv file
cy.get('#212-smpSuccessPerc-value-input')
.should('have.value', '1');

73 changes: 37 additions & 36 deletions frontend/cypress/e2e/smoke-test/a-class-seedlot-reg-form-parent-tree-part-3.cy.ts
View file
Original file line number Diff line number Diff line change
@@ -54,14 +54,14 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-3(Calculat
.eq(0)
.find('button')
.as('clickAddRowBtn')
.click({force: true});
.click({ force: true });

// Check total number of rows
cy.get(`.${prefix}--pagination__items-count`)
.should('include.text', '21 items');

cy.get('@clickAddRowBtn')
.click({force: true});
.click({ force: true });

// Check total number of rows
cy.get(`.${prefix}--pagination__items-count`)
@@ -70,7 +70,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-3(Calculat
// Check delete button functionality
cy.get('#7-action-btn-del')
.find('button')
.click({ force: true});
.click({ force: true });

// Check total number of rows
cy.get(`.${prefix}--pagination__items-count`)
@@ -86,7 +86,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-3(Calculat
.eq(1)
.find('button')
.as('clickShowHideBtn')
.click({force: true});
.click({ force: true });

cy.get('ul.parent-tree-table-toggle-menu')
.find('li')
@@ -96,119 +96,119 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-3(Calculat
cy.get('.parent-tree-step-table-container')
.find('h4')
.as('closeShowHideDropdown')
.click({force: true});
.click({ force: true });

cy.get('thead.table-header')
.find('#dfs')
.should('exist');

// Click 'Comandra blister rust (DSC)' checkbox
cy.get('@clickShowHideBtn')
.click({force: true});
.click({ force: true });

cy.get('ul.parent-tree-table-toggle-menu')
.find('li')
.contains('Comandra blister rust (DSC)')
.click();

cy.get('@closeShowHideDropdown')
.click({force: true});
.click({ force: true });

cy.get('thead.table-header')
.find('#dsc')
.should('exist');

// Click 'Western gall rust (DSG)' checkbox
cy.get('@clickShowHideBtn')
.click({force: true});
.click({ force: true });

cy.get('ul.parent-tree-table-toggle-menu')
.find('li')
.contains('Western gall rust (DSG)')
.click();

cy.get('@closeShowHideDropdown')
.click({force: true});
.click({ force: true });

cy.get('thead.table-header')
.find('#dsg')
.should('exist');

// Click 'Volume growth (GVO)' checkbox
cy.get('@clickShowHideBtn')
.click({force: true});
.click({ force: true });

cy.get('ul.parent-tree-table-toggle-menu')
.find('li')
.contains('Volume growth (GVO)')
.click();

cy.get('@closeShowHideDropdown')
.click({force: true});
.click({ force: true });

cy.get('thead.table-header')
.find('#gvo')
.should('exist');

// Click 'Weighted DFS' checkbox
cy.get('@clickShowHideBtn')
.click({force: true});
.click({ force: true });

cy.get('ul.parent-tree-table-toggle-menu')
.find('li')
.contains('Weighted DFS')
.click();

cy.get('@closeShowHideDropdown')
.click({force: true});
.click({ force: true });

cy.get('thead.table-header')
.find('#w_dfs')
.should('exist');

// Click 'Weighted DSC' checkbox
cy.get('@clickShowHideBtn')
.click({force: true});
.click({ force: true });

cy.get('ul.parent-tree-table-toggle-menu')
.find('li')
.contains('Weighted DSC')
.click();

cy.get('@closeShowHideDropdown')
.click({force: true});
.click({ force: true });

cy.get('thead.table-header')
.find('#w_dsc')
.should('exist');

// Click 'Weighted DSG' checkbox
cy.get('@clickShowHideBtn')
.click({force: true});
.click({ force: true });

cy.get('ul.parent-tree-table-toggle-menu')
.find('li')
.contains('Weighted DSG')
.click();

cy.get('@closeShowHideDropdown')
.click({force: true});
.click({ force: true });

cy.get('thead.table-header')
.find('#w_dsg')
.should('exist');

// Click 'Weighted GVO' checkbox
cy.get('@clickShowHideBtn')
.click({force: true});
.click({ force: true });

cy.get('ul.parent-tree-table-toggle-menu')
.find('li')
.contains('Weighted GVO')
.click();

cy.get('@closeShowHideDropdown')
.click({force: true});
.click({ force: true });

cy.get('thead.table-header')
.find('#w_gvo')
@@ -235,7 +235,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-3(Calculat

// Click 'Clean table data' option
cy.get('@clickMoreOptionsBtn')
.click({force: true});
.click({ force: true });

cy.get('ul.parent-tree-table-option-menu')
.find('li')
@@ -257,10 +257,10 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-3(Calculat

// Check 'X' button of 'Clean table data' dialog box
cy.get('@clickMoreOptionsBtn')
.click({force: true});
.click({ force: true });

cy.get('@clickCleanTableBtn')
.click({force: true});
.click({ force: true });

cy.get(`.${prefix}--modal-container[aria-label="Clean table data"]`)
.find('button')
@@ -272,17 +272,18 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-3(Calculat

// Check 'Clean table data' button of 'Clean table data' dialog box
cy.get('@clickMoreOptionsBtn')
.click({force: true});
.click({ force: true });

cy.get('@clickCleanTableBtn')
.click({force: true});
.click({ force: true });

cy.get(`.${prefix}--modal-container[aria-label="Clean table data"]`)
.find('button')
.contains('Clean table data')
.click();

// Check values in 'SMP success on parent (%)' and 'Non-orchard pollen contam. (%)' columns of the table
// Check values in 'SMP success on parent (%)'
// and 'Non-orchard pollen contam. (%)' columns of the table
cy.get('#0-volume-value-input')
.should('have.value', '');

@@ -291,7 +292,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-3(Calculat

// Check upload button functionality
cy.get('button.upload-button')
.click({force: true});
.click({ force: true });

cy.get(`.${prefix}--modal-container[aria-label="Seedlot registration"]`)
.should('be.visible');
@@ -305,14 +306,14 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-3(Calculat

// Check file upload functionality
cy.get('button.upload-button')
.click({force: true});
.click({ force: true });

cy.get(`.${prefix}--modal-container[aria-label="Seedlot registration"]`)
.should('be.visible');

cy.get(`.${prefix}--file`)
.find(`input.${prefix}--file-input`)
.selectFile('cypress/fixtures/Seedlot_composition_template_03.csv', {force: true});
.selectFile('cypress/fixtures/Seedlot_composition_template_03.csv', { force: true });

cy.get('button')
.contains('Import file and continue')
@@ -343,12 +344,12 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-3(Calculat
cy.get(`.${prefix}--toolbar-content > span`)
.eq(2)
.find('button')
.click({force: true});
.click({ force: true });

cy.get('ul.parent-tree-table-option-menu')
.find('li')
.contains('Clean table data')
.click({force: true});
.click({ force: true });

cy.get(`.${prefix}--modal-container[aria-label="Clean table data"]`)
.find('button')
@@ -448,7 +449,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-3(Calculat
cy.get('.parent-tree-step-table-container')
.find('h4')
.as('waitClick')
.click({force: true});
.click({ force: true });

// Check proportion value
cy.get('#0-proportion-value')
@@ -479,7 +480,7 @@ describe('A Class Seedlot Registration form, Parent Tree and SMP part-3(Calculat
.blur();

cy.get('@waitClick')
.click({force: true});
.click({ force: true });

cy.get('#0-proportion-value')
.should('have.text', '0.2500');

0 comments on commit 82a937c

Please sign in to comment.