Skip to content
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

Wait for admin dropdown #170

Merged
merged 2 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,13 @@ Adding a requirement of a major version of a dependency is breaking a contract.
Dropping a requirement of a major version of a dependency is a new contract.

## [Unreleased]
[Unreleased]: https://github.com/atlassian/jira-actions/compare/release-3.27.0...master
[Unreleased]: https://github.com/atlassian/jira-actions/compare/release-3.28.0...master

### Fixed
- Avoid premature navigation when clicking the administration cog.

## [3.28.0] - 2024-06-17
[3.28.0]: https://github.com/atlassian/jira-actions/compare/release-3.27.0...release-3.28.0

### Added
- Split `SetUpAction` into `DisableRichTextEditor` and `HideHealthNotifications`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ package com.atlassian.performance.tools.jiraactions.api
import com.atlassian.performance.tools.jiraactions.administration.JiraAdministrationMenu
import com.atlassian.performance.tools.jiraactions.api.page.*
import org.openqa.selenium.By
import org.openqa.selenium.JavascriptExecutor
import org.openqa.selenium.WebDriver
import org.openqa.selenium.support.ui.ExpectedCondition
import java.net.URI
import java.net.URLEncoder

Expand Down Expand Up @@ -108,8 +110,26 @@ data class WebJira(

internal fun administrate(): JiraAdministrationMenu {
NotificationPopUps(driver).waitUntilAuiFlagsAreGone()
driver.findElement(By.id("admin_menu")).click()
val adminCog = By.id("admin_menu")
waitForAdminCog()
driver.findElement(adminCog).click()
val menu = driver.findElement(By.id("system-admin-menu-content"))
return JiraAdministrationMenu(driver, menu)
}

/**
* If we click on the administration cog too fast
* we would navigate to `plugins/servlet/applications/versions-licenses`
* and be asked for websudo password [AdminAccess].
*/
private fun waitForAdminCog() = waitForDomComplete()

private fun waitForDomComplete() {
val js = driver as JavascriptExecutor
val domComplete = ExpectedCondition {
val state = js.executeScript("return document.readyState") as String?
state == "complete"
}
driver.wait(domComplete)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import com.atlassian.performance.tools.jiraactions.api.DISABLE_RICH_TEXT_EDITOR
import com.atlassian.performance.tools.jiraactions.api.WebJira
import com.atlassian.performance.tools.jiraactions.api.measure.ActionMeter

/**
* @since 3.28.0
*/
class DisableRichTextEditor(
private val jira: WebJira,
private val meter: ActionMeter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import com.atlassian.performance.tools.jiraactions.api.HIDE_HEALTH_NOTIFICATIONS
import com.atlassian.performance.tools.jiraactions.api.WebJira
import com.atlassian.performance.tools.jiraactions.api.measure.ActionMeter

/**
* @since 3.28.0
*/
class HideHealthNotifications(
private val jira: WebJira,
private val meter: ActionMeter
Expand Down
Loading