-
Notifications
You must be signed in to change notification settings - Fork 9
Remove duplicate test code - Admin Pages #3118
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
18295ed
Clean up some shared app admin pages
labkey-tchad b54c4ae
Merge UserMenu components
labkey-tchad 6a6f510
Pull up nav bar methods
labkey-tchad 835c7df
Merge remote-tracking branch 'origin/develop' into fb_sharedHeaderPages
labkey-tchad 84ac9ec
Fix some errors
labkey-tchad e3d2321
Move BannerHelper back to lims
labkey-tchad bd5b9a2
Merge remote-tracking branch 'origin/develop' into fb_sharedHeaderPages
labkey-tchad 362a2ea
Merge remote-tracking branch 'origin/develop' into fb_sharedHeaderPages
labkey-tchad File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
135 changes: 0 additions & 135 deletions
135
src/org/labkey/test/components/ui/navigation/NavBar.java
This file was deleted.
Oops, something went wrong.
67 changes: 0 additions & 67 deletions
67
src/org/labkey/test/components/ui/navigation/UserMenu.java
This file was deleted.
Oops, something went wrong.
46 changes: 46 additions & 0 deletions
46
src/org/labkey/test/pages/experiment/DeleteDataClassPage.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* | ||
| * Copyright (c) 2026 LabKey Corporation | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.labkey.test.pages.experiment; | ||
|
|
||
| import org.labkey.test.Locator; | ||
| import org.labkey.test.pages.LabKeyPage; | ||
| import org.openqa.selenium.WebDriver; | ||
| import org.openqa.selenium.WebElement; | ||
|
|
||
|
|
||
| public class DeleteDataClassPage extends LabKeyPage<DeleteDataClassPage.ElementCache> | ||
| { | ||
| public DeleteDataClassPage(WebDriver driver) | ||
| { | ||
| super(driver); | ||
| } | ||
|
|
||
| public void confirmDelete() | ||
| { | ||
| clickAndWait(elementCache().deleteButton); | ||
| } | ||
|
|
||
| @Override | ||
| protected ElementCache newElementCache() | ||
| { | ||
| return new ElementCache(); | ||
| } | ||
|
|
||
| protected class ElementCache extends LabKeyPage<?>.ElementCache | ||
| { | ||
| WebElement deleteButton = Locator.lkButton("Confirm Delete").findWhenNeeded(this); | ||
| } | ||
| } |
70 changes: 70 additions & 0 deletions
70
src/org/labkey/test/pages/experiment/ShowDataClassPage.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * Copyright (c) 2026 LabKey Corporation | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.labkey.test.pages.experiment; | ||
|
|
||
| import org.labkey.test.Locator; | ||
| import org.labkey.test.WebDriverWrapper; | ||
| import org.labkey.test.WebTestHelper; | ||
| import org.labkey.test.pages.LabKeyPage; | ||
| import org.labkey.test.util.DataRegionTable; | ||
| import org.openqa.selenium.WebDriver; | ||
| import org.openqa.selenium.WebElement; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| public class ShowDataClassPage extends LabKeyPage<ShowDataClassPage.ElementCache> | ||
| { | ||
| public ShowDataClassPage(WebDriver driver) | ||
| { | ||
| super(driver); | ||
| } | ||
|
|
||
| public static ShowDataClassPage beginAt(WebDriverWrapper webDriverWrapper, String containerPath, int rowId) | ||
| { | ||
| webDriverWrapper.beginAt(WebTestHelper.buildURL("experiment", containerPath, "showDataClass", Map.of("rowId", rowId))); | ||
| return new ShowDataClassPage(webDriverWrapper.getDriver()); | ||
| } | ||
|
|
||
| public CreateDataClassPage clickEditDataClass() | ||
| { | ||
| clickAndWait(elementCache().editDataClassButton); | ||
| return new CreateDataClassPage(getDriver()); | ||
| } | ||
|
|
||
| public DeleteDataClassPage clickDeleteDataClass() | ||
| { | ||
| clickAndWait(elementCache().deleteDataClassButton); | ||
| return new DeleteDataClassPage(getDriver()); | ||
| } | ||
|
|
||
| public DataRegionTable getDataRegion() | ||
| { | ||
| return elementCache()._dataRegionTable; | ||
| } | ||
|
|
||
| @Override | ||
| protected ElementCache newElementCache() | ||
| { | ||
| return new ElementCache(); | ||
| } | ||
|
|
||
| protected class ElementCache extends LabKeyPage<ElementCache>.ElementCache | ||
| { | ||
| private final WebElement editDataClassButton = Locator.lkButton("Edit Data Class").findWhenNeeded(this); | ||
| private final WebElement deleteDataClassButton = Locator.lkButton("Delete Data Class").findWhenNeeded(this); | ||
| private final DataRegionTable _dataRegionTable = new DataRegionTable.DataRegionFinder(getDriver()).withName("query").findWhenNeeded(this); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Accident?