@@ -68,21 +68,21 @@ def test_codeowners_not_present_develop
6868 def test_deny_merge_main
6969 classic_rules = @obj . rules_required_pull_request_reviews ( 'main' )
7070 rulesets = @obj . get_branch_ruleset ( 'main' )
71- rulesets_rules = rulesets . nil? || rulesets . find { |rule | rule [ 'type' ] == 'pull_request' }
71+ rulesets_rules = rulesets & .find { |rule | rule [ 'type' ] == 'pull_request' }
7272 assert_not_nil ( classic_rules || rulesets_rules , 'We should not allow merge to main branch without PR' )
7373 end
7474
7575 def test_deny_merge_develop
7676 classic_rules = @obj . rules_required_pull_request_reviews ( 'develop' )
7777 rulesets = @obj . get_branch_ruleset ( 'develop' )
78- rulesets_rules = rulesets . nil? || rulesets . find { |rule | rule [ 'type' ] == 'pull_request' }
78+ rulesets_rules = rulesets & .find { |rule | rule [ 'type' ] == 'pull_request' }
7979 assert_not_nil ( classic_rules || rulesets_rules , 'We should not allow merge to develop branch without PR ' )
8080 end
8181
8282 def test_2_approvals_develop
8383 classic_required_approving_review_count = @obj . rules_required_pull_request_reviews ( 'develop' ) . nil? || @obj . rules_required_pull_request_reviews ( 'develop' ) [ "required_approving_review_count" ]
8484 pull_request_rulesets_rules = @obj . get_branch_ruleset ( 'develop' )
85- rulesets_required_approving_review_count = pull_request_rulesets_rules . nil? || pull_request_rulesets_rules . find { |rule | rule [ 'type' ] == 'pull_request' } [ 'parameters' ] [ 'required_approving_review_count' ]
85+ rulesets_required_approving_review_count = pull_request_rulesets_rules & .find { |rule | rule [ 'type' ] == 'pull_request' } [ 'parameters' ] [ 'required_approving_review_count' ]
8686 expected = 2
8787 required_approving_review_count = classic_required_approving_review_count == expected || rulesets_required_approving_review_count == expected
8888 assert_true ( required_approving_review_count , 'We should have 2 approvals before merge to develop branch' )
@@ -91,7 +91,7 @@ def test_2_approvals_develop
9191 def test_without_approval_main
9292 classic_required_approving_review_count = @obj . rules_required_pull_request_reviews ( 'main' ) . nil? || @obj . rules_required_pull_request_reviews ( 'main' ) [ "required_approving_review_count" ]
9393 pull_request_rulesets_rules = @obj . get_branch_ruleset ( 'main' )
94- rulesets_required_approving_review_count = pull_request_rulesets_rules . nil? || pull_request_rulesets_rules . find { |rule | rule [ 'type' ] == 'pull_request' } [ 'parameters' ] [ 'required_approving_review_count' ]
94+ rulesets_required_approving_review_count = pull_request_rulesets_rules & .find { |rule | rule [ 'type' ] == 'pull_request' } [ 'parameters' ] [ 'required_approving_review_count' ]
9595 expected = 0
9696 required_approving_review_count = classic_required_approving_review_count == expected || rulesets_required_approving_review_count == expected
9797 assert_true ( required_approving_review_count , 'We shouldn\'t have any approvals before merge to main branch' )
@@ -101,7 +101,7 @@ def test_approve_from_user
101101 user_name = 'online-marathon'
102102 classic_require_code_owner_review = @obj . rules_required_pull_request_reviews ( 'develop' ) . nil? || @obj . rules_required_pull_request_reviews ( 'develop' ) [ "require_code_owner_reviews" ]
103103 pull_request_rulesets_rules = @obj . get_branch_ruleset ( 'develop' )
104- rulesets_require_code_owner_review = pull_request_rulesets_rules . nil? || pull_request_rulesets_rules ( 'develop' ) . find { |rule | rule [ 'type' ] == 'pull_request' } [ 'parameters' ] [ 'require_code_owner_review' ]
104+ rulesets_require_code_owner_review = pull_request_rulesets_rules ( 'develop' ) & .find { |rule | rule [ 'type' ] == 'pull_request' } [ 'parameters' ] [ 'require_code_owner_review' ]
105105 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 } " )
106106 end
107107
0 commit comments