Update tests for new Depositor Workflow

opendp · Aug 22, 2023 · 71b719e · 71b719e
1 parent a9a56fd
commit 71b719e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 31 deletions.
diff --git a/client/cypress/e2e/confirm-variables.cy.js b/client/cypress/e2e/confirm-variables.cy.js
@@ -22,29 +22,6 @@
                 cy.get('[data-test="variableRow"]').should('not.exist')
             })
         })
-        it('goes back to My Data from Complete button', () => {
-            cy.on('uncaught:exception', (e, runnable) => {
-                console.log('error', e)
-                console.log('runnable', runnable)
-                return false
-            })
-
-            cy.clearData()
-            let testfile = 'cypress/fixtures/Fatigue_data.csv'
-            cy.createAccount('oscar', 'oscar@sesame.com', 'oscar123!')
-            cy.uploadFile(testfile)
-            cy.fixture('EyeDemoData.json').then((demoData) => {
-                cy.url().should('contain', 'my-data')
-                cy.goToConfirmVariables(demoData.variables)
-                cy.pause()
-                // select the variables we will use
-                cy.selectVariable(demoData.variables)
-                cy.get('[data-test="wizardCompleteButton"]').click({force:true})
-                cy.url().should('contain','my-data')
-                cy.get('[data-test="table status tag"]').should('contain', "Setup Complete")
-
-            })
-        })
         it('saves categories correctly', () => {
             cy.on('uncaught:exception', (e, runnable) => {
                 console.log('error', e)

diff --git a/client/cypress/e2e/my-analysis-plans.cy.js b/client/cypress/e2e/my-analysis-plans.cy.js
@@ -61,6 +61,8 @@
                 cy.goToConfirmVariables(selectVariables)
                 // select the variables we will use
                 cy.selectVariable(selectVariables)
+                cy.get('[data-test="wizardContinueButton"]').last().click({force: true});
+                cy.get('h1').should('contain', 'Confirm Epsilon')
                 cy.get('[data-test="wizardCompleteButton"]').click({force:true})
                 cy.url().should('contain','my-data')
                 cy.visit('/my-plans')
@@ -85,7 +87,6 @@
                 cy.get('[data-test="'+continueTestId+'"]').click({force: true})
                 cy.url().should('contains','analyst-wizard')
                 cy.visit('my-data')
-                cy.pause()
 
             })
         })
@@ -222,6 +223,8 @@
                 cy.goToConfirmVariables(selectVariables)
                 // select the variables we will use
                 cy.selectVariable(selectVariables)
+                cy.get('[data-test="wizardContinueButton"]').last().click({force: true});
+                cy.get('h1').should('contain', 'Confirm Epsilon')
                 cy.get('[data-test="wizardCompleteButton"]').click({force:true})
                 cy.url().should('contain','my-data')
                 cy.visit('/my-plans')

diff --git a/client/cypress/e2e/validate-variables.cy.js b/client/cypress/e2e/validate-variables.cy.js
@@ -28,13 +28,13 @@
             const minInput = label + ':min'
             const maxInput = label + ':max'
             //  selecting a numeric variable with min/max - test continue button
-            cy.get('[data-test="wizardCompleteButton"]').should('be.disabled')
+            cy.get('[data-test="wizardContinueButton"]').should('be.disabled')
             cy.contains('td', label).parent('tr').children().first().click()
             cy.get('[data-test="' + minInput + '"]').type('0');
             cy.get('[data-test="' + maxInput + '"]').type('100');
             cy.get('[data-test="' + maxInput + '"]').should('have.value', 100)
             cy.get('[data-test="' + maxInput + '"]').trigger('change')
-            cy.get('[data-test="wizardCompleteButton"]').should('not.be.disabled')
+            cy.get('[data-test="wizardContinueButton"]').should('not.be.disabled')
 
 
         })
@@ -51,19 +51,19 @@
 
             // Select boolean variable without additional information - continueButton should be disabled
             cy.contains('td', booleanLabel).parent('tr').children().first().click()
-            cy.get('[data-test="wizardCompleteButton"]').should('be.disabled')
+            cy.get('[data-test="wizardContinueButton"]').should('be.disabled')
 
             // leave falseValue blank- continueButton should be disabled
             cy.get('[data-test="' + trueValue + '"]').type('1');
-            cy.get('[data-test="wizardCompleteButton"]').should('be.disabled')
+            cy.get('[data-test="wizardContinueButton"]').should('be.disabled')
 
             // leave use same value for both fields - continueButton should be disabled
             cy.get('[data-test="' + falseValue + '"]').type('1');
-            cy.get('[data-test="wizardCompleteButton"]').should('be.disabled')
+            cy.get('[data-test="wizardContinueButton"]').should('be.disabled')
 
             // change true value - continueButton should be enabled
             cy.get('[data-test="' + trueValue + '"]').type('2');
-            cy.get('[data-test="wizardCompleteButton"]').should('not.be.disabled')
+            cy.get('[data-test="wizardContinueButton"]').should('not.be.disabled')
 
         })
 

diff --git a/client/cypress/support/commands.js b/client/cypress/support/commands.js
@@ -19,6 +19,8 @@ Cypress.Commands.add('loadTeacherSurveyDemo', () => {
 
         // select the variables we will use
         cy.selectVariable(demoData)
+        cy.get('[data-test="wizardContinueButton"]').click()
+        cy.get('h1').should('contain', 'Confirm Epsilon')
         cy.get('[data-test="wizardCompleteButton"]').click({force: true})
         const planEpsilon = 1
         cy.createPlan(planEpsilon, testFile, username)
@@ -188,6 +190,9 @@ Cypress.Commands.add('runDemo', (testFile, demoDatafile) => {
 
         // select the variables we will use
         cy.selectVariable(demoData.variables)
+        cy.get('[data-test="wizardContinueButton"]').last().click({force: true});
+        cy.get('h1').should('contain', 'Confirm Epsilon')
+        cy.get('[data-test="wizardCompleteButton"]').click({force: true})
 
         cy.createStatistics(demoData, testFile,username )
 
@@ -309,7 +314,6 @@ Cypress.Commands.add('selectVariable',(demoVariables)=> {
 
 Cypress.Commands.add('createStatistics', (demoData, testFile,username) => {
     // Create Analysis plan
-    cy.get('[data-test="wizardCompleteButton"]').click({force: true})
     cy.url().should('contain','my-data')
     cy.createPlan(demoData.planEpsilon,testFile,username)
     cy.url().should('contain','my-plans')