From fa974c68bd312e8c8b3b0c255ea3e8ee8de5dab8 Mon Sep 17 00:00:00 2001
From: BryceLTaylor <brycet@media.mit.edu>
Date: Wed, 29 May 2019 14:23:25 -0400
Subject: [PATCH] Remove WaitUntilGone function from integration tests
These were causing the tests to fail and should be fixed by the update to FindByXpath function.
---
test/helpers/selenium-helper.js | 7 +------
test/integration/examples.test.js | 4 +---
test/integration/menu-bar.test.js | 5 +----
test/integration/project-loading.test.js | 5 +----
4 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/test/helpers/selenium-helper.js b/test/helpers/selenium-helper.js
index 7063fc555..f10f0800a 100644
--- a/test/helpers/selenium-helper.js
+++ b/test/helpers/selenium-helper.js
@@ -26,8 +26,7 @@ class SeleniumHelper {
'getSauceDriver',
'getLogs',
'loadUri',
- 'rightClickText',
- 'waitUntilGone'
+ 'rightClickText'
]);
}
@@ -129,10 +128,6 @@ class SeleniumHelper {
return this.clickXpath(`//button//*[contains(text(), '${text}')]`);
}
- waitUntilGone (element, timeoutMessage = 'waitUntilGone timed out') {
- return this.driver.wait(until.stalenessOf(element), DEFAULT_TIMEOUT_MILLISECONDS, timeoutMessage);
- }
-
getLogs (whitelist) {
if (!whitelist) {
// Default whitelist
diff --git a/test/integration/examples.test.js b/test/integration/examples.test.js
index aa867b041..c7b9836a2 100644
--- a/test/integration/examples.test.js
+++ b/test/integration/examples.test.js
@@ -11,8 +11,7 @@ const {
findByXpath,
getDriver,
getLogs,
- loadUri,
- waitUntilGone
+ loadUri
} = new SeleniumHelper();
let driver;
@@ -31,7 +30,6 @@ describe('player example', () => {
test('Load a project by ID', async () => {
const projectId = '96708228';
await loadUri(`${uri}#${projectId}`);
- await waitUntilGone(findByText('Loading'));
await clickXpath('//img[@title="Go"]');
await new Promise(resolve => setTimeout(resolve, 2000));
await clickXpath('//img[@title="Stop"]');
diff --git a/test/integration/menu-bar.test.js b/test/integration/menu-bar.test.js
index 7c653a907..3f6457e52 100644
--- a/test/integration/menu-bar.test.js
+++ b/test/integration/menu-bar.test.js
@@ -9,8 +9,7 @@ const {
getDriver,
loadUri,
rightClickText,
- scope,
- waitUntilGone
+ scope
} = new SeleniumHelper();
const uri = path.resolve(__dirname, '../../build/index.html');
@@ -78,7 +77,6 @@ describe('Menu bar settings', () => {
await clickText('File');
const input = await findByXpath('//input[@accept=".sb,.sb2,.sb3"]');
await input.sendKeys(path.resolve(__dirname, '../fixtures/project1.sb3'));
- await waitUntilGone(findByText('Loading'));
// No replace alert since no changes were made
await findByText('project1-sprite');
});
@@ -95,7 +93,6 @@ describe('Menu bar settings', () => {
await input.sendKeys(path.resolve(__dirname, '../fixtures/project1.sb3'));
await driver.switchTo().alert()
.accept();
- await waitUntilGone(findByText('Loading'));
await findByText('project1-sprite');
});
});
diff --git a/test/integration/project-loading.test.js b/test/integration/project-loading.test.js
index e0c5e5d1f..00a0b0ee8 100644
--- a/test/integration/project-loading.test.js
+++ b/test/integration/project-loading.test.js
@@ -9,8 +9,7 @@ const {
getDriver,
getLogs,
loadUri,
- scope,
- waitUntilGone
+ scope
} = new SeleniumHelper();
const uri = path.resolve(__dirname, '../../build/index.html');
@@ -39,7 +38,6 @@ describe('Loading scratch gui', () => {
const projectId = '96708228';
await loadUri(`${uri}#${projectId}`);
- await waitUntilGone(findByText('Loading'));
await clickXpath('//img[@title="Go"]');
await new Promise(resolve => setTimeout(resolve, 2000));
await clickXpath('//img[@title="Stop"]');
@@ -60,7 +58,6 @@ describe('Loading scratch gui', () => {
.setSize(1920, 1080);
const projectId = '96708228';
await loadUri(`${uri}#${projectId}`);
- await waitUntilGone(findByText('Loading'));
await clickXpath('//img[@title="Full Screen Control"]');
await new Promise(resolve => setTimeout(resolve, 500));
await clickXpath('//img[@title="Go"]');
--
GitLab