Fix test for GitAccessWiki, it's overriding change_access_check

This commit is contained in:
Lin Jen-Shin 2016-11-11 22:26:05 +08:00
parent 40632455b8
commit 5da9bfa453
2 changed files with 7 additions and 4 deletions

View File

@ -138,9 +138,7 @@ module Gitlab
# Iterate over all changes to find if user allowed all of them to be applied
changes_list.each do |change|
status = Checks::ChangeAccess.new(change,
user_access: user_access,
project: project).exec
status = check_single_change_access(change)
unless status.allowed?
# If user does not have access to make at least one change - cancel all push
raise UnauthorizedError, status.message
@ -148,6 +146,11 @@ module Gitlab
end
end
def check_single_change_access(change)
Checks::ChangeAccess.new(
change, user_access: user_access, project: project).exec
end
def matching_merge_request?(newrev, branch_name)
Checks::MatchingMergeRequest.new(newrev, branch_name, project).match?
end

View File

@ -1,6 +1,6 @@
module Gitlab
class GitAccessWiki < GitAccess
def change_access_check(change)
def check_single_change_access(change)
if user_access.can_do_action?(:create_wiki)
build_status_object(true)
else