fixing tests and bug

Author: paxtonhare

marklogic-data-hub/src/main/java/com/marklogic/hub/commands/LoadHubModulesCommand.java

@@ -183,6 +183,11 @@ public void execute(CommandContext context) {
                 ExtensionMetadataAndParams emap = extensionMetadataProvider.provideExtensionMetadataAndParams(r);
                 this.modulesLoader.installTransform(r, emap.metadata);
             }
+            resources = findResources("classpath*:/ml-modules/transforms", "/**/*.sjs");
+            for (Resource r : resources) {
+                ExtensionMetadataAndParams emap = extensionMetadataProvider.provideExtensionMetadataAndParams(r);
+                this.modulesLoader.installTransform(r, emap.metadata);
+            }
             endTime = System.nanoTime();
             duration = (endTime - startTime);
             logger.info("Rest Transforms took: " + (duration / 1000000000) + " seconds");

marklogic-data-hub/src/test/java/com/marklogic/hub/HubTestBase.java

@@ -56,6 +56,7 @@ public class HubTestBase {
     public static int stagingPort;
     public static int finalPort;
     public static int tracePort;
+    public static int jobPort;
     public static String user;
     public static String password;
     public static Authentication authMethod;
@@ -65,6 +66,8 @@ public class HubTestBase {
     public static DatabaseClient finalModulesClient = null;
     public static DatabaseClient traceClient = null;
     public static DatabaseClient traceModulesClient = null;
+    public static DatabaseClient jobClient = null;
+    public static DatabaseClient jobModulesClient = null;
     private static Properties properties = new Properties();
     private static boolean initialized = false;
     public static XMLDocumentManager stagingDocMgr = getStagingMgr();
@@ -120,6 +123,7 @@ private static void init() {
         stagingPort = Integer.parseInt(properties.getProperty("mlStagingPort"));
         finalPort = Integer.parseInt(properties.getProperty("mlFinalPort"));
         tracePort = Integer.parseInt(properties.getProperty("mlTracePort"));
+        jobPort = Integer.parseInt(properties.getProperty("mlJobPort"));
         user = properties.getProperty("mlUsername");
         password = properties.getProperty("mlPassword");
         authMethod = Authentication.valueOf(properties.getProperty("auth").toUpperCase());
@@ -130,6 +134,8 @@ private static void init() {
         finalModulesClient  = DatabaseClientFactory.newClient(host, stagingPort, HubConfig.DEFAULT_MODULES_DB_NAME, user, password, authMethod);
         traceClient = DatabaseClientFactory.newClient(host, tracePort, user, password, authMethod);
         traceModulesClient  = DatabaseClientFactory.newClient(host, stagingPort, HubConfig.DEFAULT_MODULES_DB_NAME, user, password, authMethod);
+        jobClient = DatabaseClientFactory.newClient(host, jobPort, user, password, authMethod);
+        jobModulesClient  = DatabaseClientFactory.newClient(host, stagingPort, HubConfig.DEFAULT_MODULES_DB_NAME, user, password, authMethod);
     }
 
     public HubTestBase() {
@@ -154,6 +160,7 @@ protected static HubConfig getHubConfig(String projectDir) {
         hubConfig.stagingPort = stagingPort;
         hubConfig.finalPort = finalPort;
         hubConfig.tracePort = tracePort;
+        hubConfig.jobPort = jobPort;
         hubConfig.username = user;
         hubConfig.password = password;
         return hubConfig;

marklogic-data-hub/src/test/java/com/marklogic/hub/TraceManagerTest.java

@@ -1,8 +1,22 @@
 package com.marklogic.hub;
 
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.io.IOException;
+
 public class TraceManagerTest extends HubTestBase {
+    @BeforeClass
+    public static void setup() throws IOException {
+        installHub();
+    }
+
+    @AfterClass
+    public static void teardown() throws IOException {
+        uninstallHub();
+    }
+
     @Test
     public void getTraces() throws Exception {
         TraceManager tm = new TraceManager(traceClient);

quick-start/src/main/ui/app/login/login.e2e.ts

@@ -14,17 +14,17 @@ describe('App', () => {
 
     browser.get('/login');
 
-    // clear out any items in the project list
-    return element.all(by.css('select-list md-list-item .fa-trash')).map(item => {
-      return item.click().then(() => {
-        let removeButton = element.all(by.css('confirm-component button')).first();
-        return browser.wait(ec.elementToBeClickable(removeButton)).then(() => {
-          return removeButton.click().then(() => {
-            return browser.wait(ec.not(ec.presenceOf(removeButton)));
-          });
-        });
-      });
-    });
+    // // clear out any items in the project list
+    // return element.all(by.css('select-list md-list-item .fa-trash')).map(item => {
+    //   return item.click().then(() => {
+    //     let removeButton = element.all(by.css('confirm-component button')).first();
+    //     return browser.wait(ec.elementToBeClickable(removeButton)).then(() => {
+    //       return removeButton.click().then(() => {
+    //         return browser.wait(ec.not(ec.presenceOf(removeButton)));
+    //       });
+    //     });
+    //   });
+    // });
   });
 
   beforeEach(() => {
@@ -175,6 +175,7 @@ describe('App', () => {
       return finishedButton.click();
     }).then(() => {
       browser.waitForAngular();
+      browser.sleep(5000);
       browser.getCurrentUrl().then(url => {
         expect(url.endsWith('/login')).toBe(false);
         expect(url.endsWith('/')).toBe(true);