Skip to content

Commit 95e3aaf

Browse files
SimaoBolota-MetaCellSimaoBolota-MetaCell
committed
changed the initial step for all tests + test user is now random
1 parent 34dd1ab commit 95e3aaf

9 files changed

Lines changed: 352 additions & 333 deletions

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const SNAPSHOT_OPTIONS = {
2121
failureThreshold: 0.25
2222
};
2323

24-
let r = (Math.random() + 1).toString(36).substring(7);
24+
let r = (Math.random() + 1).toString(36).substring(2);
2525

2626
//USERS:
2727
const USERNAME = `TestUser${r}`
@@ -61,11 +61,11 @@ describe('Test for the Control Panel - color picker', () => {
6161
await page.on("dialog", dialog =>
6262
dialog.accept());
6363

64-
await page.waitForSelector(selectors.SELECT_CELL_BUTTON_SELECTOR, { timeout: TIMEOUT, visible: true })
65-
await page.waitForSelector(selectors.FILE_TAB_SELECTOR, { timeout: PAGE_WAIT * 30 })
64+
await page.waitForSelector(selectors.SELECT_CELL_BUTTON_SELECTOR, { timeout: TIMEOUT * 4, visible: true })
65+
await page.waitForSelector(selectors.FILE_TAB_SELECTOR, { timeout: PAGE_WAIT * 3 })
6666
await page.waitForTimeout(PAGE_WAIT)
6767
await page.click(selectors.FILE_TAB_SELECTOR)
68-
await page.waitForSelector(selectors.NEW_FILE_SELECTOR, { timeout: PAGE_WAIT * 10 })
68+
await page.waitForSelector(selectors.NEW_FILE_SELECTOR, { timeout: PAGE_WAIT * 3 })
6969
await page.waitForTimeout(PAGE_WAIT)
7070
await page.click(selectors.NEW_FILE_SELECTOR)
7171
await page.waitForTimeout(PAGE_WAIT)

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

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ const SNAPSHOT_OPTIONS = {
2626

2727

2828

29+
let r = (Math.random() + 1).toString(36).substring(2);
30+
2931
//USERS:
30-
const USERNAME = 'EEGDipole_TestUser_'
31-
const PASSWORD = 'password'
32+
const USERNAME = `TestUser${r}`
33+
const PASSWORD = 'testpassword'
3234

3335

3436
//TESTS:
@@ -65,25 +67,27 @@ describe('EEG and Dipole Plot Test using Tutorial#1', () => {
6567
await page.on("dialog", dialog =>
6668
dialog.accept());
6769

68-
await page.waitForSelector('#File', { timeout: PAGE_WAIT * 20 })
69-
await page.waitForTimeout(PAGE_WAIT * 6)
70-
await page.click('#File')
71-
await page.waitForSelector('#New', { timeout: PAGE_WAIT * 10 })
70+
await page.waitForSelector(selectors.SELECT_CELL_BUTTON_SELECTOR, { timeout: TIMEOUT * 4, visible: true })
71+
await page.waitForSelector(selectors.FILE_TAB_SELECTOR, { timeout: PAGE_WAIT * 3 })
72+
await page.waitForTimeout(PAGE_WAIT)
73+
await page.click(selectors.FILE_TAB_SELECTOR)
74+
await page.waitForSelector(selectors.NEW_FILE_SELECTOR, { timeout: PAGE_WAIT * 3 })
7275
await page.waitForTimeout(PAGE_WAIT)
73-
await page.click('#New')
76+
await page.click(selectors.NEW_FILE_SELECTOR)
7477
await page.waitForTimeout(PAGE_WAIT)
75-
await page.waitForSelector('#appBarPerformActionButton')
76-
await page.click('#appBarPerformActionButton')
78+
await page.waitForSelector(selectors.CONFIRM_NEW_PAGE_SELECTOR)
79+
await page.click(selectors.CONFIRM_NEW_PAGE_SELECTOR)
7780
await page.waitForTimeout(PAGE_WAIT * 2)
7881

7982
await page.waitForFunction(() => {
8083
let el = document.querySelector('#loading-spinner');
8184
return el == null || el.clientHeight === 0;
8285
}, { timeout: TIMEOUT });
8386

84-
8587
await page.waitForSelector(selectors.SELECT_CELL_BUTTON_SELECTOR, { timeout: TIMEOUT * 10 })
8688

89+
console.log('Page opened successfully')
90+
8791
})
8892

8993

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ const SNAPSHOT_OPTIONS = {
2525
};
2626

2727

28+
let r = (Math.random() + 1).toString(36).substring(2);
2829

2930
//USERS:
30-
const USERNAME = 'Test_User_Experiment_Manager_'
31+
const USERNAME = `TestUser${r}`
3132
const PASSWORD = 'testpassword'
3233

3334

@@ -65,26 +66,27 @@ describe('Experiment Manager test using Tut#1', () => {
6566
await page.on("dialog", dialog =>
6667
dialog.accept());
6768

68-
await page.waitForSelector('#File', { timeout: PAGE_WAIT * 20 })
69-
await page.waitForTimeout(PAGE_WAIT * 6)
70-
await page.click('#File')
71-
await page.waitForSelector('#New', { timeout: PAGE_WAIT * 10 })
69+
await page.waitForSelector(selectors.SELECT_CELL_BUTTON_SELECTOR, { timeout: TIMEOUT * 4, visible: true })
70+
await page.waitForSelector(selectors.FILE_TAB_SELECTOR, { timeout: PAGE_WAIT * 3 })
7271
await page.waitForTimeout(PAGE_WAIT)
73-
await page.click('#New')
72+
await page.click(selectors.FILE_TAB_SELECTOR)
73+
await page.waitForSelector(selectors.NEW_FILE_SELECTOR, { timeout: PAGE_WAIT * 3 })
7474
await page.waitForTimeout(PAGE_WAIT)
75-
await page.waitForSelector('#appBarPerformActionButton')
76-
await page.click('#appBarPerformActionButton')
75+
await page.click(selectors.NEW_FILE_SELECTOR)
76+
await page.waitForTimeout(PAGE_WAIT)
77+
await page.waitForSelector(selectors.CONFIRM_NEW_PAGE_SELECTOR)
78+
await page.click(selectors.CONFIRM_NEW_PAGE_SELECTOR)
7779
await page.waitForTimeout(PAGE_WAIT * 2)
7880

7981
await page.waitForFunction(() => {
8082
let el = document.querySelector('#loading-spinner');
8183
return el == null || el.clientHeight === 0;
8284
}, { timeout: TIMEOUT });
8385

84-
85-
8686
await page.waitForSelector(selectors.SELECT_CELL_BUTTON_SELECTOR, { timeout: TIMEOUT * 10 })
8787

88+
console.log('Page opened successfully')
89+
8890
})
8991

9092
it('Load Tutorial#1', async () => {

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

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ const TIMEOUT = 60000;
1616

1717
//SNAPSHOT:
1818
const SNAPSHOT_OPTIONS = {
19-
customSnapshotsDir: `./tests/snapshots/${scriptName}`,
19+
customSnapshotsDir: `./tests/snapshots/${scriptName}`,
2020
comparisonMethod: 'ssim',
2121
failureThresholdType: 'percent',
2222
failureThreshold: 0.5
2323
};
2424

2525

26+
let r = (Math.random() + 1).toString(36).substring(2);
2627

2728
//USERS:
28-
const USERNAME = 'test_user_tut_1'
29-
const PASSWORD = 'testpassword'
30-
29+
const USERNAME = `TestUser${r}`
30+
const PASSWORD = 'testpassword'
3131

3232
//TESTS:
3333

@@ -42,7 +42,7 @@ describe('Tutorial #1 for Smoke Testing', () => {
4242
await page.waitForSelector(selectors.LOGIN_PAGE_SELECTOR);
4343
await page.waitForSelector(selectors.USERNAME_SELECTOR)
4444
await expect(page)
45-
.toFill(selectors.USERNAME_SELECTOR,USERNAME, { timeout: TIMEOUT });
45+
.toFill(selectors.USERNAME_SELECTOR, USERNAME, { timeout: TIMEOUT });
4646

4747
await page.waitForSelector(selectors.PASSWORD_SELECTOR)
4848
await expect(page)
@@ -61,12 +61,13 @@ describe('Tutorial #1 for Smoke Testing', () => {
6161
console.log('Opening a new NetPyNE page')
6262

6363
await page.on("dialog", dialog =>
64-
dialog.accept());
64+
dialog.accept());
6565

66-
await page.waitForSelector(selectors.FILE_TAB_SELECTOR, { timeout: PAGE_WAIT * 20 })
67-
await page.waitForTimeout(PAGE_WAIT * 7)
66+
await page.waitForSelector(selectors.SELECT_CELL_BUTTON_SELECTOR, { timeout: TIMEOUT * 4, visible: true })
67+
await page.waitForSelector(selectors.FILE_TAB_SELECTOR, { timeout: PAGE_WAIT * 3 })
68+
await page.waitForTimeout(PAGE_WAIT)
6869
await page.click(selectors.FILE_TAB_SELECTOR)
69-
await page.waitForSelector(selectors.NEW_FILE_SELECTOR, { timeout: PAGE_WAIT * 10 })
70+
await page.waitForSelector(selectors.NEW_FILE_SELECTOR, { timeout: PAGE_WAIT * 3 })
7071
await page.waitForTimeout(PAGE_WAIT)
7172
await page.click(selectors.NEW_FILE_SELECTOR)
7273
await page.waitForTimeout(PAGE_WAIT)
@@ -75,21 +76,21 @@ describe('Tutorial #1 for Smoke Testing', () => {
7576
await page.waitForTimeout(PAGE_WAIT * 2)
7677

7778
await page.waitForFunction(() => {
78-
let el = document.querySelector('#loading-spinner');
79-
return el == null || el.clientHeight === 0;
79+
let el = document.querySelector('#loading-spinner');
80+
return el == null || el.clientHeight === 0;
8081
}, { timeout: TIMEOUT });
8182

82-
83-
8483
await page.waitForSelector(selectors.SELECT_CELL_BUTTON_SELECTOR, { timeout: TIMEOUT * 10 })
8584

86-
})
85+
console.log('Page opened successfully')
86+
87+
})
8788

8889

8990
it('Create and Simulate network', async () => {
9091

9192
await page.waitForTimeout(PAGE_WAIT * 2)
92-
await page.waitForSelector(selectors.SELECT_CELL_BUTTON_SELECTOR, { timeout: TIMEOUT})
93+
await page.waitForSelector(selectors.SELECT_CELL_BUTTON_SELECTOR, { timeout: TIMEOUT })
9394

9495
console.log('Tutorial #1')
9596

@@ -105,9 +106,9 @@ describe('Tutorial #1 for Smoke Testing', () => {
105106
await click(page, selectors.MODEL_BUTTON_SELECTOR, { timeout: TIMEOUT });
106107
await page.waitForSelector(selectors.CREATE_NETWORK_SELECTOR)
107108
await click(page, selectors.CREATE_NETWORK_SELECTOR, { timeout: TIMEOUT });
108-
109+
109110
console.log('Create network')
110-
111+
111112
await page.waitForTimeout(PAGE_WAIT)
112113

113114
console.log('... taking snapshot ...');
@@ -118,7 +119,7 @@ describe('Tutorial #1 for Smoke Testing', () => {
118119
customSnapshotIdentifier: 'Tutorial#1 Network'
119120
});
120121

121-
await click(page,selectors.MODEL_BUTTON_SELECTOR, { timeout: TIMEOUT });
122+
await click(page, selectors.MODEL_BUTTON_SELECTOR, { timeout: TIMEOUT });
122123
await click(page, selectors.SIMULATE_NETWORK_SELECTOR, { timeout: TIMEOUT });
123124
console.log('Simulate network')
124125

@@ -130,10 +131,10 @@ describe('Tutorial #1 for Smoke Testing', () => {
130131

131132

132133
it('Connections Plot', async () => {
133-
134+
134135
await page.waitForTimeout(PAGE_WAIT * 2);
135136
await click(page, selectors.CONNECTIONS_PLOT_SELECTOR, { timeout: TIMEOUT })
136-
await page.waitForSelector(selectors.CANVAS_SELECTOR,{ timeout: TIMEOUT })
137+
await page.waitForSelector(selectors.CANVAS_SELECTOR, { timeout: TIMEOUT })
137138
console.log('View Connections Plot ...')
138139
await page.waitForTimeout(PAGE_WAIT);
139140

@@ -147,9 +148,9 @@ describe('Tutorial #1 for Smoke Testing', () => {
147148
});
148149

149150
it('2D Net Plot', async () => {
150-
151+
151152
await click(page, selectors.TWO_D_NET_PLOT_SELECTOR, { timeout: TIMEOUT })
152-
await page.waitForSelector(selectors.CANVAS_SELECTOR,{ timeout: TIMEOUT })
153+
await page.waitForSelector(selectors.CANVAS_SELECTOR, { timeout: TIMEOUT })
153154
console.log('View 2D Net Plot ...')
154155
await page.waitForTimeout(PAGE_WAIT * 2);
155156

@@ -162,9 +163,9 @@ describe('Tutorial #1 for Smoke Testing', () => {
162163
});
163164

164165
it('Cell Traces Plot', async () => {
165-
166+
166167
await click(page, selectors.CELL_TRACES_PLOT_SELECTOR, { timeout: TIMEOUT })
167-
await page.waitForSelector(selectors.CANVAS_SELECTOR,{ timeout: TIMEOUT })
168+
await page.waitForSelector(selectors.CANVAS_SELECTOR, { timeout: TIMEOUT })
168169
console.log('View Cell Traces Plot ...')
169170
await page.waitForTimeout(PAGE_WAIT);
170171

@@ -177,9 +178,9 @@ describe('Tutorial #1 for Smoke Testing', () => {
177178
});
178179

179180
it('Raster Plot', async () => {
180-
181+
181182
await click(page, selectors.RASTER_PLOT_SELECTOR, { timeout: TIMEOUT })
182-
await page.waitForSelector(selectors.CANVAS_SELECTOR,{ timeout: TIMEOUT })
183+
await page.waitForSelector(selectors.CANVAS_SELECTOR, { timeout: TIMEOUT })
183184
console.log('View Raster Plot ...')
184185
await page.waitForTimeout(PAGE_WAIT);
185186

@@ -192,9 +193,9 @@ describe('Tutorial #1 for Smoke Testing', () => {
192193
});
193194

194195
it('Spike Hist Plot', async () => {
195-
196+
196197
await click(page, selectors.SPIKE_HIST_PLOT_SELECTOR, { timeout: TIMEOUT })
197-
await page.waitForSelector(selectors.CANVAS_SELECTOR,{ timeout: TIMEOUT })
198+
await page.waitForSelector(selectors.CANVAS_SELECTOR, { timeout: TIMEOUT })
198199
console.log('View Spike Hist Plot ...')
199200
await page.waitForTimeout(PAGE_WAIT);
200201

@@ -207,9 +208,9 @@ describe('Tutorial #1 for Smoke Testing', () => {
207208
});
208209

209210
it('Granger Plot', async () => {
210-
211+
211212
await click(page, selectors.GRANGER_PLOT_SELECTOR, { timeout: TIMEOUT })
212-
await page.waitForSelector(selectors.CANVAS_SELECTOR,{ timeout: TIMEOUT })
213+
await page.waitForSelector(selectors.CANVAS_SELECTOR, { timeout: TIMEOUT })
213214
console.log('View Granger Plot ...')
214215
await page.waitForTimeout(PAGE_WAIT);
215216

@@ -222,19 +223,19 @@ describe('Tutorial #1 for Smoke Testing', () => {
222223
});
223224

224225
it('Rate Spectogram Plot', async () => {
225-
226+
226227
await click(page, selectors.RATE_SPECTROGRAM_PLOT_SELECTOR, { timeout: TIMEOUT })
227-
await page.waitForSelector(selectors.CANVAS_SELECTOR,{ timeout: TIMEOUT })
228+
await page.waitForSelector(selectors.CANVAS_SELECTOR, { timeout: TIMEOUT })
228229

229230
await page.waitForTimeout(PAGE_WAIT);
230231

231232
await click(page, selectors.CONNECTIONS_PLOT_SELECTOR, { timeout: TIMEOUT })
232-
await page.waitForSelector(selectors.CANVAS_SELECTOR,{ timeout: TIMEOUT })
233+
await page.waitForSelector(selectors.CANVAS_SELECTOR, { timeout: TIMEOUT })
233234

234235
await page.waitForTimeout(PAGE_WAIT);
235236

236237
await click(page, selectors.RATE_SPECTROGRAM_PLOT_SELECTOR, { timeout: TIMEOUT })
237-
await page.waitForSelector(selectors.CANVAS_SELECTOR,{ timeout: TIMEOUT })
238+
await page.waitForSelector(selectors.CANVAS_SELECTOR, { timeout: TIMEOUT })
238239

239240
console.log('View Rate Spectogram Plot ...')
240241
await page.waitForTimeout(PAGE_WAIT);

0 commit comments

Comments
 (0)