Merge branch 'simplify-access-status' into 'master'

Simplify the GitAccessStatus class

Make the optional 'message' argument required. Remove unused 'to_json'
method.

See merge request !65

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)