Skip to content

Commit 78cadbc

Browse files
authored
Update script_test.rb
1 parent f985141 commit 78cadbc

File tree

1 file changed

+8
-21
lines changed

1 file changed

+8
-21
lines changed

.github/tests/test/script_test.rb

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -67,29 +67,22 @@ 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_rules = @obj.get_branch_ruleset('main')
71-
if rulesets_rules.class == Array
72-
rulesets_rules = rulesets.find { |rule| rule['type'] == 'pull_request' }
73-
end
70+
rulesets = @obj.get_branch_ruleset('main')
71+
rulesets_rules = rulesets.nil? || rulesets.find { |rule| rule['type'] == 'pull_request' }
7472
assert_not_nil(classic_rules || rulesets_rules, 'We should not allow merge to main branch without PR')
7573
end
7674

7775
def test_deny_merge_develop
7876
classic_rules = @obj.rules_required_pull_request_reviews('develop')
79-
rulesets_rules = @obj.get_branch_ruleset('develop')
80-
if rulesets_rules.class == Array
81-
rulesets_rules = rulesets_rules.find { |rule| rule['type'] == 'pull_request' }
82-
end
83-
assert_not_nil(classic_rules || rulesets, 'We should not allow merge to develop branch without PR ')
77+
rulesets = @obj.get_branch_ruleset('develop')
78+
rulesets_rules = rulesets.nil? || rulesets.find { |rule| rule['type'] == 'pull_request' }
79+
assert_not_nil(classic_rules || rulesets_rules, 'We should not allow merge to develop branch without PR ')
8480
end
8581

8682
def test_2_approvals_develop
8783
classic_required_approving_review_count = @obj.rules_required_pull_request_reviews('develop').nil? || @obj.rules_required_pull_request_reviews('develop')["required_approving_review_count"]
8884
pull_request_rulesets_rules = @obj.get_branch_ruleset('develop')
89-
if pull_request_rulesets_rules.class == Array
90-
pull_request_rulesets_rules = pull_request_rulesets_rules.find { |rule| rule['type'] == 'pull_request' }
91-
end
92-
rulesets_required_approving_review_count = pull_request_rulesets_rules['parameters']['required_approving_review_count']
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']
9386
expected = 2
9487
required_approving_review_count = classic_required_approving_review_count == expected || rulesets_required_approving_review_count == expected
9588
assert_true(required_approving_review_count, 'We should have 2 approvals before merge to develop branch')
@@ -98,10 +91,7 @@ def test_2_approvals_develop
9891
def test_without_approval_main
9992
classic_required_approving_review_count = @obj.rules_required_pull_request_reviews('main').nil? || @obj.rules_required_pull_request_reviews('main')["required_approving_review_count"]
10093
pull_request_rulesets_rules = @obj.get_branch_ruleset('main')
101-
if pull_request_rulesets_rules.class == Array
102-
pull_request_rulesets_rules = pull_request_rulesets_rules.find { |rule| rule['type'] == 'pull_request' }
103-
end
104-
rulesets_required_approving_review_count = pull_request_rulesets_rules['parameters']['required_approving_review_count']
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']
10595
expected = 0
10696
required_approving_review_count = classic_required_approving_review_count == expected || rulesets_required_approving_review_count == expected
10797
assert_true(required_approving_review_count, 'We shouldn\'t have any approvals before merge to main branch')
@@ -111,10 +101,7 @@ def test_approve_from_user
111101
user_name = 'online-marathon'
112102
classic_require_code_owner_review = @obj.rules_required_pull_request_reviews('develop').nil? || @obj.rules_required_pull_request_reviews('develop')["require_code_owner_reviews"]
113103
pull_request_rulesets_rules = @obj.get_branch_ruleset('develop')
114-
if pull_request_rulesets_rules.class == Array
115-
pull_request_rulesets_rules = pull_request_rulsets_rules.find { |rule| rule['type'] == 'pull_request' }
116-
end
117-
rulesets_require_code_owner_review = pull_request_rulesets_rules['parameters']['require_code_owner_review']
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']
118105
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}")
119106
end
120107

0 commit comments

Comments
 (0)