From 0b755d8630696b499a0705d175e78fef0909df92 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Tue, 24 Dec 2024 02:47:19 +0300 Subject: [PATCH] Create blocks table test helper module --- .../user_blocks/table_test_helper.rb | 24 +++++++++++++++++++ .../user_blocks_controller_test.rb | 22 +++-------------- 2 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 test/controllers/user_blocks/table_test_helper.rb diff --git a/test/controllers/user_blocks/table_test_helper.rb b/test/controllers/user_blocks/table_test_helper.rb new file mode 100644 index 000000000..3506c31bb --- /dev/null +++ b/test/controllers/user_blocks/table_test_helper.rb @@ -0,0 +1,24 @@ +module UserBlocks + module TableTestHelper + private + + def check_user_blocks_table(user_blocks) + assert_dom "table#block_list tbody tr" do |rows| + assert_equal user_blocks.count, rows.count, "unexpected number of rows in user blocks table" + rows.zip(user_blocks).map do |row, user_block| + assert_dom row, "a[href='#{user_block_path user_block}']", 1 + end + end + end + + def check_no_page_link(name) + assert_select "a.page-link", { :text => /#{Regexp.quote(name)}/, :count => 0 }, "unexpected #{name} page link" + end + + def check_page_link(name) + assert_select "a.page-link", { :text => /#{Regexp.quote(name)}/ }, "missing #{name} page link" do |buttons| + return buttons.first.attributes["href"].value + end + end + end +end diff --git a/test/controllers/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb index ff789e7aa..2b2238b61 100644 --- a/test/controllers/user_blocks_controller_test.rb +++ b/test/controllers/user_blocks_controller_test.rb @@ -1,6 +1,9 @@ require "test_helper" +require_relative "user_blocks/table_test_helper" class UserBlocksControllerTest < ActionDispatch::IntegrationTest + include UserBlocks::TableTestHelper + ## # test all routes which lead to this controller def test_routes @@ -1029,23 +1032,4 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest assert_equal "Updated Reason Again", block.reason assert_equal original_ends_at, block.ends_at end - - def check_user_blocks_table(user_blocks) - assert_dom "table#block_list tbody tr" do |rows| - assert_equal user_blocks.count, rows.count, "unexpected number of rows in user blocks table" - rows.zip(user_blocks).map do |row, user_block| - assert_dom row, "a[href='#{user_block_path user_block}']", 1 - end - end - end - - def check_no_page_link(name) - assert_select "a.page-link", { :text => /#{Regexp.quote(name)}/, :count => 0 }, "unexpected #{name} page link" - end - - def check_page_link(name) - assert_select "a.page-link", { :text => /#{Regexp.quote(name)}/ }, "missing #{name} page link" do |buttons| - return buttons.first.attributes["href"].value - end - end end -- 2.39.5