Skip to content

Commit 843b549

Browse files
authored
Update script_test.rb
1 parent 44b8e68 commit 843b549

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.github/tests/test/script_test.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def test_codeowners_not_present_develop
6868
def test_deny_merge_main
6969
classic_rules = @obj.rules_required_pull_request_reviews('main')
7070
rulesets_rules = @obj.get_branch_ruleset('main')
71-
if rulesets_rules !== nil
71+
if rulesets_rules.class == Array
7272
rulesets_rules = rulesets.find { |rule| rule['type'] == 'pull_request' }
7373
end
7474
assert_not_nil(classic_rules || rulesets_rules, 'We should not allow merge to main branch without PR')
@@ -77,7 +77,7 @@ def test_deny_merge_main
7777
def test_deny_merge_develop
7878
classic_rules = @obj.rules_required_pull_request_reviews('develop')
7979
rulesets_rules = @obj.get_branch_ruleset('develop')
80-
if rulesets_rules !== nil
80+
if rulesets_rules.class == Array
8181
rulesets_rules = rulesets_rules.find { |rule| rule['type'] == 'pull_request' }
8282
end
8383
assert_not_nil(classic_rules || rulesets, 'We should not allow merge to develop branch without PR ')
@@ -86,7 +86,7 @@ def test_deny_merge_develop
8686
def test_2_approvals_develop
8787
classic_required_approving_review_count = @obj.rules_required_pull_request_reviews('develop').nil? || @obj.rules_required_pull_request_reviews('develop')["required_approving_review_count"]
8888
pull_request_rulesets_rules = @obj.get_branch_ruleset('develop')
89-
if pull_request_rulesets_rules != nil
89+
if rulesets_rules.class == Array
9090
pull_request_rulesets_rules = pull_request_rulesets_rules.find { |rule| rule['type'] == 'pull_request' }
9191
rulesets_required_approving_review_count = pull_request_rulesets_rules['parameters']['required_approving_review_count']
9292
end
@@ -98,7 +98,7 @@ def test_2_approvals_develop
9898
def test_without_approval_main
9999
classic_required_approving_review_count = @obj.rules_required_pull_request_reviews('main').nil? || @obj.rules_required_pull_request_reviews('main')["required_approving_review_count"]
100100
pull_request_rulesets_rules = @obj.get_branch_ruleset('main')
101-
if pull_request_rulesets_rules != nil
101+
if rulesets_rules.class == Array
102102
pull_request_rulesets_rules = pull_request_rulesets_rules.find { |rule| rule['type'] == 'pull_request' }
103103
rulesets_required_approving_review_count = pull_request_rulesets_rules['parameters']['required_approving_review_count']
104104
end
@@ -111,7 +111,7 @@ def test_approve_from_user
111111
user_name = 'online-marathon'
112112
classic_require_code_owner_review = @obj.rules_required_pull_request_reviews('develop').nil? || @obj.rules_required_pull_request_reviews('develop')["require_code_owner_reviews"]
113113
pull_request_rulesets_rules = @obj.get_branch_ruleset('develop')
114-
if pull_request_rulsets_rules != nil
114+
if rulesets_rules.class == Array
115115
pull_request_rulsets_rules = pull_request_rulsets_rules.find { |rule| rule['type'] == 'pull_request' }
116116
rulesets_require_code_owner_review = pull_request_rulesets_rules['parameters']['require_code_owner_review']
117117
end

0 commit comments

Comments
 (0)