Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

use test selector for test

Behrokh Satarnejad300f4f744feb
diff --git a/app/components/users/sessions/row_component.rb b/app/components/users/sessions/row_component.rb
index 0539b05e548..a2c738d3e93 100644
--- a/app/components/users/sessions/row_component.rb
+++ b/app/components/users/sessions/row_component.rb
@@ -31,7 +31,6 @@
module Users
module Sessions
class RowComponent < ::OpPrimer::BorderBoxRowComponent
- property :firstname, :lastname
delegate :current_session, :current_token, to: :table
def record
@@ -67,7 +66,8 @@ module Users
def expires_on
if token?
- render(OpPrimer::RelativeTimeComponent.new(datetime: user_time_zone(record.expires_on), prefix: I18n.t(:label_on)))
+ expires = record.expires_on || (record.created_at + Setting.autologin.days)
+ render(OpPrimer::RelativeTimeComponent.new(datetime: user_time_zone(expires), prefix: I18n.t(:label_on)))
else
I18n.t("users.sessions.unknown")
end
@@ -89,14 +89,18 @@ module Users
[delete_button]
end
+ def row_css_class
+ "session-row"
+ end
+
def delete_button
- return if session? && record.current?(current_session)
- return if token? && record == current_token
+ return if current?
render(
Primer::Beta::IconButton.new(
icon: :x,
scheme: :invisible,
+ test_selector: "session-revoke-button",
tag: :a,
href: url_for(revoke_path),
"aria-label": I18n.t(:button_revoke),
diff --git a/spec/features/my/sessions_management_spec.rb b/spec/features/my/sessions_management_spec.rb
index a9e280072fe..c65c73278d6 100644
--- a/spec/features/my/sessions_management_spec.rb
+++ b/spec/features/my/sessions_management_spec.rb
@@ -60,45 +60,49 @@ RSpec.describe "My account session management", :js, :selenium do
it "can list and terminate sessions and remembered devices" do
page.within_test_selector("Users::Sessions::TableComponent") do
# Current session + old session + remembered device
- expect(page).to have_css(".Box-row", count: 3)
+ expect(page).to have_css(".session-row", count: 3)
- trs = page.all(".Box-row")
+ trs = page.all(".session-row")
# Current session
expect(trs[0]).to have_text(I18n.t("users.sessions.current"))
expect(trs[0]).to have_text("unknown browser")
expect(trs[0]).to have_text("unknown operating system")
- expect(trs[0]).to have_no_css(".buttons a")
+ expect(trs[0]).to have_no_test_selector("session-revoke-button")
# Old session
expect(trs[1]).to have_text("Mozilla Firefox (Version 12.3)")
expect(trs[1]).to have_text("Linux")
expect(trs[1]).to have_text format_time(old_session_time)
- expect(trs[1]).to have_css("a.Button")
+ expect(trs[1]).to have_test_selector("session-revoke-button")
# Remembered device (token)
expect(trs[2]).to have_text("Firefox (Version 142)")
expect(trs[2]).to have_text("macOS")
expect(trs[2]).to have_text(format_time(autologin_token.created_at))
- expect(trs[2]).to have_css("a.Button")
+ expect(trs[2]).to have_test_selector("session-revoke-button")
# Revoke the old session
- trs[1].find("a.Button").click
+ within trs[1] do
+ find_test_selector("session-revoke-button").click
+ end
end
page.driver.browser.switch_to.alert.accept
page.within_test_selector("Users::Sessions::TableComponent") do
- trs = page.all(".Box-row")
+ trs = page.all(".session-row")
# Revoke the remembered device
- trs[1].find("a.Button").click
+ within trs[1] do
+ find_test_selector("session-revoke-button").click
+ end
end
page.driver.browser.switch_to.alert.accept
page.within_test_selector("Users::Sessions::TableComponent") do
# Only current session remains
- expect(page).to have_css(".Box-row", count: 1)
+ expect(page).to have_css(".session-row", count: 1)
end
# Both old session and token are gone