Skip to content

Commit a6f3b8d

Browse files
SimaoBolota-MetaCellSimaoBolota-MetaCell
committed
other tests with the same logic when starting
1 parent a32999b commit a6f3b8d

11 files changed

Lines changed: 192 additions & 151 deletions

‎tests/frontend/e2e/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"description": "NetPyNe UI tests",
55
"license": "unlicensed",
66
"scripts": {
7-
"test": "jest --verbose Tut#1_smoke",
7+
"test": "jest --verbose Tut#1_smoke && jest --verbose Tut#2_smoke && jest --verbose Tut#3a_smoke && jest --verbose Tut#3b_smoke && jest --verbose Tut#4_smoke && jest --verbose ControlPanel && jest --verbose SaveOpenFile && jest --verbose RxD && jest --verbose EEG_and_Dipole_Tut#1 && jest --verbose ExperimentManager_Tut#1",
8+
"puppeteer_test" : "jest --verbose",
89
"EEG_Dipole_test": "jest --verbose EEG_and_Dipole_Tut#1 ",
910
"Experiment_Manager_test": "jest --verbose ExperimentManager_Tut#1 ",
1011
"Tutorial_1_test":"jest --verbose Tut#1_smoke ",

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

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,25 @@ describe('Test for the Control Panel - color picker', () => {
3737

3838
beforeAll(async () => {
3939
await page.goto(baseURL);
40-
await page.waitForSelector(selectors.LOGIN_PAGE_SELECTOR);
41-
await page.waitForSelector(selectors.USERNAME_SELECTOR)
42-
await expect(page)
43-
.toFill(selectors.USERNAME_SELECTOR, USERNAME, { timeout: TIMEOUT });
44-
45-
await page.waitForSelector(selectors.PASSWORD_SELECTOR)
46-
await expect(page)
47-
.toFill(selectors.PASSWORD_SELECTOR, PASSWORD, { timeout: TIMEOUT });
48-
49-
await page.click(selectors.LOGIN_BUTTON_SELECTOR)
50-
51-
await page.waitForFunction(() => {
52-
let el = document.querySelector('#loading-spinner');
53-
return el == null || el.clientHeight === 0;
54-
}, { timeout: TIMEOUT });
40+
if (baseURL.includes('test.netpyne.metacell.us')) {
41+
console.log('Logging in as test user ...')
42+
await page.waitForSelector(selectors.LOGIN_PAGE_SELECTOR);
43+
await page.waitForSelector(selectors.USERNAME_SELECTOR)
44+
await expect(page)
45+
.toFill(selectors.USERNAME_SELECTOR, USERNAME, { timeout: TIMEOUT });
46+
47+
await page.waitForSelector(selectors.PASSWORD_SELECTOR)
48+
await expect(page)
49+
.toFill(selectors.PASSWORD_SELECTOR, PASSWORD, { timeout: TIMEOUT });
50+
51+
await page.click(selectors.LOGIN_BUTTON_SELECTOR)
52+
// Wait for initial loading spinner to disappear
53+
await page.waitForFunction(() => {
54+
let el = document.querySelector('#loading-spinner');
55+
return el == null || el.clientHeight === 0;
56+
}, { timeout: TIMEOUT });
57+
console.log('Logged in successfully')
58+
}
5559
});
5660

5761
it('Open new page', async () => {

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

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,25 @@ jest.setTimeout(300000);
3939

4040
beforeAll(async () => {
4141
await page.goto(baseURL);
42-
await page.waitForSelector(selectors.LOGIN_PAGE_SELECTOR);
43-
await page.waitForSelector(selectors.USERNAME_SELECTOR)
44-
await expect(page)
45-
.toFill(selectors.USERNAME_SELECTOR, USERNAME, { timeout: TIMEOUT });
46-
47-
await page.waitForSelector(selectors.PASSWORD_SELECTOR)
48-
await expect(page)
49-
.toFill(selectors.PASSWORD_SELECTOR, PASSWORD, { timeout: TIMEOUT });
50-
51-
await page.click(selectors.LOGIN_BUTTON_SELECTOR)
52-
// Wait for initial loading spinner to disappear
53-
await page.waitForFunction(() => {
54-
let el = document.querySelector('#loading-spinner');
55-
return el == null || el.clientHeight === 0;
56-
}, { timeout: TIMEOUT });
42+
if (baseURL.includes('test.netpyne.metacell.us')) {
43+
console.log('Logging in as test user ...')
44+
await page.waitForSelector(selectors.LOGIN_PAGE_SELECTOR);
45+
await page.waitForSelector(selectors.USERNAME_SELECTOR)
46+
await expect(page)
47+
.toFill(selectors.USERNAME_SELECTOR, USERNAME, { timeout: TIMEOUT });
48+
49+
await page.waitForSelector(selectors.PASSWORD_SELECTOR)
50+
await expect(page)
51+
.toFill(selectors.PASSWORD_SELECTOR, PASSWORD, { timeout: TIMEOUT });
52+
53+
await page.click(selectors.LOGIN_BUTTON_SELECTOR)
54+
// Wait for initial loading spinner to disappear
55+
await page.waitForFunction(() => {
56+
let el = document.querySelector('#loading-spinner');
57+
return el == null || el.clientHeight === 0;
58+
}, { timeout: TIMEOUT });
59+
console.log('Logged in successfully')
60+
}
5761
});
5862

5963

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

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,25 @@ describe('Experiment Manager test using Tut#1', () => {
4242

4343
beforeAll(async () => {
4444
await page.goto(baseURL);
45-
await page.waitForSelector(selectors.LOGIN_PAGE_SELECTOR);
46-
await page.waitForSelector(selectors.USERNAME_SELECTOR)
47-
await expect(page)
48-
.toFill(selectors.USERNAME_SELECTOR, USERNAME, { timeout: TIMEOUT });
49-
50-
await page.waitForSelector(selectors.PASSWORD_SELECTOR)
51-
await expect(page)
52-
.toFill(selectors.PASSWORD_SELECTOR, PASSWORD, { timeout: TIMEOUT });
53-
54-
await page.click(selectors.LOGIN_BUTTON_SELECTOR)
55-
// Wait for initial loading spinner to disappear
56-
await page.waitForFunction(() => {
57-
let el = document.querySelector('#loading-spinner');
58-
return el == null || el.clientHeight === 0;
59-
}, { timeout: TIMEOUT });
45+
if (baseURL.includes('test.netpyne.metacell.us')) {
46+
console.log('Logging in as test user ...')
47+
await page.waitForSelector(selectors.LOGIN_PAGE_SELECTOR);
48+
await page.waitForSelector(selectors.USERNAME_SELECTOR)
49+
await expect(page)
50+
.toFill(selectors.USERNAME_SELECTOR, USERNAME, { timeout: TIMEOUT });
51+
52+
await page.waitForSelector(selectors.PASSWORD_SELECTOR)
53+
await expect(page)
54+
.toFill(selectors.PASSWORD_SELECTOR, PASSWORD, { timeout: TIMEOUT });
55+
56+
await page.click(selectors.LOGIN_BUTTON_SELECTOR)
57+
// Wait for initial loading spinner to disappear
58+
await page.waitForFunction(() => {
59+
let el = document.querySelector('#loading-spinner');
60+
return el == null || el.clientHeight === 0;
61+
}, { timeout: TIMEOUT });
62+
console.log('Logged in successfully')
63+
}
6064
});
6165

6266
it('Open new page', async () => {

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

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,25 @@ describe('RxD testing', () => {
4343

4444
beforeAll(async () => {
4545
await page.goto(baseURL);
46-
await page.waitForSelector(selectors.LOGIN_PAGE_SELECTOR);
47-
await page.waitForSelector(selectors.USERNAME_SELECTOR)
48-
await expect(page)
49-
.toFill(selectors.USERNAME_SELECTOR, USERNAME, { timeout: TIMEOUT });
50-
51-
await page.waitForSelector(selectors.PASSWORD_SELECTOR)
52-
await expect(page)
53-
.toFill(selectors.PASSWORD_SELECTOR, PASSWORD, { timeout: TIMEOUT });
54-
55-
await page.click(selectors.LOGIN_BUTTON_SELECTOR)
56-
57-
await page.waitForFunction(() => {
58-
let el = document.querySelector('#loading-spinner');
59-
return el == null || el.clientHeight === 0;
60-
}, { timeout: TIMEOUT });
46+
if (baseURL.includes('test.netpyne.metacell.us')) {
47+
console.log('Logging in as test user ...')
48+
await page.waitForSelector(selectors.LOGIN_PAGE_SELECTOR);
49+
await page.waitForSelector(selectors.USERNAME_SELECTOR)
50+
await expect(page)
51+
.toFill(selectors.USERNAME_SELECTOR, USERNAME, { timeout: TIMEOUT });
52+
53+
await page.waitForSelector(selectors.PASSWORD_SELECTOR)
54+
await expect(page)
55+
.toFill(selectors.PASSWORD_SELECTOR, PASSWORD, { timeout: TIMEOUT });
56+
57+
await page.click(selectors.LOGIN_BUTTON_SELECTOR)
58+
// Wait for initial loading spinner to disappear
59+
await page.waitForFunction(() => {
60+
let el = document.querySelector('#loading-spinner');
61+
return el == null || el.clientHeight === 0;
62+
}, { timeout: TIMEOUT });
63+
console.log('Logged in successfully')
64+
}
6165
});
6266

6367
it('Open new page', async () => {

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

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,25 @@ describe.skip('Save / Open File testing', () => {
4343

4444
beforeAll(async () => {
4545
await page.goto(baseURL);
46-
await page.waitForSelector(selectors.LOGIN_PAGE_SELECTOR);
47-
await page.waitForSelector(selectors.USERNAME_SELECTOR)
48-
await expect(page)
49-
.toFill(selectors.USERNAME_SELECTOR, USERNAME, { timeout: TIMEOUT });
50-
51-
await page.waitForSelector(selectors.PASSWORD_SELECTOR)
52-
await expect(page)
53-
.toFill(selectors.PASSWORD_SELECTOR, PASSWORD, { timeout: TIMEOUT });
54-
55-
await page.click(selectors.LOGIN_BUTTON_SELECTOR)
56-
57-
await page.waitForFunction(() => {
58-
let el = document.querySelector('#loading-spinner');
59-
return el == null || el.clientHeight === 0;
60-
}, { timeout: TIMEOUT });
46+
if (baseURL.includes('test.netpyne.metacell.us')) {
47+
console.log('Logging in as test user ...')
48+
await page.waitForSelector(selectors.LOGIN_PAGE_SELECTOR);
49+
await page.waitForSelector(selectors.USERNAME_SELECTOR)
50+
await expect(page)
51+
.toFill(selectors.USERNAME_SELECTOR, USERNAME, { timeout: TIMEOUT });
52+
53+
await page.waitForSelector(selectors.PASSWORD_SELECTOR)
54+
await expect(page)
55+
.toFill(selectors.PASSWORD_SELECTOR, PASSWORD, { timeout: TIMEOUT });
56+
57+
await page.click(selectors.LOGIN_BUTTON_SELECTOR)
58+
// Wait for initial loading spinner to disappear
59+
await page.waitForFunction(() => {
60+
let el = document.querySelector('#loading-spinner');
61+
return el == null || el.clientHeight === 0;
62+
}, { timeout: TIMEOUT });
63+
console.log('Logged in successfully')
64+
}
6165
});
6266

6367
it('Open new page', async () => {

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

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,25 @@ describe('Tutorial #2 for Smoke Testing', () => {
3737

3838
beforeAll(async () => {
3939
await page.goto(baseURL);
40-
await page.waitForSelector(selectors.LOGIN_PAGE_SELECTOR);
41-
await page.waitForSelector(selectors.USERNAME_SELECTOR)
42-
await expect(page)
43-
.toFill(selectors.USERNAME_SELECTOR, USERNAME, { timeout: TIMEOUT });
44-
45-
await page.waitForSelector(selectors.PASSWORD_SELECTOR)
46-
await expect(page)
47-
.toFill(selectors.PASSWORD_SELECTOR, PASSWORD, { timeout: TIMEOUT });
48-
49-
await page.click(selectors.LOGIN_BUTTON_SELECTOR)
50-
// Wait for initial loading spinner to disappear
51-
await page.waitForFunction(() => {
52-
let el = document.querySelector('#loading-spinner');
53-
return el == null || el.clientHeight === 0;
54-
}, { timeout: TIMEOUT });
40+
if (baseURL.includes('test.netpyne.metacell.us')) {
41+
console.log('Logging in as test user ...')
42+
await page.waitForSelector(selectors.LOGIN_PAGE_SELECTOR);
43+
await page.waitForSelector(selectors.USERNAME_SELECTOR)
44+
await expect(page)
45+
.toFill(selectors.USERNAME_SELECTOR, USERNAME, { timeout: TIMEOUT });
46+
47+
await page.waitForSelector(selectors.PASSWORD_SELECTOR)
48+
await expect(page)
49+
.toFill(selectors.PASSWORD_SELECTOR, PASSWORD, { timeout: TIMEOUT });
50+
51+
await page.click(selectors.LOGIN_BUTTON_SELECTOR)
52+
// Wait for initial loading spinner to disappear
53+
await page.waitForFunction(() => {
54+
let el = document.querySelector('#loading-spinner');
55+
return el == null || el.clientHeight === 0;
56+
}, { timeout: TIMEOUT });
57+
console.log('Logged in successfully')
58+
}
5559
});
5660

5761
it('Open new page', async () => {

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

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,25 @@ describe('Tutorial #3a for Smoke Testing', () => {
3838

3939
beforeAll(async () => {
4040
await page.goto(baseURL);
41-
await page.waitForSelector(selectors.LOGIN_PAGE_SELECTOR);
42-
await page.waitForSelector(selectors.USERNAME_SELECTOR)
43-
await expect(page)
44-
.toFill(selectors.USERNAME_SELECTOR, USERNAME, { timeout: TIMEOUT });
45-
46-
await page.waitForSelector(selectors.PASSWORD_SELECTOR)
47-
await expect(page)
48-
.toFill(selectors.PASSWORD_SELECTOR, PASSWORD, { timeout: TIMEOUT });
49-
50-
await page.click(selectors.LOGIN_BUTTON_SELECTOR)
51-
// Wait for initial loading spinner to disappear
52-
await page.waitForFunction(() => {
53-
let el = document.querySelector('#loading-spinner');
54-
return el == null || el.clientHeight === 0;
55-
}, { timeout: TIMEOUT });
41+
if (baseURL.includes('test.netpyne.metacell.us')) {
42+
console.log('Logging in as test user ...')
43+
await page.waitForSelector(selectors.LOGIN_PAGE_SELECTOR);
44+
await page.waitForSelector(selectors.USERNAME_SELECTOR)
45+
await expect(page)
46+
.toFill(selectors.USERNAME_SELECTOR, USERNAME, { timeout: TIMEOUT });
47+
48+
await page.waitForSelector(selectors.PASSWORD_SELECTOR)
49+
await expect(page)
50+
.toFill(selectors.PASSWORD_SELECTOR, PASSWORD, { timeout: TIMEOUT });
51+
52+
await page.click(selectors.LOGIN_BUTTON_SELECTOR)
53+
// Wait for initial loading spinner to disappear
54+
await page.waitForFunction(() => {
55+
let el = document.querySelector('#loading-spinner');
56+
return el == null || el.clientHeight === 0;
57+
}, { timeout: TIMEOUT });
58+
console.log('Logged in successfully')
59+
}
5660
});
5761

5862
it('Open new page', async () => {

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

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,25 @@ describe('Tutorial #3b for Smoke Testing', () => {
3939

4040
beforeAll(async () => {
4141
await page.goto(baseURL);
42-
await page.waitForSelector(selectors.LOGIN_PAGE_SELECTOR);
43-
await page.waitForSelector(selectors.USERNAME_SELECTOR)
44-
await expect(page)
45-
.toFill(selectors.USERNAME_SELECTOR, USERNAME, { timeout: TIMEOUT });
46-
47-
await page.waitForSelector(selectors.PASSWORD_SELECTOR)
48-
await expect(page)
49-
.toFill(selectors.PASSWORD_SELECTOR, PASSWORD, { timeout: TIMEOUT });
50-
51-
await page.click(selectors.LOGIN_BUTTON_SELECTOR)
52-
// Wait for initial loading spinner to disappear
53-
await page.waitForFunction(() => {
54-
let el = document.querySelector('#loading-spinner');
55-
return el == null || el.clientHeight === 0;
56-
}, { timeout: TIMEOUT });
42+
if (baseURL.includes('test.netpyne.metacell.us')) {
43+
console.log('Logging in as test user ...')
44+
await page.waitForSelector(selectors.LOGIN_PAGE_SELECTOR);
45+
await page.waitForSelector(selectors.USERNAME_SELECTOR)
46+
await expect(page)
47+
.toFill(selectors.USERNAME_SELECTOR, USERNAME, { timeout: TIMEOUT });
48+
49+
await page.waitForSelector(selectors.PASSWORD_SELECTOR)
50+
await expect(page)
51+
.toFill(selectors.PASSWORD_SELECTOR, PASSWORD, { timeout: TIMEOUT });
52+
53+
await page.click(selectors.LOGIN_BUTTON_SELECTOR)
54+
// Wait for initial loading spinner to disappear
55+
await page.waitForFunction(() => {
56+
let el = document.querySelector('#loading-spinner');
57+
return el == null || el.clientHeight === 0;
58+
}, { timeout: TIMEOUT });
59+
console.log('Logged in successfully')
60+
}
5761
});
5862

5963
it('Open new page', async () => {

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

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,25 @@ describe('Tutorial #3c for Smoke Testing', () => {
4040

4141
beforeAll(async () => {
4242
await page.goto(baseURL);
43-
await page.waitForSelector(selectors.LOGIN_PAGE_SELECTOR);
44-
await page.waitForSelector(selectors.USERNAME_SELECTOR)
45-
await expect(page)
46-
.toFill(selectors.USERNAME_SELECTOR, USERNAME, { timeout: TIMEOUT });
47-
48-
await page.waitForSelector(selectors.PASSWORD_SELECTOR)
49-
await expect(page)
50-
.toFill(selectors.PASSWORD_SELECTOR, PASSWORD, { timeout: TIMEOUT });
51-
52-
await page.click(selectors.LOGIN_BUTTON_SELECTOR)
53-
// Wait for initial loading spinner to disappear
54-
await page.waitForFunction(() => {
55-
let el = document.querySelector('#loading-spinner');
56-
return el == null || el.clientHeight === 0;
57-
}, { timeout: TIMEOUT });
43+
if (baseURL.includes('test.netpyne.metacell.us')) {
44+
console.log('Logging in as test user ...')
45+
await page.waitForSelector(selectors.LOGIN_PAGE_SELECTOR);
46+
await page.waitForSelector(selectors.USERNAME_SELECTOR)
47+
await expect(page)
48+
.toFill(selectors.USERNAME_SELECTOR, USERNAME, { timeout: TIMEOUT });
49+
50+
await page.waitForSelector(selectors.PASSWORD_SELECTOR)
51+
await expect(page)
52+
.toFill(selectors.PASSWORD_SELECTOR, PASSWORD, { timeout: TIMEOUT });
53+
54+
await page.click(selectors.LOGIN_BUTTON_SELECTOR)
55+
// Wait for initial loading spinner to disappear
56+
await page.waitForFunction(() => {
57+
let el = document.querySelector('#loading-spinner');
58+
return el == null || el.clientHeight === 0;
59+
}, { timeout: TIMEOUT });
60+
console.log('Logged in successfully')
61+
}
5862
});
5963

6064
it('Open new page', async () => {

0 commit comments

Comments
 (0)