make sure uploader windows close on windows

Author: ginnyyadav

test/spectron/src/Base.js

@@ -6,6 +6,10 @@ class Base {
   windowCount() {
     return this.app.client.waitUntilWindowLoaded().getWindowCount();
   }
+
+  focusUploader() {
+    return this.app.browserWindow.focus();
+  }
 }
 
 export default new Base();

test/spectron/test/functionality/login.functionality.test.js

@@ -22,6 +22,7 @@ describe('Login', () => {
   });
 
   test('should login', async () => {
+    await Base.focusUploader();
     await LoginScreen.usernameInput.setValue(process.env.SPECTRON_USER_EMAIL);
     await LoginScreen.usernameInput.getValue()
       .should.eventually.equal(process.env.SPECTRON_USER_EMAIL);

test/spectron/test/ui/login.elements.test.js

@@ -21,7 +21,8 @@ describe('UI Test', () => {
   });
 
   test('should have all UI elements', async () => {
-    LoginScreen.signUpLink.isVisible()
+    await Base.focusUploader();
+    await LoginScreen.signUpLink.isVisible()
       .should.eventually.be.true;
     await LoginScreen.tidepoolLogo.isVisible()
       .should.eventually.be.true;

test/spectron/utilities.js

@@ -23,14 +23,11 @@ export async function startApp() {
   UploadScreen.setApp(app);
   LoginScreen.setApp(app);
   Base.setApp(app);
-  return app.start().then(() => {
-    app.browserWindow.focus();
-    app.browserWindow.setAlwaysOnTop(true);
-  });
+  return app.start();
 }
 
 export async function stopApp(app) {
   if (app && app.isRunning()) {
-    await app.stop();
+    return app.stop();
   }
 }