From efc52b4af3976a85b86cba2684605600e26db991 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Tue, 27 May 2025 18:20:46 +0300 Subject: [PATCH] Use within_sidebar instead of .changesets selector in history tests --- test/system/history_test.rb | 46 +++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/test/system/history_test.rb b/test/system/history_test.rb index 24eb44653..21d0eb438 100644 --- a/test/system/history_test.rb +++ b/test/system/history_test.rb @@ -10,8 +10,10 @@ class HistoryTest < ApplicationSystemTestCase end visit "#{user_path(user)}/history" - changesets = find "div.changesets" - changesets.assert_text "first-changeset-in-history" + + within_sidebar do + assert_text "first-changeset-in-history" + end assert_css "link[type='application/atom+xml'][href$='#{user_path(user)}/history/feed']", :visible => false end @@ -30,26 +32,30 @@ class HistoryTest < ApplicationSystemTestCase assert_nothing_raised do visit "#{user_path(user)}/history" - changesets = find "div.changesets" - changesets.assert_text "bottom-changeset-in-batch-1" - changesets.assert_no_text "bottom-changeset-in-batch-2" - changesets.assert_no_text "first-changeset-in-history" - changesets.assert_selector "ol", :count => 1 - changesets.assert_selector "li[data-changeset]", :count => PAGE_SIZE - click_on "Older Changesets" - changesets.assert_text "bottom-changeset-in-batch-1" - changesets.assert_text "bottom-changeset-in-batch-2" - changesets.assert_no_text "first-changeset-in-history" - changesets.assert_selector "ol", :count => 1 - changesets.assert_selector "li[data-changeset]", :count => 2 * PAGE_SIZE + within_sidebar do + assert_text "bottom-changeset-in-batch-1" + assert_no_text "bottom-changeset-in-batch-2" + assert_no_text "first-changeset-in-history" + assert_selector "ol", :count => 1 + assert_selector "li[data-changeset]", :count => PAGE_SIZE - click_on "Older Changesets" - changesets.assert_text "bottom-changeset-in-batch-1" - changesets.assert_text "bottom-changeset-in-batch-2" - changesets.assert_text "first-changeset-in-history" - changesets.assert_selector "ol", :count => 1 - changesets.assert_selector "li[data-changeset]", :count => (2 * PAGE_SIZE) + 1 + click_on "Older Changesets" + + assert_text "bottom-changeset-in-batch-1" + assert_text "bottom-changeset-in-batch-2" + assert_no_text "first-changeset-in-history" + assert_selector "ol", :count => 1 + assert_selector "li[data-changeset]", :count => 2 * PAGE_SIZE + + click_on "Older Changesets" + + assert_text "bottom-changeset-in-batch-1" + assert_text "bottom-changeset-in-batch-2" + assert_text "first-changeset-in-history" + assert_selector "ol", :count => 1 + assert_selector "li[data-changeset]", :count => (2 * PAGE_SIZE) + 1 + end end end -- 2.39.5