diff options
author | Jacob Vosmaer <jacob@gitlab.com> | 2016-06-23 11:12:56 +0200 |
---|---|---|
committer | Jacob Vosmaer <jacob@gitlab.com> | 2016-06-23 11:12:56 +0200 |
commit | 2467697d81e4ab9e9d770d55d8cb33cb5779db22 (patch) | |
tree | 8f434e05b922be51277e6b60f667e00acb3ff1e2 | |
parent | c6f14956d64e726f613c0092587f97444beeebb7 (diff) | |
download | gitlab-shell-simplify-access-status.tar.gz |
Simplify the GitAccessStatus classsimplify-access-status
Make the optional 'message' argument required. Remove unused 'to_json'
method.
-rw-r--r-- | lib/gitlab_access_status.rb | 9 | ||||
-rw-r--r-- | spec/gitlab_access_spec.rb | 4 | ||||
-rw-r--r-- | spec/gitlab_shell_spec.rb | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/lib/gitlab_access_status.rb b/lib/gitlab_access_status.rb index 14ec1ef..7a5f7d5 100644 --- a/lib/gitlab_access_status.rb +++ b/lib/gitlab_access_status.rb @@ -1,10 +1,9 @@ require 'json' class GitAccessStatus - attr_accessor :status, :message - alias_method :allowed?, :status + attr_reader :message - def initialize(status, message = '') + def initialize(status, message) @status = status @message = message end @@ -14,7 +13,7 @@ class GitAccessStatus self.new(values["status"], values["message"]) end - def to_json - { status: @status, message: @message }.to_json + def allowed? + @status end end diff --git a/spec/gitlab_access_spec.rb b/spec/gitlab_access_spec.rb index 4768c71..39c3ab3 100644 --- a/spec/gitlab_access_spec.rb +++ b/spec/gitlab_access_spec.rb @@ -7,7 +7,7 @@ describe GitlabAccess do let(:repo_path) { File.join(repository_path, repo_name) + ".git" } let(:api) do double(GitlabNet).tap do |api| - api.stub(check_access: GitAccessStatus.new(true)) + api.stub(check_access: GitAccessStatus.new(true, 'ok')) end end subject do @@ -38,7 +38,7 @@ describe GitlabAccess do context "access is denied" do before do - api.stub(check_access: GitAccessStatus.new(false)) + api.stub(check_access: GitAccessStatus.new(false, 'denied')) end it "returns false" do 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) |