Skip to content

Commit b79a196

Browse files
netpyne-101 changed selectors
1 parent 033f131 commit b79a196

2 files changed

Lines changed: 29 additions & 22 deletions

File tree

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ const TIMEOUT = 60000;
1515

1616
//SNAPSHOT:
1717
const SNAPSHOT_OPTIONS = {
18-
customSnapshotsDir: `./tests/snapshots/${scriptName}`,
18+
customSnapshotsDir: `./tests/snapshots/Tut#2_smoke.test/`,
1919
comparisonMethod: 'ssim',
2020
failureThresholdType: 'percent',
21-
failureThreshold: 0.5
21+
failureThreshold: 0.25
2222
};
2323

2424

@@ -132,13 +132,13 @@ describe('Test for the Control Panel - color picker', () => {
132132

133133
console.log('Opening Control Panel')
134134

135-
await page.waitForSelector('div[title="Control Panel"]')
135+
await page.waitForSelector(selectors.CONTROL_PANEL_TAB_SELECTOR)
136136

137-
await page.click('div[title="Control Panel"]')
137+
await page.click(selectors.CONTROL_PANEL_TAB_SELECTOR)
138138

139-
await page.waitForSelector('ul[role="tree"]')
139+
await page.waitForSelector(selectors.NETWORKS_IN_CONTROL_PANEL_SELECTOR)
140140

141-
const network_items = (await page.$$('li[role="treeitem"]')).length;
141+
const network_items = (await page.$$(selectors.NETWORK_ITEMS_CONTROL_PANEL_SELECTOR)).length;
142142
await expect(network_items).toEqual(3)
143143

144144
console.log('Control Panel displayed successfully')
@@ -151,10 +151,10 @@ describe('Test for the Control Panel - color picker', () => {
151151

152152
await page.waitForTimeout(PAGE_WAIT * 3)
153153

154-
await page.waitForSelector('div[class="MuiGrid-root MuiGrid-container MuiGrid-justify-content-xs-space-between"]')
154+
await page.waitForSelector(selectors.CONTROL_PANEL_TABLE_SELECTOR)
155155

156156

157-
const primary_level_colors = await page.$$eval('rect[rx="5"]', primary_level_colors => {
157+
const primary_level_colors = await page.$$eval(selectors.COLOR_RECT_SELECTOR, primary_level_colors => {
158158
return primary_level_colors.map(primary_level_color => primary_level_color.outerHTML);
159159
});
160160

@@ -164,20 +164,20 @@ describe('Test for the Control Panel - color picker', () => {
164164

165165
await page.waitForTimeout(PAGE_WAIT)
166166

167-
const rows = await page.$$('div[class = "MuiTypography-root MuiTreeItem-label MuiTypography-body1"]')
167+
const rows = await page.$$(selectors.CONTROL_PANEL_NETWORK_ROWS_SELECTOR)
168168
for (var i = 0; i < rows.length; i++) {
169169
await rows[0].hover()
170170
}
171171

172-
const buttons = await page.$$('button[class="MuiButtonBase-root MuiIconButton-root"]')
172+
const buttons = await page.$$(selectors.COLOR_CONTROL_BUTTONS_SELECTOR)
173173

174174
for (var i = 0; i < buttons.length; i++) {
175175
await buttons[1].click()
176176
}
177177

178178
await page.waitForTimeout(PAGE_WAIT)
179179

180-
const rndm_primary_level_colors = await page.$$eval('rect[rx="5"]', rndm_primary_level_colors => {
180+
const rndm_primary_level_colors = await page.$$eval(selectors.COLOR_RECT_SELECTOR, rndm_primary_level_colors => {
181181
return rndm_primary_level_colors.map(rndm_primary_level_color => rndm_primary_level_color.outerHTML);
182182
});
183183

@@ -196,13 +196,13 @@ describe('Test for the Control Panel - color picker', () => {
196196

197197
console.log('Randomize Sub Level E network color')
198198

199-
const rows = await page.$$('div[class = "MuiTypography-root MuiTreeItem-label MuiTypography-body1"]')
199+
const rows = await page.$$(selectors.CONTROL_PANEL_NETWORK_ROWS_SELECTOR)
200200
for (var i = 0; i < rows.length; i++) {
201201
await rows[1].click()
202202
await rows[1].hover()
203203
}
204204

205-
const second_level_colors = await page.$$eval('rect[rx="5"]', second_level_colors => {
205+
const second_level_colors = await page.$$eval(selectors.COLOR_RECT_SELECTOR, second_level_colors => {
206206
return second_level_colors.map(second_level_color => second_level_color.outerHTML);
207207
});
208208

@@ -211,7 +211,7 @@ describe('Test for the Control Panel - color picker', () => {
211211
// expect(second_level_colors[2]).toEqual(second_level_colors[3])
212212

213213

214-
const buttons = await page.$$('button[class="MuiButtonBase-root MuiIconButton-root"]')
214+
const buttons = await page.$$(selectors.COLOR_CONTROL_BUTTONS_SELECTOR)
215215

216216
for (var i = 0; i < buttons.length; i++) {
217217
await buttons[2].click()
@@ -231,20 +231,20 @@ describe('Test for the Control Panel - color picker', () => {
231231

232232
console.log('Selecting a color for the I network')
233233

234-
const rows = await page.$$('div[class = "MuiTypography-root MuiTreeItem-label MuiTypography-body1"]')
234+
const rows = await page.$$(selectors.CONTROL_PANEL_NETWORK_ROWS_SELECTOR)
235235
for (var i = 0; i < rows.length; i++) {
236236
await rows[1].click()
237237
}
238238

239239
await page.waitForTimeout(PAGE_WAIT)
240240

241-
const rows_ = await page.$$('div[class = "MuiTypography-root MuiTreeItem-label MuiTypography-body1"]')
241+
const rows_ = await page.$$(selectors.CONTROL_PANEL_NETWORK_ROWS_SELECTOR)
242242

243243
for (var i = 0; i < rows_.length; i++) {
244244
await rows_[2].click()
245245
}
246246

247-
const network_colors = await page.$$eval('rect[rx="5"]', network_colors => {
247+
const network_colors = await page.$$eval(selectors.COLOR_RECT_SELECTOR, network_colors => {
248248
return network_colors.map(network_color => network_color.outerHTML);
249249
});
250250

@@ -253,15 +253,15 @@ describe('Test for the Control Panel - color picker', () => {
253253

254254
await page.waitForTimeout(PAGE_WAIT * 3)
255255

256-
const buttons = await page.$$('button[class="MuiButtonBase-root MuiIconButton-root"]')
256+
const buttons = await page.$$(selectors.COLOR_CONTROL_BUTTONS_SELECTOR)
257257

258258
for (var i = 0; i < buttons.length; i++) {
259259
await buttons[4].click()
260260
}
261261

262262
await page.waitForTimeout(PAGE_WAIT)
263263

264-
const list_bounds = await page.$('ul[role="tree"]');
264+
const list_bounds = await page.$(selectors.NETWORKS_IN_CONTROL_PANEL_SELECTOR);
265265
const rect = await page.evaluate((list_bounds) => {
266266
const { top, left, bottom, right } = list_bounds.getBoundingClientRect();
267267
return { top, left, bottom, right };
@@ -273,12 +273,12 @@ describe('Test for the Control Panel - color picker', () => {
273273

274274
await page.waitForTimeout(PAGE_WAIT * 2)
275275

276-
const rows_after_colouring_I = await page.$$('div[class = "MuiTypography-root MuiTreeItem-label MuiTypography-body1"]')
276+
const rows_after_colouring_I = await page.$$(selectors.CONTROL_PANEL_NETWORK_ROWS_SELECTOR)
277277
for (var i = 0; i < rows_after_colouring_I.length; i++) {
278278
await rows_after_colouring_I[2].click()
279279
}
280280

281-
const network_colors_after_colouring_I = await page.$$eval('rect[rx="5"]', network_colors_after_colouring_I => {
281+
const network_colors_after_colouring_I = await page.$$eval(selectors.COLOR_RECT_SELECTOR, network_colors_after_colouring_I => {
282282
return network_colors_after_colouring_I.map(network_color_after_colouring_I => network_color_after_colouring_I.outerHTML);
283283
});
284284
await page.waitForTimeout(PAGE_WAIT)

tests/frontend/e2e/tests/selectors.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,11 @@ export const EDIT_EXPERIMENT_BACK_SELECTOR = '.editExperimentBack > svg'
6969
export const INDIVIDUAL_EXPERIMENT_ROW_SELECTOR = 'tr[class="MuiTableRow-root"]'
7070
export const FILE_TAB_SELECTOR = '#File'
7171
export const NEW_FILE_SELECTOR = '#New'
72-
export const CONFIRM_NEW_PAGE_SELECTOR = '#appBarPerformActionButton'
72+
export const CONFIRM_NEW_PAGE_SELECTOR = '#appBarPerformActionButton'
73+
export const CONTROL_PANEL_TAB_SELECTOR = 'div[title="Control Panel"]'
74+
export const NETWORKS_IN_CONTROL_PANEL_SELECTOR = 'ul[role="tree"]'
75+
export const NETWORK_ITEMS_CONTROL_PANEL_SELECTOR = 'li[role="treeitem"]'
76+
export const COLOR_CONTROL_BUTTONS_SELECTOR = 'button[class="MuiButtonBase-root MuiIconButton-root"]'
77+
export const COLOR_RECT_SELECTOR = 'rect[rx="5"]'
78+
export const CONTROL_PANEL_NETWORK_ROWS_SELECTOR = 'div[class = "MuiTypography-root MuiTreeItem-label MuiTypography-body1"]'
79+
export const CONTROL_PANEL_TABLE_SELECTOR = 'div[class="MuiGrid-root MuiGrid-container MuiGrid-justify-content-xs-space-between"]'

0 commit comments

Comments
 (0)