Skip to content

Commit f899b70

Browse files
enicolasgomezenicolasgomez
authored
Merge pull request #780 from MetaCell/fix/14nov
fix selector names for tutorials
2 parents 9b72790 + a86576d commit f899b70

9 files changed

Lines changed: 36 additions & 29 deletions

‎tests/frontend/e2e/tests/ExperimentManager_Tut#1.test.js‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,13 +202,15 @@ describe('Experiment Manager test using Tut#1', () => {
202202

203203
it('Simulate All conditions', async () => {
204204

205-
await page.waitForSelector(selectors.SIMULATE_BUTTON_SELECTOR)
206-
await click(page, selectors.SIMULATE_BUTTON_SELECTOR, { timeout: TIMEOUT });
205+
await page.waitForSelector(selectors.MODEL_BUTTON_SELECTOR)
206+
await click(page, selectors.MODEL_BUTTON_SELECTOR, { timeout: TIMEOUT });
207+
await page.waitForSelector(selectors.SIMULATE_NETWORK_SELECTOR)
208+
await click(page, selectors.SIMULATE_NETWORK_SELECTOR, { timeout: TIMEOUT });
207209

208210
console.log('Simulating all conditions')
209-
210211
await page.waitForSelector(selectors.SIMULATE_POPUP_SELECTOR)
211212
await page.click(selectors.SIMULATE_POPUP_SELECTOR)
213+
await page.waitForSelector(selectors.CONFIRM_SIMULATE_SELECTOR)
212214
await page.click(selectors.CONFIRM_SIMULATE_SELECTOR)
213215

214216
await page.waitForTimeout(PAGE_WAIT);
@@ -217,8 +219,8 @@ describe('Experiment Manager test using Tut#1', () => {
217219
await page.click(selectors.CONFIRM_EXPERIMENT_STARTED_SELECTOR)
218220

219221
await page.waitForSelector(selectors.SIMULATION_PAGE_SELECTOR, { timeout: TIMEOUT * 2 });
220-
await page.waitForSelector(selectors.SIMULATION_LOADER_SELECTOR, { hidden: false, timeout: TIMEOUT * 2 })
221-
await page.waitForSelector(selectors.SIMULATION_LOADER_SELECTOR, { hidden: true, timeout: TIMEOUT * 5 })
222+
await page.waitForSelector(selectors.SIMULATION_LOADER_SELECTOR, { hidden: false, timeout: TIMEOUT * 5 })
223+
await page.waitForSelector(selectors.SIMULATION_LOADER_SELECTOR, { hidden: true, timeout: TIMEOUT * 10 })
222224
console.log('Experiment Simulation finished')
223225

224226
});

‎tests/frontend/e2e/tests/RxD.test.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ describe('RxD testing', () => {
9898
console.log('Loading Tutorial #3b ...')
9999

100100
await page.waitForTimeout(PAGE_WAIT)
101-
101+
await page.waitForSelector(selectors.TUTORIALS_BUTTON_SELECTOR, { timeout: TIMEOUT })
102102
await page.click(selectors.TUTORIALS_BUTTON_SELECTOR, { timeout: TIMEOUT })
103-
104-
await page.click("li[id='Model 3b: Multiscale network (high IP3)']", { timeout: TIMEOUT })
103+
await page.waitForSelector(selectors.TUTORIAL_3B_SELECTOR, { timeout: TIMEOUT })
104+
await page.click(selectors.TUTORIAL_3B_SELECTOR, { timeout: TIMEOUT })
105105
await page.waitForSelector('#E')
106106
await page.waitForSelector('#I')
107107
await page.waitForTimeout(PAGE_WAIT)
@@ -123,8 +123,9 @@ describe('RxD testing', () => {
123123
await page.waitForTimeout(PAGE_WAIT * 3)
124124

125125
await page.waitForSelector('div[title="3D Representation"][aria-disabled="false"]')
126-
126+
await page.waitForSelector(selectors.MODEL_BUTTON_SELECTOR, { timeout: TIMEOUT });
127127
await page.click(selectors.MODEL_BUTTON_SELECTOR, { timeout: TIMEOUT });
128+
await page.waitForSelector(selectors.SIMULATE_NETWORK_SELECTOR, { timeout: TIMEOUT });
128129
await page.click(selectors.SIMULATE_NETWORK_SELECTOR, { timeout: TIMEOUT });
129130
console.log('Simulating network ...')
130131

‎tests/frontend/e2e/tests/Tut#1_smoke.test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ describe('Tutorial #1 for Smoke Testing', () => {
9595
console.log('Tutorial #1')
9696

9797
await page.waitForTimeout(PAGE_WAIT)
98-
98+
await page.waitForSelector(selectors.TUTORIALS_BUTTON_SELECTOR, { timeout: TIMEOUT })
9999
await click(page, selectors.TUTORIALS_BUTTON_SELECTOR, { timeout: TIMEOUT })
100-
100+
await page.waitForSelector(selectors.TUTORIAL_1_SELECTOR, { timeout: TIMEOUT })
101101
await click(page, selectors.TUTORIAL_1_SELECTOR, { timeout: TIMEOUT })
102102
await page.waitForSelector(selectors.PYR_CELL_SELECTOR)
103103
await page.waitForTimeout(PAGE_WAIT)

‎tests/frontend/e2e/tests/Tut#2_smoke.test.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ describe('Tutorial #2 for Smoke Testing', () => {
9393
console.log('Tutorial #2')
9494

9595
await page.waitForTimeout(PAGE_WAIT)
96-
96+
await page.waitForSelector(selectors.TUTORIALS_BUTTON_SELECTOR, { visible: true })
9797
await page.click(selectors.TUTORIALS_BUTTON_SELECTOR, { timeout: TIMEOUT })
98-
98+
await page.waitForSelector(selectors.TUTORIAL_2_SELECTOR, { visible: true })
9999
await page.click(selectors.TUTORIAL_2_SELECTOR, { timeout: TIMEOUT })
100100
await page.waitForSelector(selectors.PYR_2_CELL_SELECTOR)
101101
await page.waitForSelector(selectors.INT_CELL_SELECTOR)
@@ -225,7 +225,7 @@ describe('Tutorial #2 for Smoke Testing', () => {
225225
});
226226

227227
it('Rate Spectogram Plot', async () => {
228-
228+
await page.waitForSelector(selectors.RATE_SPECTROGRAM_PLOT_SELECTOR, { visible: true })
229229
await page.click(selectors.RATE_SPECTROGRAM_PLOT_SELECTOR, { timeout: TIMEOUT })
230230
await page.waitForSelector(selectors.CANVAS_SELECTOR, { timeout: TIMEOUT })
231231

‎tests/frontend/e2e/tests/Tut#3a_smoke.test.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,10 @@ describe('Tutorial #3a for Smoke Testing', () => {
9494
console.log('Tutorial #3a')
9595

9696
await page.waitForTimeout(PAGE_WAIT)
97+
await page.waitForSelector(selectors.TUTORIALS_BUTTON_SELECTOR, { visible: true })
9798

9899
await page.click(selectors.TUTORIALS_BUTTON_SELECTOR, { timeout: TIMEOUT })
99-
100+
await page.waitForSelector(selectors.TUTORIAL_3A_SELECTOR, { visible: true })
100101
await page.click(selectors.TUTORIAL_3A_SELECTOR, { timeout: TIMEOUT })
101102
await page.waitForSelector(selectors.E_CELL_TYPE_SELECTOR)
102103
await page.waitForSelector(selectors.I_CELL_TYPE_SELECTOR)

‎tests/frontend/e2e/tests/Tut#3b_smoke.test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ describe('Tutorial #3b for Smoke Testing', () => {
9595
console.log('Tutorial #3b')
9696

9797
await page.waitForTimeout(PAGE_WAIT)
98-
98+
await page.waitForSelector(selectors.TUTORIALS_BUTTON_SELECTOR, { timeout: TIMEOUT })
9999
await page.click(selectors.TUTORIALS_BUTTON_SELECTOR, { timeout: TIMEOUT })
100-
100+
await page.waitForSelector(selectors.TUTORIAL_3B_SELECTOR, { timeout: TIMEOUT })
101101
await page.click(selectors.TUTORIAL_3B_SELECTOR, { timeout: TIMEOUT })
102102
await page.waitForSelector(selectors.E_CELL_TYPE_SELECTOR)
103103
await page.waitForSelector(selectors.I_CELL_TYPE_SELECTOR)

‎tests/frontend/e2e/tests/Tut#3c_smoke.test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ describe('Tutorial #3c for Smoke Testing', () => {
9696
console.log('Tutorial #3c')
9797

9898
await page.waitForTimeout(PAGE_WAIT)
99-
99+
await page.waitForSelector(selectors.TUTORIALS_BUTTON_SELECTOR, { timeout: TIMEOUT })
100100
await page.click(selectors.TUTORIALS_BUTTON_SELECTOR, { timeout: TIMEOUT })
101-
101+
await page.waitForSelector(selectors.TUTORIAL_3C_SELECTOR, { timeout: TIMEOUT })
102102
await page.click(selectors.TUTORIAL_3C_SELECTOR, { timeout: TIMEOUT })
103103
await page.waitForSelector(selectors.E_CELL_TYPE_SELECTOR)
104104
await page.waitForSelector(selectors.I_CELL_TYPE_SELECTOR)

‎tests/frontend/e2e/tests/Tut#4_smoke.test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ describe('Tutorial #4 for Smoke Testing', () => {
9595
console.log('Tutorial #4')
9696

9797
await page.waitForTimeout(PAGE_WAIT)
98-
98+
await page.waitForSelector(selectors.TUTORIALS_BUTTON_SELECTOR, { timeout: TIMEOUT })
9999
await page.click(selectors.TUTORIALS_BUTTON_SELECTOR, { timeout: TIMEOUT })
100-
100+
await page.waitForSelector(selectors.TUTORIAL_4_SELECTOR, { timeout: TIMEOUT })
101101
await page.click(selectors.TUTORIAL_4_SELECTOR, { timeout: TIMEOUT })
102102
await page.waitForSelector(selectors.PYR_2_CELL_SELECTOR)
103103
await page.waitForTimeout(PAGE_WAIT)

‎tests/frontend/e2e/tests/selectors.js‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ export const USERNAME_SELECTOR = '#username_input';
1313
export const PASSWORD_SELECTOR = '#password_input';
1414
export const LOGIN_BUTTON_SELECTOR = '#login_submit';
1515
export const SELECT_CELL_BUTTON_SELECTOR = '#selectCellButton';
16-
export const TUTORIAL_1_SELECTOR = "li[id='Model 1: Simple cell network']";
17-
export const TUTORIAL_2_SELECTOR = "li[id='Model 2: Detailed cell network']"
18-
export const TUTORIAL_3A_SELECTOR = "li[id='Model 3a: Multiscale network (low IP3)']"
19-
export const TUTORIAL_3B_SELECTOR = "li[id='Model 3b: Multiscale network (high IP3)']"
20-
export const TUTORIAL_3C_SELECTOR = "li[id='Model 3c: Multiscale network (no RxD)']"
21-
export const TUTORIAL_4_SELECTOR = "li[id='Model 4: Simple oscillatory network']"
16+
export const TUTORIAL_1_SELECTOR = "li[id='Tut 1: Simple cell network']";
17+
export const TUTORIAL_2_SELECTOR = "li[id='Tut 2: Detailed cell network']"
18+
export const TUTORIAL_3A_SELECTOR = "li[id='Tut 3a: Multiscale network (low IP3)']"
19+
export const TUTORIAL_3B_SELECTOR = "li[id='Tut 3b: Multiscale network (high IP3)']"
20+
export const TUTORIAL_3C_SELECTOR = "li[id='Tut 3c: Multiscale network (no RxD)']"
21+
export const TUTORIAL_4_SELECTOR = "li[id='Tut 4: Simple oscillatory network']"
2222
export const PYR_CELL_SELECTOR = '#pyr';
2323
export const PYR_2_CELL_SELECTOR = '#PYR'
2424
export const INT_CELL_SELECTOR = '#INT'
@@ -57,10 +57,13 @@ export const TO_VALUE_SELECTOR = '#undefined-to'
5757
export const STEP_VALUE_SELECTOR = '#undefined-step'
5858
export const CREATE_EXPERIMENT_BUTTON_SELECTOR = 'button[class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary"]'
5959
export const EXPERIMENT_TABLE_HEADER_SELECTOR = 'th[class="MuiTableCell-root MuiTableCell-body"]'
60-
export const SIMULATE_POPUP_SELECTOR = 'div[class="MuiBox-root MuiBox-root-185 wrap"]'
60+
// export const SIMULATE_POPUP_SELECTOR = 'div[class="MuiBox-root MuiBox-root-185 wrap"]'
61+
export const SIMULATE_POPUP_SELECTOR = '.MuiDialogContent-root > .MuiBox-root.custom-radio > :nth-child(2) > div'
62+
6163
export const CONFIRM_SIMULATE_SELECTOR = '#appBarPerformActionButton'
6264
export const CONFIRM_EXPERIMENT_STARTED_SELECTOR = 'button[class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary"]'
63-
export const SIMULATION_LOADER_SELECTOR = 'div[class = "MuiBox-root MuiBox-root-186 MuiChip-icon MuiChipLoader"]'
65+
// export const SIMULATION_LOADER_SELECTOR = 'div[class = "MuiBox-root MuiBox-root-186 MuiChip-icon MuiChipLoader"]'
66+
export const SIMULATION_LOADER_SELECTOR = '.MuiTableCell-root.MuiTableCell-body.experimentTableCell.MuiTableCell-alignLeft > div > .MuiChipLoader '
6467
export const BACK_TO_EDIT_SELECTOR = 'span[class="MuiButton-startIcon MuiButton-iconSizeMedium"]'
6568
export const CELL_TYPES_TAB_SELECTOR = 'div[title="Cell Types"]'
6669
export const EXPERIMENT_TABLE_SELECTOR = 'table[class="MuiTable-root"]'

0 commit comments

Comments
 (0)