Skip to content
代码片段 群组 项目
未验证 提交 75c8c703 编辑于 作者: Joe Woodward's avatar Joe Woodward 提交者: GitLab
浏览文件

Merge branch '11133-fix-broken-master-approval-rule-inheritance-spec' into 'master'

Use array_including instead of array brackets

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/184184



Merged-by: default avatarJoe Woodward <jwoodward@gitlab.com>
Approved-by: default avatarJoe Woodward <jwoodward@gitlab.com>
Approved-by: default avatarGary Holtz <gholtz@gitlab.com>
Co-authored-by: default avatarghinfey <ghinfey@gitlab.com>
No related branches found
No related tags found
2 合并请求!3031Merge per-main-jh to main-jh by luzhiyuan,!3030Merge per-main-jh to main-jh
......@@ -337,7 +337,7 @@ def hooks_pass?(squashing: false)
it 'inherits only regular and any_approver rules from the project' do
expect(execute.approval_rules.count).to eq(2)
expect(execute.approval_rules.map(&:attributes)).to match(
expect(execute.approval_rules.map(&:attributes)).to match_array(
[
a_hash_including('approvals_required' => 1, 'rule_type' => 'any_approver'),
a_hash_including('approvals_required' => 2, 'rule_type' => 'regular')
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册