summaryrefslogtreecommitdiff
path: root/spec/gitlab_shell_spec.rb
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2016-06-23 11:12:56 +0200
committerJacob Vosmaer <jacob@gitlab.com>2016-06-23 11:12:56 +0200
commit2467697d81e4ab9e9d770d55d8cb33cb5779db22 (patch)
tree8f434e05b922be51277e6b60f667e00acb3ff1e2 /spec/gitlab_shell_spec.rb
parentc6f14956d64e726f613c0092587f97444beeebb7 (diff)
downloadgitlab-shell-simplify-access-status.tar.gz
Simplify the GitAccessStatus classsimplify-access-status
Make the optional 'message' argument required. Remove unused 'to_json' method.
Diffstat (limited to 'spec/gitlab_shell_spec.rb')
-rw-r--r--spec/gitlab_shell_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/gitlab_shell_spec.rb b/spec/gitlab_shell_spec.rb
index dd5cfb2..3be1671 100644
--- a/spec/gitlab_shell_spec.rb
+++ b/spec/gitlab_shell_spec.rb
@@ -22,7 +22,7 @@ describe GitlabShell do
let(:api) do
double(GitlabNet).tap do |api|
api.stub(discover: { 'name' => 'John Doe' })
- api.stub(check_access: GitAccessStatus.new(true))
+ api.stub(check_access: GitAccessStatus.new(true, 'ok'))
end
end
@@ -230,7 +230,7 @@ describe GitlabShell do
end
it "should disallow access and log the attempt if check_access returns false status" do
- api.stub(check_access: GitAccessStatus.new(false))
+ api.stub(check_access: GitAccessStatus.new(false, 'denied'))
message = "gitlab-shell: Access denied for git command <git-upload-pack gitlab-ci.git> "
message << "by user with key #{key_id}."
$logger.should_receive(:warn).with(message)