From e42ceaf78cb075e6600ae591279700aaf5336f93 Mon Sep 17 00:00:00 2001
From: BryceLTaylor <brycet@media.mit.edu>
Date: Thu, 27 Aug 2020 13:42:23 -0400
Subject: [PATCH] =?UTF-8?q?Update=20My-Stuff=20tests=20to=20correctly=20us?=
 =?UTF-8?q?e=20=E2=80=98expect=E2=80=99=20and=20remove=20sleeps?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/integration/my-stuff.test.js | 45 ++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/test/integration/my-stuff.test.js b/test/integration/my-stuff.test.js
index d95972c5c..7686abefb 100644
--- a/test/integration/my-stuff.test.js
+++ b/test/integration/my-stuff.test.js
@@ -41,29 +41,41 @@ describe('www-integration my_stuff', () => {
 
     test('verify My Stuff structure (tabs, title)', async () => {
         await driver.get(myStuffURL);
-        await findByXpath('//div[@class="box-head"]/h2');
-        await findByXpath('//li[@data-tab="projects"]/a');
-        await findByXpath('//li[@data-tab="shared"]/a');
-        await findByXpath('//li[@data-tab="unshared"]/a');
-        await findByXpath('//li[@data-tab="galleries"]/a');
-        await findByXpath('//li[@data-tab="trash"]/a');
+        let header = await findByXpath('//div[@class="box-head"]/h2');
+        let headerVisible = await header.isDisplayed();
+        await expect(headerVisible).toBe(true);
+        let allTab = await findByXpath('//li[@data-tab="projects"]/a');
+        let allTabVisible = await allTab.isDisplayed();
+        await expect(allTabVisible).toBe(true);
+        let sharedTab = await findByXpath('//li[@data-tab="shared"]/a');
+        let sharedTabVisible = await sharedTab.isDisplayed();
+        await expect(sharedTabVisible).toBe(true);
+        let unsharedTab = await findByXpath('//li[@data-tab="unshared"]/a');
+        let unsharedTabVisible = await unsharedTab.isDisplayed();
+        await expect(unsharedTabVisible).toBe(true);
+        let studios = await findByXpath('//li[@data-tab="galleries"]/a');
+        let studiosVisible = await studios.isDisplayed();
+        await expect(studiosVisible).toBe(true);
+        let trash = await findByXpath('//li[@data-tab="trash"]/a');
+        let trashVisible = await trash.isDisplayed();
+        await expect(trashVisible).toBe(true);
     });
 
-    test('clicking a project title should take you to the project page', async () =>{
+    test('clicking a project title should take you to the project page', async () => {
         await driver.get(myStuffURL);
         await clickXpath('//span[@class="media-info-item title"]');
         await driver.sleep(6000);
         let gui = await findByXpath('//div[@class="guiPlayer"]');
-        await expect(gui.isDisplayed());
-        await driver.sleep(1500);
+        let guiVisible = await gui.isDisplayed();
+        await expect(guiVisible).toBe(true);
     });
 
     test('clicking "see inside" should take you to the editor', async () =>{
         await driver.get(myStuffURL);
         await clickXpath('//a[@data-control="edit"]');
         let gf = await findByXpath('//img[@class="green-flag_green-flag_1kiAo"]');
-        await expect(gf.isDisplayed());
-        await driver.sleep(1000);
+        let gfVisible = await gf.isDisplayed();
+        await expect(gfVisible).toBe(true);
     });
 
     test('Add To button should bring up a list of studios', async () =>{
@@ -71,8 +83,8 @@ describe('www-integration my_stuff', () => {
         await clickXpath('//div[@id="sidebar"]/ul/li[@data-tab="shared"]');
         await clickXpath('//div[@data-control="add-to"]');
         let dropDown = await findByXpath('//div[@class="dropdown-menu"]/ul/li');
-        await expect(dropDown.isDisplayed());
-        await driver.sleep(1000);
+        let dropDownVisible = await dropDown.isDisplayed();
+        await expect(dropDownVisible).toBe(true);
     });
 
     test('+ New Studio button should take you to the studio page', async ()=>{
@@ -81,15 +93,16 @@ describe('www-integration my_stuff', () => {
         await driver.sleep(500);
         // my stuff also has an element with the id tabs
         let tabs = await findByXpath('//ul[@id="tabs" and @class="tabs-index box-h-tabs h-tabs"]');
-        expect(tabs.isDisplayed());
-        await driver.sleep(1000);
+        let tabsVisible = await tabs.isDisplayed();
+        expect(tabsVisible).toBe(true);
     });
 
     test('+ New Project button should open the editor', async () =>{
         await driver.get(myStuffURL);
         await clickText('+ New Project');
         let gf = await findByXpath('//img[@class="green-flag_green-flag_1kiAo"]');
-        await expect(gf.isDisplayed());
+        let gfVisible = await gf.isDisplayed();
+        await expect(gfVisible).toBe(true);
     });
 
 });