@@ -67,29 +67,41 @@ def test_codeowners_not_present_develop
6767
6868 def test_deny_merge_main
6969 classic_rules = @obj . rules_required_pull_request_reviews ( 'main' )
70- rulesets = @obj . get_branch_ruleset ( 'main' ) . find { |rule | rule [ 'type' ] == 'pull_request' }
71- assert_not_nil ( classic_rules || rulesets , 'We should not allow merge to main branch without PR' )
70+ rulesets_rules = @obj . get_branch_ruleset ( 'main' )
71+ if rulesets_rules !== nil
72+ rulesets_rules = rulesets . find { |rule | rule [ 'type' ] == 'pull_request' }
73+ end
74+ assert_not_nil ( classic_rules || rulesets_rules , 'We should not allow merge to main branch without PR' )
7275 end
7376
7477 def test_deny_merge_develop
7578 classic_rules = @obj . rules_required_pull_request_reviews ( 'develop' )
76- rulesets = @obj . get_branch_ruleset ( 'develop' ) . find { |rule | rule [ 'type' ] == 'pull_request' }
79+ rulesets_rules = @obj . get_branch_ruleset ( 'develop' )
80+ if rulesets_rules !== nil
81+ rulesets_rules = rulesets_rules . find { |rule | rule [ 'type' ] == 'pull_request' }
82+ end
7783 assert_not_nil ( classic_rules || rulesets , 'We should not allow merge to develop branch without PR ' )
7884 end
7985
8086 def test_2_approvals_develop
8187 classic_required_approving_review_count = @obj . rules_required_pull_request_reviews ( 'develop' ) . nil? || @obj . rules_required_pull_request_reviews ( 'develop' ) [ "required_approving_review_count" ]
82- pull_request_rulesets_rules = @obj . get_branch_ruleset ( 'develop' ) . find { |rule | rule [ 'type' ] == 'pull_request' }
83- rulesets_required_approving_review_count = pull_request_rulesets_rules [ 'parameters' ] [ 'required_approving_review_count' ]
88+ pull_request_rulesets_rules = @obj . get_branch_ruleset ( 'develop' )
89+ if pull_request_rulesets_rules != nil
90+ pull_request_rulesets_rules = pull_request_rulesets_rules . find { |rule | rule [ 'type' ] == 'pull_request' }
91+ rulesets_required_approving_review_count = pull_request_rulesets_rules [ 'parameters' ] [ 'required_approving_review_count' ]
92+ end
8493 expected = 2
8594 required_approving_review_count = classic_required_approving_review_count == expected || rulesets_required_approving_review_count == expected
8695 assert_true ( required_approving_review_count , 'We should have 2 approvals before merge to develop branch' )
8796 end
8897
8998 def test_without_approval_main
9099 classic_required_approving_review_count = @obj . rules_required_pull_request_reviews ( 'main' ) . nil? || @obj . rules_required_pull_request_reviews ( 'main' ) [ "required_approving_review_count" ]
91- pull_request_rulesets_rules = @obj . get_branch_ruleset ( 'main' ) . find { |rule | rule [ 'type' ] == 'pull_request' }
92- rulesets_required_approving_review_count = pull_request_rulesets_rules [ 'parameters' ] [ 'required_approving_review_count' ]
100+ pull_request_rulesets_rules = @obj . get_branch_ruleset ( 'main' )
101+ if pull_request_rulesets_rules != nil
102+ pull_request_rulesets_rules = pull_request_rulesets_rules . find { |rule | rule [ 'type' ] == 'pull_request' }
103+ rulesets_required_approving_review_count = pull_request_rulesets_rules [ 'parameters' ] [ 'required_approving_review_count' ]
104+ end
93105 expected = 0
94106 required_approving_review_count = classic_required_approving_review_count == expected || rulesets_required_approving_review_count == expected
95107 assert_true ( required_approving_review_count , 'We shouldn\'t have any approvals before merge to main branch' )
@@ -98,8 +110,11 @@ def test_without_approval_main
98110 def test_approve_from_user
99111 user_name = 'online-marathon'
100112 classic_require_code_owner_review = @obj . rules_required_pull_request_reviews ( 'develop' ) . nil? || @obj . rules_required_pull_request_reviews ( 'develop' ) [ "require_code_owner_reviews" ]
101- pull_request_rulesets_rules = @obj . get_branch_ruleset ( 'develop' ) . find { |rule | rule [ 'type' ] == 'pull_request' }
102- rulesets_require_code_owner_review = pull_request_rulesets_rules [ 'parameters' ] [ 'require_code_owner_review' ]
113+ pull_request_rulesets_rules = @obj . get_branch_ruleset ( 'develop' )
114+ if pull_request_rulsets_rules != nil
115+ pull_request_rulsets_rules = pull_request_rulsets_rules . find { |rule | rule [ 'type' ] == 'pull_request' }
116+ rulesets_require_code_owner_review = pull_request_rulesets_rules [ 'parameters' ] [ 'require_code_owner_review' ]
117+ end
103118 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 } " )
104119 end
105120
0 commit comments