From 666df44453e5aa77cc50a510653c381a41cde77f Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Fri, 8 Aug 2025 18:53:44 +0300 Subject: [PATCH] Change version references internal to helper test to page references --- .../numbered_pagination_helper_test.rb | 286 +++++++++--------- 1 file changed, 143 insertions(+), 143 deletions(-) diff --git a/test/helpers/numbered_pagination_helper_test.rb b/test/helpers/numbered_pagination_helper_test.rb index 7e08c8275..dd4f83af2 100644 --- a/test/helpers/numbered_pagination_helper_test.rb +++ b/test/helpers/numbered_pagination_helper_test.rb @@ -6,7 +6,7 @@ class NumberedPaginationHelperTest < ActionView::TestCase pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 1 do assert_dom "> li", 1 do - check_version_link sample_item_data(1) + check_page_link sample_item_data(1) end end end @@ -16,7 +16,7 @@ class NumberedPaginationHelperTest < ActionView::TestCase pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 1 do assert_dom "> li", 1 do - check_version_link sample_item_data(1), :active => true + check_page_link sample_item_data(1), :active => true end end end @@ -27,7 +27,7 @@ class NumberedPaginationHelperTest < ActionView::TestCase assert_dom pagination_dom, "ul", :count => 1 do assert_dom "> li", 5 do |items| items.each_with_index do |item, i| - check_version_link item, sample_item_data(i + 1) + check_page_link item, sample_item_data(i + 1) end end end @@ -38,15 +38,15 @@ class NumberedPaginationHelperTest < ActionView::TestCase pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do - check_version_link sample_item_data(1) + check_page_link sample_item_data(1) end assert_dom lists[1], "> li", 4 do |items| items.each_with_index do |item, i| - check_version_link item, sample_item_data(i + 2) + check_page_link item, sample_item_data(i + 2) end end assert_dom lists[2], "> li", 1 do - check_version_link sample_item_data(6) + check_page_link sample_item_data(6) end end end @@ -56,16 +56,16 @@ class NumberedPaginationHelperTest < ActionView::TestCase pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 2 do |items| - check_version_link items.shift, sample_item_data(1), :active => true - check_version_link items.shift, sample_item_data(2) + check_page_link items.shift, sample_item_data(1), :active => true + check_page_link items.shift, sample_item_data(2) end assert_dom lists[1], "> li", 3 do |items| - check_version_link items.shift, sample_item_data(3) - check_version_link items.shift, sample_item_data(4) - check_version_link items.shift, sample_item_data(5) + check_page_link items.shift, sample_item_data(3) + check_page_link items.shift, sample_item_data(4) + check_page_link items.shift, sample_item_data(5) end assert_dom lists[2], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(6) + check_page_link items.shift, sample_item_data(6) end end end @@ -75,16 +75,16 @@ class NumberedPaginationHelperTest < ActionView::TestCase pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 3 do |items| - check_version_link items.shift, sample_item_data(1) - check_version_link items.shift, sample_item_data(2), :active => true - check_version_link items.shift, sample_item_data(3) + check_page_link items.shift, sample_item_data(1) + check_page_link items.shift, sample_item_data(2), :active => true + check_page_link items.shift, sample_item_data(3) end assert_dom lists[1], "> li", 2 do |items| - check_version_link items.shift, sample_item_data(4) - check_version_link items.shift, sample_item_data(5) + check_page_link items.shift, sample_item_data(4) + check_page_link items.shift, sample_item_data(5) end assert_dom lists[2], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(6) + check_page_link items.shift, sample_item_data(6) end end end @@ -94,16 +94,16 @@ class NumberedPaginationHelperTest < ActionView::TestCase pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(1) + check_page_link items.shift, sample_item_data(1) end assert_dom lists[1], "> li", 4 do |items| - check_version_link items.shift, sample_item_data(2) - check_version_link items.shift, sample_item_data(3), :active => true - check_version_link items.shift, sample_item_data(4) - check_version_link items.shift, sample_item_data(5) + check_page_link items.shift, sample_item_data(2) + check_page_link items.shift, sample_item_data(3), :active => true + check_page_link items.shift, sample_item_data(4) + check_page_link items.shift, sample_item_data(5) end assert_dom lists[2], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(6) + check_page_link items.shift, sample_item_data(6) end end end @@ -113,16 +113,16 @@ class NumberedPaginationHelperTest < ActionView::TestCase pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(1) + check_page_link items.shift, sample_item_data(1) end assert_dom lists[1], "> li", 4 do |items| - check_version_link items.shift, sample_item_data(2) - check_version_link items.shift, sample_item_data(3) - check_version_link items.shift, sample_item_data(4), :active => true - check_version_link items.shift, sample_item_data(5) + check_page_link items.shift, sample_item_data(2) + check_page_link items.shift, sample_item_data(3) + check_page_link items.shift, sample_item_data(4), :active => true + check_page_link items.shift, sample_item_data(5) end assert_dom lists[2], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(6) + check_page_link items.shift, sample_item_data(6) end end end @@ -132,16 +132,16 @@ class NumberedPaginationHelperTest < ActionView::TestCase pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(1) + check_page_link items.shift, sample_item_data(1) end assert_dom lists[1], "> li", 2 do |items| - check_version_link items.shift, sample_item_data(2) - check_version_link items.shift, sample_item_data(3) + check_page_link items.shift, sample_item_data(2) + check_page_link items.shift, sample_item_data(3) end assert_dom lists[2], "> li", 3 do |items| - check_version_link items.shift, sample_item_data(4) - check_version_link items.shift, sample_item_data(5), :active => true - check_version_link items.shift, sample_item_data(6) + check_page_link items.shift, sample_item_data(4) + check_page_link items.shift, sample_item_data(5), :active => true + check_page_link items.shift, sample_item_data(6) end end end @@ -151,16 +151,16 @@ class NumberedPaginationHelperTest < ActionView::TestCase pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(1) + check_page_link items.shift, sample_item_data(1) end assert_dom lists[1], "> li", 3 do |items| - check_version_link items.shift, sample_item_data(2) - check_version_link items.shift, sample_item_data(3) - check_version_link items.shift, sample_item_data(4) + check_page_link items.shift, sample_item_data(2) + check_page_link items.shift, sample_item_data(3) + check_page_link items.shift, sample_item_data(4) end assert_dom lists[2], "> li", 2 do |items| - check_version_link items.shift, sample_item_data(5) - check_version_link items.shift, sample_item_data(6), :active => true + check_page_link items.shift, sample_item_data(5) + check_page_link items.shift, sample_item_data(6), :active => true end end end @@ -170,18 +170,18 @@ class NumberedPaginationHelperTest < ActionView::TestCase pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(1) + check_page_link items.shift, sample_item_data(1) end assert_dom lists[1], "> li", 6 do |items| - check_version_link items.shift, sample_item_data(2) - check_version_link items.shift, sample_item_data(3), :active => true - check_version_link items.shift, sample_item_data(4) - check_version_link items.shift, sample_item_data(5) - check_version_link items.shift, sample_item_data(6) - check_version_ellipsis items.shift + check_page_link items.shift, sample_item_data(2) + check_page_link items.shift, sample_item_data(3), :active => true + check_page_link items.shift, sample_item_data(4) + check_page_link items.shift, sample_item_data(5) + check_page_link items.shift, sample_item_data(6) + check_page_ellipsis items.shift end assert_dom lists[2], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(50) + check_page_link items.shift, sample_item_data(50) end end end @@ -191,20 +191,20 @@ class NumberedPaginationHelperTest < ActionView::TestCase pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(1) + check_page_link items.shift, sample_item_data(1) end assert_dom lists[1], "> li", 8 do |items| - check_version_link items.shift, sample_item_data(2) - check_version_link items.shift, sample_item_data(3) - check_version_link items.shift, sample_item_data(4) - check_version_link items.shift, sample_item_data(5), :active => true - check_version_link items.shift, sample_item_data(6) - check_version_link items.shift, sample_item_data(7) - check_version_link items.shift, sample_item_data(8) - check_version_ellipsis items.shift + check_page_link items.shift, sample_item_data(2) + check_page_link items.shift, sample_item_data(3) + check_page_link items.shift, sample_item_data(4) + check_page_link items.shift, sample_item_data(5), :active => true + check_page_link items.shift, sample_item_data(6) + check_page_link items.shift, sample_item_data(7) + check_page_link items.shift, sample_item_data(8) + check_page_ellipsis items.shift end assert_dom lists[2], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(50) + check_page_link items.shift, sample_item_data(50) end end end @@ -214,21 +214,21 @@ class NumberedPaginationHelperTest < ActionView::TestCase pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(1) + check_page_link items.shift, sample_item_data(1) end assert_dom lists[1], "> li", 9 do |items| - check_version_link items.shift, sample_item_data(2) - check_version_link items.shift, sample_item_data(3) - check_version_link items.shift, sample_item_data(4) - check_version_link items.shift, sample_item_data(5) - check_version_link items.shift, sample_item_data(6), :active => true - check_version_link items.shift, sample_item_data(7) - check_version_link items.shift, sample_item_data(8) - check_version_link items.shift, sample_item_data(9) - check_version_ellipsis items.shift + check_page_link items.shift, sample_item_data(2) + check_page_link items.shift, sample_item_data(3) + check_page_link items.shift, sample_item_data(4) + check_page_link items.shift, sample_item_data(5) + check_page_link items.shift, sample_item_data(6), :active => true + check_page_link items.shift, sample_item_data(7) + check_page_link items.shift, sample_item_data(8) + check_page_link items.shift, sample_item_data(9) + check_page_ellipsis items.shift end assert_dom lists[2], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(50) + check_page_link items.shift, sample_item_data(50) end end end @@ -238,21 +238,21 @@ class NumberedPaginationHelperTest < ActionView::TestCase pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(1) + check_page_link items.shift, sample_item_data(1) end assert_dom lists[1], "> li", 9 do |items| - check_version_ellipsis items.shift - check_version_link items.shift, sample_item_data(40) - check_version_link items.shift, sample_item_data(41) - check_version_link items.shift, sample_item_data(42) - check_version_link items.shift, sample_item_data(43), :active => true - check_version_link items.shift, sample_item_data(44) - check_version_link items.shift, sample_item_data(45) - check_version_link items.shift, sample_item_data(46) - check_version_ellipsis items.shift + check_page_ellipsis items.shift + check_page_link items.shift, sample_item_data(40) + check_page_link items.shift, sample_item_data(41) + check_page_link items.shift, sample_item_data(42) + check_page_link items.shift, sample_item_data(43), :active => true + check_page_link items.shift, sample_item_data(44) + check_page_link items.shift, sample_item_data(45) + check_page_link items.shift, sample_item_data(46) + check_page_ellipsis items.shift end assert_dom lists[2], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(50) + check_page_link items.shift, sample_item_data(50) end end end @@ -262,20 +262,20 @@ class NumberedPaginationHelperTest < ActionView::TestCase pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(1) + check_page_link items.shift, sample_item_data(1) end assert_dom lists[1], "> li", 8 do |items| - check_version_ellipsis items.shift - check_version_link items.shift, sample_item_data(43) - check_version_link items.shift, sample_item_data(44) - check_version_link items.shift, sample_item_data(45) - check_version_link items.shift, sample_item_data(46), :active => true - check_version_link items.shift, sample_item_data(47) - check_version_link items.shift, sample_item_data(48) - check_version_link items.shift, sample_item_data(49) + check_page_ellipsis items.shift + check_page_link items.shift, sample_item_data(43) + check_page_link items.shift, sample_item_data(44) + check_page_link items.shift, sample_item_data(45) + check_page_link items.shift, sample_item_data(46), :active => true + check_page_link items.shift, sample_item_data(47) + check_page_link items.shift, sample_item_data(48) + check_page_link items.shift, sample_item_data(49) end assert_dom lists[2], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(50) + check_page_link items.shift, sample_item_data(50) end end end @@ -285,15 +285,15 @@ class NumberedPaginationHelperTest < ActionView::TestCase pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(1) + check_page_link items.shift, sample_item_data(1) end assert_dom lists[1], "> li", 3 do |items| - check_version_ellipsis items.shift - check_version_link items.shift, sample_item_data(48) - check_version_link items.shift, sample_item_data(49) + check_page_ellipsis items.shift + check_page_link items.shift, sample_item_data(48) + check_page_link items.shift, sample_item_data(49) end assert_dom lists[2], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(50) + check_page_link items.shift, sample_item_data(50) end end end @@ -303,19 +303,19 @@ class NumberedPaginationHelperTest < ActionView::TestCase pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(1) + check_page_link items.shift, sample_item_data(1) end assert_dom lists[1], "> li", 7 do |items| - check_version_ellipsis items.shift - check_version_link items.shift, sample_item_data(10) - check_version_ellipsis items.shift - check_version_link items.shift, sample_item_data(20) - check_version_ellipsis items.shift - check_version_link items.shift, sample_item_data(30) - check_version_ellipsis items.shift + check_page_ellipsis items.shift + check_page_link items.shift, sample_item_data(10) + check_page_ellipsis items.shift + check_page_link items.shift, sample_item_data(20) + check_page_ellipsis items.shift + check_page_link items.shift, sample_item_data(30) + check_page_ellipsis items.shift end assert_dom lists[2], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(35) + check_page_link items.shift, sample_item_data(35) end end end @@ -325,18 +325,18 @@ class NumberedPaginationHelperTest < ActionView::TestCase pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(1) + check_page_link items.shift, sample_item_data(1) end assert_dom lists[1], "> li", 6 do |items| - check_version_ellipsis items.shift - check_version_link items.shift, sample_item_data(10) - check_version_ellipsis items.shift - check_version_link items.shift, sample_item_data(20) - check_version_ellipsis items.shift - check_version_link items.shift, sample_item_data(30) + check_page_ellipsis items.shift + check_page_link items.shift, sample_item_data(10) + check_page_ellipsis items.shift + check_page_link items.shift, sample_item_data(20) + check_page_ellipsis items.shift + check_page_link items.shift, sample_item_data(30) end assert_dom lists[2], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(31) + check_page_link items.shift, sample_item_data(31) end end end @@ -346,23 +346,23 @@ class NumberedPaginationHelperTest < ActionView::TestCase pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(1) + check_page_link items.shift, sample_item_data(1) end assert_dom lists[1], "> li", 11 do |items| - check_version_ellipsis items.shift - check_version_link items.shift, sample_item_data(10) - check_version_ellipsis items.shift - check_version_link items.shift, sample_item_data(14) - check_version_link items.shift, sample_item_data(15), :active => true - check_version_link items.shift, sample_item_data(16) - check_version_ellipsis items.shift - check_version_link items.shift, sample_item_data(20) - check_version_ellipsis items.shift - check_version_link items.shift, sample_item_data(30) - check_version_ellipsis items.shift + check_page_ellipsis items.shift + check_page_link items.shift, sample_item_data(10) + check_page_ellipsis items.shift + check_page_link items.shift, sample_item_data(14) + check_page_link items.shift, sample_item_data(15), :active => true + check_page_link items.shift, sample_item_data(16) + check_page_ellipsis items.shift + check_page_link items.shift, sample_item_data(20) + check_page_ellipsis items.shift + check_page_link items.shift, sample_item_data(30) + check_page_ellipsis items.shift end assert_dom lists[2], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(35) + check_page_link items.shift, sample_item_data(35) end end end @@ -372,33 +372,33 @@ class NumberedPaginationHelperTest < ActionView::TestCase pagination_dom = Rails::Dom::Testing.html_document_fragment.parse(pagination) assert_dom pagination_dom, "ul", :count => 3 do |lists| assert_dom lists[0], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(1) + check_page_link items.shift, sample_item_data(1) end assert_dom lists[1], "> li", 10 do |items| - check_version_ellipsis items.shift - check_version_link items.shift, sample_item_data(10) - check_version_link items.shift, sample_item_data(11) - check_version_link items.shift, sample_item_data(12), :active => true - check_version_link items.shift, sample_item_data(13) - check_version_ellipsis items.shift - check_version_link items.shift, sample_item_data(20) - check_version_ellipsis items.shift - check_version_link items.shift, sample_item_data(30) - check_version_ellipsis items.shift + check_page_ellipsis items.shift + check_page_link items.shift, sample_item_data(10) + check_page_link items.shift, sample_item_data(11) + check_page_link items.shift, sample_item_data(12), :active => true + check_page_link items.shift, sample_item_data(13) + check_page_ellipsis items.shift + check_page_link items.shift, sample_item_data(20) + check_page_ellipsis items.shift + check_page_link items.shift, sample_item_data(30) + check_page_ellipsis items.shift end assert_dom lists[2], "> li", 1 do |items| - check_version_link items.shift, sample_item_data(35) + check_page_link items.shift, sample_item_data(35) end end end private - def sample_item_data(version) - { :href => "test/version/#{version}", :title => "Version ##{version}" } + def sample_item_data(n) + { :href => "test/version/#{n}", :title => "Version ##{n}" } end - def check_version_link(*elements, data, active: false) + def check_page_link(*elements, data, active: false) assert_dom(*elements, "> @class", active ? "page-item active" : "page-item") assert_dom(*elements, "> a", 1) do assert_dom "> @href", data[:href] @@ -406,7 +406,7 @@ class NumberedPaginationHelperTest < ActionView::TestCase end end - def check_version_ellipsis(*elements) + def check_page_ellipsis(*elements) assert_dom(*elements, "> @class", "page-item disabled") assert_dom(*elements, "> a", 0) assert_dom(*elements, "> span", 1, "...") -- 2.39.5