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

feat: 1446 cone and pollen count step 5 #1456

Merged
merged 50 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
31edf5a
feat: add fixture data for parent tree step
ngunner15 Jul 24, 2024
f210d10
feat: create parent tree cypress test
ngunner15 Jul 24, 2024
7dee576
feat: add parent tree cypress test
ngunner15 Jul 24, 2024
b099f39
feat: add error msg
ngunner15 Jul 25, 2024
8e510c9
feat: add test of title and invalid entries error msg
ngunner15 Jul 25, 2024
5ac4ccf
fix: change error name
ngunner15 Jul 25, 2024
bc0d4a5
feat: add 'More Options' button test
ngunner15 Jul 26, 2024
e1c8a60
feat: add code for 'Clean table data' dialog box
ngunner15 Jul 26, 2024
a31aada
feat: add 'Show/hide columns' test
ngunner15 Jul 26, 2024
0c8640d
feat: add pagination test
ngunner15 Jul 29, 2024
648fe80
feat: add accordion test
ngunner15 Jul 29, 2024
6142e9a
feat: add 'Calculate metrics' button functionality test
ngunner15 Jul 29, 2024
df095bd
feat: remove unwanted code
ngunner15 Jul 29, 2024
0dcc525
fix: update for successful cypress test
ngunner15 Jul 29, 2024
0ade37f
fix: add space
ngunner15 Jul 29, 2024
065967e
feat: add accordion link test
ngunner15 Jul 30, 2024
d321735
feat: update pagination test
ngunner15 Jul 30, 2024
3b6a429
fix: remove unwanted code
ngunner15 Jul 30, 2024
141e0ec
Merge branch 'main' into feat/1446-cone-and-pollen-count-step-5
ngunner15 Jul 30, 2024
89a2836
fix: remove it.only
ngunner15 Jul 30, 2024
94dda5b
fix: remove it.only
ngunner15 Jul 31, 2024
d659ab3
Merge branch 'main' into feat/1446-cone-and-pollen-count-step-5
ngunner15 Aug 1, 2024
442ee18
Merge branch 'main' into feat/1446-cone-and-pollen-count-step-5
craigyu Aug 2, 2024
139f3a3
feat: add upload nutton functionality
ngunner15 Aug 1, 2024
115fd67
feat: add csv file for upload button test
ngunner15 Aug 1, 2024
3b2135b
fix: update comments
ngunner15 Aug 1, 2024
727d0cd
Merge branch 'main' into feat/1446-cone-and-pollen-count-step-5
ngunner15 Aug 7, 2024
c06864a
Merge branch 'main' into feat/1446-cone-and-pollen-count-step-5
DerekRoberts Aug 7, 2024
da56611
Merge branch 'main' into feat/1446-cone-and-pollen-count-step-5
ngunner15 Aug 9, 2024
9f01f06
Merge branch 'main' into feat/1446-cone-and-pollen-count-step-5
ngunner15 Aug 12, 2024
d5ab60a
fix: update
ngunner15 Aug 12, 2024
ddab8d1
fix: remove it.only
ngunner15 Aug 13, 2024
0507654
feat: remove rows count
ngunner15 Aug 13, 2024
380c9ba
Merge branch 'main' into feat/1446-cone-and-pollen-count-step-5
ngunner15 Aug 13, 2024
8cc4c1a
Merge branch 'main' into feat/1446-cone-and-pollen-count-step-5
ngunner15 Aug 13, 2024
b5e5320
Merge branch 'main' into feat/1446-cone-and-pollen-count-step-5
ngunner15 Aug 14, 2024
21b9f5d
Merge branch 'main' into feat/1446-cone-and-pollen-count-step-5
ngunner15 Aug 15, 2024
5e17874
Merge branch 'main' into feat/1446-cone-and-pollen-count-step-5
craigyu Aug 15, 2024
a04ffd2
Merge branch 'main' into feat/1446-cone-and-pollen-count-step-5
craigyu Aug 15, 2024
fe56e61
Merge branch 'main' into feat/1446-cone-and-pollen-count-step-5
craigyu Aug 19, 2024
baa2b4a
feat: add table to load
ngunner15 Aug 22, 2024
f15dbe4
Merge branch 'main' into feat/1446-cone-and-pollen-count-step-5
ngunner15 Aug 22, 2024
41ea90b
Merge branch 'main' into feat/1446-cone-and-pollen-count-step-5
ngunner15 Aug 22, 2024
358e658
feat: add save seedlot progress
ngunner15 Aug 22, 2024
a09607d
feat: add table wait
ngunner15 Aug 22, 2024
11aaeca
Merge branch 'main' into feat/1446-cone-and-pollen-count-step-5
ngunner15 Aug 23, 2024
5eaf6a1
feat: add table wait time ans save progress code
ngunner15 Aug 23, 2024
149b821
fix: add select checks
craigyu Aug 23, 2024
e8ed3a6
fix: wait for button to be enabled
craigyu Aug 23, 2024
e1f2d9d
fix: loop back to 3
craigyu Aug 23, 2024
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
3 changes: 2 additions & 1 deletion frontend/cypress.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ export default defineConfig({
'**/a-class-seedlot-reg-form-collection-interim.cy.ts',
'**/a-class-seedlot-reg-form-ownership.cy.ts',
'**/a-class-seedlot-reg-form-orchard.cy.ts',
'**/a-class-seedlot-reg-form-extraction.cy.ts'
'**/a-class-seedlot-reg-form-extraction.cy.ts',
'**/a-class-seedlot-reg-form-parent-tree-part-1.cy.ts'
],
chromeWebSecurity: false,
retries: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,9 @@ describe('A Class Seedlot Registration form, Collection and Interim storage', ()
.type('2024-05-25')
.blur();

// Save changes
cy.saveSeedlotRegFormProgress();

cy.get('#end-date-input')
.clear()
.type('2024-05-26')
Expand Down Expand Up @@ -509,6 +512,9 @@ describe('A Class Seedlot Registration form, Collection and Interim storage', ()
.type('Test comment')
.blur();

// Save changes
cy.saveSeedlotRegFormProgress();

// Press next button
cy.get('.seedlot-registration-button-row')
.find('button.form-action-btn')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ describe('A Class Seedlot Registration form, Orchard', () => {
const parentTreeSet = new Set();
const unionParentTreeArray: string[] = [];
const lengthOfArray = 6;
const F2GameticValue = 'F2 - Measured Cone Volume';
const M3GameticValue = 'M3 - Pollen Volume Estimate by 100% Survey';

beforeEach(() => {
// Login
Expand Down Expand Up @@ -452,11 +454,11 @@ describe('A Class Seedlot Registration form, Orchard', () => {

cy.get(`.${prefix}--list-box--expanded`)
.find('ul li')
.contains('F2 - Measured Cone Volume')
.contains(F2GameticValue)
.click();

cy.get('#orchard-female-gametic')
.should('have.value', 'F2 - Measured Cone Volume');
.should('have.value', F2GameticValue);

// Select male gametic contribution methodology
cy.get('#orchard-male-gametic')
Expand All @@ -465,11 +467,11 @@ describe('A Class Seedlot Registration form, Orchard', () => {

cy.get(`.${prefix}--list-box--expanded`)
.find('ul li')
.contains('M3 - Pollen Volume Estimate by 100% Survey')
.contains(M3GameticValue)
.click();

cy.get('#orchard-male-gametic')
.should('have.value', 'M3 - Pollen Volume Estimate by 100% Survey');
.should('have.value', M3GameticValue);

// Check 'x' button
cy.get('#orchard-female-gametic')
Expand All @@ -493,18 +495,24 @@ describe('A Class Seedlot Registration form, Orchard', () => {

cy.get(`.${prefix}--list-box--expanded`)
.find('ul li')
.contains('F2 - Measured Cone Volume')
.contains(F2GameticValue)
.click();

cy.get('#orchard-female-gametic')
.should('have.value', F2GameticValue);

cy.get('#orchard-male-gametic')
.siblings()
.click();

cy.get(`.${prefix}--list-box--expanded`)
.find('ul li')
.contains('M3 - Pollen Volume Estimate by 100% Survey')
.contains(M3GameticValue)
.click();

cy.get('#orchard-male-gametic')
.should('have.value', M3GameticValue);

// Change radio inputs of gamete section
cy.get('#controlled-cross-yes')
.check({ force: true });
Expand Down Expand Up @@ -597,6 +605,12 @@ describe('A Class Seedlot Registration form, Orchard', () => {

// Save changes
cy.saveSeedlotRegFormProgress();
});

it('Step complete status', () => {
// Make sure value is loaded
cy.get('#orchard-breading-perc')
.should('have.value', '5');

// Press next button
cy.get('.seedlot-registration-button-row')
Expand Down
Loading