From 8630b6417d1182c116ce603d2104e35534562820 Mon Sep 17 00:00:00 2001 From: mplesha Date: Sat, 1 Feb 2025 21:26:38 +0200 Subject: [PATCH 1/7] Update script_test.rb --- .github/tests/test/script_test.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/tests/test/script_test.rb b/.github/tests/test/script_test.rb index 5c3a028..cf2477a 100644 --- a/.github/tests/test/script_test.rb +++ b/.github/tests/test/script_test.rb @@ -101,6 +101,8 @@ def test_approve_from_user user_name = 'softservedata' classic_require_code_owner_review = @obj.rules_required_pull_request_reviews('main').nil? || @obj.rules_required_pull_request_reviews('develop')["require_code_owner_reviews"] pull_request_rulesets_rules = @obj.get_branch_ruleset('main') + puts '#######' + puts pull_request_rulesets_rules rulesets_require_code_owner_review = pull_request_rulesets_rules&.find { |rule| rule['type'] == 'pull_request' }&.[]('parameters')&.[]('require_code_owner_review') assert_not_nil(classic_require_code_owner_review || rulesets_require_code_owner_review, "We should not allow merge to main branch without approve from #{user_name}") end From 587c0a79f48463532ad7cc4c01b2108c96ecd32e Mon Sep 17 00:00:00 2001 From: mplesha Date: Sat, 1 Feb 2025 21:29:37 +0200 Subject: [PATCH 2/7] Update script_test.rb --- .github/tests/test/script_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/tests/test/script_test.rb b/.github/tests/test/script_test.rb index cf2477a..6a26b34 100644 --- a/.github/tests/test/script_test.rb +++ b/.github/tests/test/script_test.rb @@ -102,8 +102,8 @@ def test_approve_from_user classic_require_code_owner_review = @obj.rules_required_pull_request_reviews('main').nil? || @obj.rules_required_pull_request_reviews('develop')["require_code_owner_reviews"] pull_request_rulesets_rules = @obj.get_branch_ruleset('main') puts '#######' - puts pull_request_rulesets_rules rulesets_require_code_owner_review = pull_request_rulesets_rules&.find { |rule| rule['type'] == 'pull_request' }&.[]('parameters')&.[]('require_code_owner_review') + puts rulesets_require_code_owner_review assert_not_nil(classic_require_code_owner_review || rulesets_require_code_owner_review, "We should not allow merge to main branch without approve from #{user_name}") end From fb4d62cf3c0bef65aa1f0331ee78b7a3a5d4fec9 Mon Sep 17 00:00:00 2001 From: mplesha Date: Sat, 1 Feb 2025 21:32:35 +0200 Subject: [PATCH 3/7] Update script_test.rb --- .github/tests/test/script_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/tests/test/script_test.rb b/.github/tests/test/script_test.rb index 6a26b34..1336e1e 100644 --- a/.github/tests/test/script_test.rb +++ b/.github/tests/test/script_test.rb @@ -101,7 +101,7 @@ def test_approve_from_user user_name = 'softservedata' classic_require_code_owner_review = @obj.rules_required_pull_request_reviews('main').nil? || @obj.rules_required_pull_request_reviews('develop')["require_code_owner_reviews"] pull_request_rulesets_rules = @obj.get_branch_ruleset('main') - puts '#######' + puts '#########' rulesets_require_code_owner_review = pull_request_rulesets_rules&.find { |rule| rule['type'] == 'pull_request' }&.[]('parameters')&.[]('require_code_owner_review') puts rulesets_require_code_owner_review assert_not_nil(classic_require_code_owner_review || rulesets_require_code_owner_review, "We should not allow merge to main branch without approve from #{user_name}") From 01ef16eccab2158d3a25d124fe01937efb2bb74c Mon Sep 17 00:00:00 2001 From: mplesha Date: Sat, 1 Feb 2025 21:35:34 +0200 Subject: [PATCH 4/7] Update script_test.rb --- .github/tests/test/script_test.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/tests/test/script_test.rb b/.github/tests/test/script_test.rb index 1336e1e..5e0b784 100644 --- a/.github/tests/test/script_test.rb +++ b/.github/tests/test/script_test.rb @@ -102,6 +102,7 @@ def test_approve_from_user classic_require_code_owner_review = @obj.rules_required_pull_request_reviews('main').nil? || @obj.rules_required_pull_request_reviews('develop')["require_code_owner_reviews"] pull_request_rulesets_rules = @obj.get_branch_ruleset('main') puts '#########' + puts classic_require_code_owner_review rulesets_require_code_owner_review = pull_request_rulesets_rules&.find { |rule| rule['type'] == 'pull_request' }&.[]('parameters')&.[]('require_code_owner_review') puts rulesets_require_code_owner_review assert_not_nil(classic_require_code_owner_review || rulesets_require_code_owner_review, "We should not allow merge to main branch without approve from #{user_name}") From 044e881fb4f47e2d3b653ecac3724da9283ef1b3 Mon Sep 17 00:00:00 2001 From: mplesha Date: Sat, 1 Feb 2025 21:40:51 +0200 Subject: [PATCH 5/7] Update script_test.rb --- .github/tests/test/script_test.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/tests/test/script_test.rb b/.github/tests/test/script_test.rb index 5e0b784..88c3c71 100644 --- a/.github/tests/test/script_test.rb +++ b/.github/tests/test/script_test.rb @@ -99,10 +99,8 @@ def test_without_approval_main def test_approve_from_user user_name = 'softservedata' - classic_require_code_owner_review = @obj.rules_required_pull_request_reviews('main').nil? || @obj.rules_required_pull_request_reviews('develop')["require_code_owner_reviews"] + classic_require_code_owner_review = @obj.rules_required_pull_request_reviews('main').nil? || @obj.rules_required_pull_request_reviews('main')["require_code_owner_reviews"] pull_request_rulesets_rules = @obj.get_branch_ruleset('main') - puts '#########' - puts classic_require_code_owner_review rulesets_require_code_owner_review = pull_request_rulesets_rules&.find { |rule| rule['type'] == 'pull_request' }&.[]('parameters')&.[]('require_code_owner_review') puts rulesets_require_code_owner_review assert_not_nil(classic_require_code_owner_review || rulesets_require_code_owner_review, "We should not allow merge to main branch without approve from #{user_name}") From e86e116b5a2484cede79a2a917cb720f0b5917c6 Mon Sep 17 00:00:00 2001 From: mplesha Date: Sat, 1 Feb 2025 21:44:18 +0200 Subject: [PATCH 6/7] Update script_test.rb --- .github/tests/test/script_test.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/tests/test/script_test.rb b/.github/tests/test/script_test.rb index 88c3c71..869326c 100644 --- a/.github/tests/test/script_test.rb +++ b/.github/tests/test/script_test.rb @@ -99,10 +99,11 @@ def test_without_approval_main def test_approve_from_user user_name = 'softservedata' - classic_require_code_owner_review = @obj.rules_required_pull_request_reviews('main').nil? || @obj.rules_required_pull_request_reviews('main')["require_code_owner_reviews"] + classic_require_code_owner_review = @obj.rules_required_pull_request_reviews('main') pull_request_rulesets_rules = @obj.get_branch_ruleset('main') rulesets_require_code_owner_review = pull_request_rulesets_rules&.find { |rule| rule['type'] == 'pull_request' }&.[]('parameters')&.[]('require_code_owner_review') puts rulesets_require_code_owner_review + puts pull_request_rulesets_rules assert_not_nil(classic_require_code_owner_review || rulesets_require_code_owner_review, "We should not allow merge to main branch without approve from #{user_name}") end From 27d706e9fadf013acac301de603fd41211cbb207 Mon Sep 17 00:00:00 2001 From: mplesha Date: Sat, 1 Feb 2025 21:52:08 +0200 Subject: [PATCH 7/7] Update script_test.rb --- .github/tests/test/script_test.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/tests/test/script_test.rb b/.github/tests/test/script_test.rb index 869326c..4a52167 100644 --- a/.github/tests/test/script_test.rb +++ b/.github/tests/test/script_test.rb @@ -99,12 +99,10 @@ def test_without_approval_main def test_approve_from_user user_name = 'softservedata' - classic_require_code_owner_review = @obj.rules_required_pull_request_reviews('main') + classic_require_code_owner_review = @obj.rules_required_pull_request_reviews('main').nil? pull_request_rulesets_rules = @obj.get_branch_ruleset('main') rulesets_require_code_owner_review = pull_request_rulesets_rules&.find { |rule| rule['type'] == 'pull_request' }&.[]('parameters')&.[]('require_code_owner_review') - puts rulesets_require_code_owner_review - puts pull_request_rulesets_rules - assert_not_nil(classic_require_code_owner_review || rulesets_require_code_owner_review, "We should not allow merge to main branch without approve from #{user_name}") + assert(classic_require_code_owner_review || rulesets_require_code_owner_review, "We should not allow merge to main branch without approve from #{user_name}") end def test_PR_template_present