Commit 6904814b authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'fix-git-access-specs' into 'master'

Fix GitAccess specs

Closes #28620

See merge request !9479
parents 62829b6b 485ac922
...@@ -199,7 +199,9 @@ describe Gitlab::GitAccess, lib: true do ...@@ -199,7 +199,9 @@ describe Gitlab::GitAccess, lib: true do
def stub_git_hooks def stub_git_hooks
# Running the `pre-receive` hook is expensive, and not necessary for this test. # Running the `pre-receive` hook is expensive, and not necessary for this test.
allow_any_instance_of(GitHooksService).to receive(:execute).and_yield allow_any_instance_of(GitHooksService).to receive(:execute) do |service, &block|
block.call(service)
end
end end
def merge_into_protected_branch def merge_into_protected_branch
...@@ -232,11 +234,18 @@ describe Gitlab::GitAccess, lib: true do ...@@ -232,11 +234,18 @@ describe Gitlab::GitAccess, lib: true do
else else
project.team << [user, role] project.team << [user, role]
end end
end
permissions_matrix[role].each do |action, allowed| permissions_matrix[role].each do |action, allowed|
context action do context action do
subject { access.send(:check_push_access!, changes[action]) } subject { access.send(:check_push_access!, changes[action]) }
it { expect(subject.allowed?).to allowed ? be_truthy : be_falsey }
it do
if allowed
expect { subject }.not_to raise_error
else
expect { subject }.to raise_error(Gitlab::GitAccess::UnauthorizedError)
end
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment