APIContainerHelper Improvements

src/org/labkey/test/LabKeySiteWrapper.java

@@ -478,14 +478,24 @@ protected void setSystemMaintenance(boolean enable)
     public void ensureAdminMode()
     {
         if (!onLabKeyPage())
+        {
+            TestLogger.warn("ensureAdminMode called from non-standard page");
             goToHome();
+        }
         if (!isSignedIn())
+        {
+            TestLogger.warn("ensureAdminMode called while not logged in");
             simpleSignIn();
+        }
         else if (!isUserSystemAdmin() && isImpersonating())
+        {
+            TestLogger.warn("ensureAdminMode called while impersonating non-admin");
             stopImpersonating(false);
+        }
         Locator projectMenu = ProjectMenu.Locators.menuProjectNav;
         if (!isElementPresent(projectMenu))
         {
+            TestLogger.warn("project menu not present after ensureAdminMode");
             goToHome();
             waitForElement(projectMenu, WAIT_FOR_PAGE);
         }

src/org/labkey/test/WebDriverWrapper.java

@@ -35,6 +35,7 @@
 import org.labkey.test.components.html.RadioButton;
 import org.labkey.test.components.html.SiteNavBar;
 import org.labkey.test.components.labkey.LabKeyAlert;
+import org.labkey.test.pages.admin.CreateFolderPage;
 import org.labkey.test.pages.admin.FolderManagementPage;
 import org.labkey.test.pages.assay.AssayBeginPage;
 import org.labkey.test.pages.core.admin.ProjectSettingsPage;
@@ -879,9 +880,10 @@ public BeginPage goToManageLists()
         return new BeginPage(getDriver());
     }
 
-    public void goToCreateProject()
+    public CreateFolderPage goToCreateProject()
     {
         clickAdminMenuItem("Site", "Create Project");
+        return new CreateFolderPage(getDriver());
     }
 
 

src/org/labkey/test/components/SubfoldersWebPart.java

@@ -17,7 +17,7 @@
 
 import org.labkey.test.Locator;
 import org.labkey.test.pages.LabKeyPage;
-import org.labkey.test.pages.admin.CreateSubFolderPage;
+import org.labkey.test.pages.admin.CreateFolderPage;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 
@@ -55,11 +55,11 @@ public LabKeyPage goToSubfolder(String folderName)
         return new LabKeyPage(getDriver());
     }
 
-    public CreateSubFolderPage clickCreateSubfolder()
+    public CreateFolderPage clickCreateSubfolder()
     {
         getWrapper().clickButton("Create New Subfolder", WAIT_FOR_PAGE);
 
-        return new CreateSubFolderPage(getDriver());
+        return new CreateFolderPage(getDriver());
     }
 
     @Override

src/org/labkey/test/components/api/ProjectMenu.java

@@ -19,8 +19,8 @@
 import org.labkey.test.WebDriverWrapper;
 import org.labkey.test.components.Component;
 import org.labkey.test.components.WebDriverComponent;
+import org.labkey.test.pages.admin.CreateFolderPage;
 import org.labkey.test.pages.admin.CreateProjectPage;
-import org.labkey.test.pages.admin.CreateSubFolderPage;
 import org.labkey.test.util.TestLogger;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
@@ -186,11 +186,11 @@ public List<WebElement> projectMenuLinks()
     /**
      * Creates a subfolder from the context you are already in (e.g. project/folder)
      */
-    public CreateSubFolderPage navigateToCreateSubFolderPage()
+    public CreateFolderPage navigateToCreateSubFolderPage()
     {
         open();
         getWrapper().clickAndWait(elementCache().newSubFolderButton);
-        return new CreateSubFolderPage(getDriver());
+        return new CreateFolderPage(getDriver());
     }
 
     public CreateProjectPage navigateToCreateProjectPage()

src/org/labkey/test/pages/admin/CreateSubFolderPage.java → src/org/labkey/test/pages/admin/CreateFolderPage.java

@@ -21,9 +21,12 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 
-public class CreateSubFolderPage extends LabKeyPage
+/**
+ * Wraps createFolder.jsp, rendered by 'AdminController.CreateFolderAction'
+ */
+public class CreateFolderPage extends LabKeyPage
 {
-    public CreateSubFolderPage(WebDriver test)
+    public CreateFolderPage(WebDriver test)
     {
         super(test);
     }
@@ -42,28 +45,33 @@ public SetFolderPermissionsPage clickNext()
         return new SetFolderPermissionsPage(getDriver());
     }
 
-    public CreateSubFolderPage setFolderName(String name)
+    public CreateFolderPage setName(String name)
     {
         setFormElement(newElementCache().nameInput, name);
         return this;
     }
 
-    public CreateSubFolderPage selectFolderType(String folderType)
+    public CreateFolderPage selectFolderType(String folderType)
     {
+        if (null == folderType || folderType.equals("None"))
+        {
+            folderType = "Custom";
+        }
+
         WebElement folderTypeRadioButton =Locator.xpath("//td[./label[text()='"+folderType+"']]/input[@type='button' and contains(@class, 'radio')]")
                 .waitForElement(getDriver(), WAIT_FOR_JAVASCRIPT);
-         folderTypeRadioButton.click();
+        folderTypeRadioButton.click();
 
-         if (folderType.equalsIgnoreCase("Custom"))
-             waitFor(()-> Locator.tagWithText("div", "Choose Modules:").findElementOrNull(getDriver()) != null, 4000 );
+        if (folderType.equalsIgnoreCase("Custom"))
+            waitFor(()-> Locator.tagWithText("div", "Choose Modules:").findElementOrNull(getDriver()) != null, 4000 );
 
         if (folderType.equalsIgnoreCase("Create From Template Folder"))
             waitFor(()-> Locator.input("templateSourceId").findElementOrNull(getDriver()) != null, 4000 );
 
          return this;
     }
 
-    public CreateSubFolderPage createFromTemplateFolder(String templateFolder)
+    public CreateFolderPage createFromTemplateFolder(String templateFolder)
     {
         selectFolderType("Create From Template Folder");
         _ext4Helper.waitForMaskToDisappear();
@@ -75,14 +83,14 @@ public CreateSubFolderPage createFromTemplateFolder(String templateFolder)
         return this;
     }
 
-    public CreateSubFolderPage setTemplatePartCheckBox(String templatePart, boolean checked)
+    public CreateFolderPage setTemplatePartCheckBox(String templatePart, boolean checked)
     {
         Checkbox checkbox = new Checkbox(Locator.xpath("//td[label[text()='"+templatePart+"']]/input").waitForElement(getDriver(), 4000));
         checkbox.set(checked);
         return this;
     }
 
-    public CreateSubFolderPage addTabs(String[] tabsToAdd)
+    public CreateFolderPage addTabs(String[] tabsToAdd)
     {
         if (tabsToAdd != null)
         {
@@ -92,13 +100,13 @@ public CreateSubFolderPage addTabs(String[] tabsToAdd)
         return this;
     }
 
-    public CreateSubFolderPage setTitle(String title)
+    public CreateFolderPage setTitle(String title)
     {
         setFormElement(newElementCache().titleInput, title);
         return this;
     }
 
-    public CreateSubFolderPage setUseNameAsDisplayTitle()
+    public CreateFolderPage setUseNameAsDisplayTitle()
     {
         _ext4Helper.checkCheckbox(Locator.ehrCheckboxWithLabel( "Use name as display title"));
         return this;