Commit 05382645 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #16 from docwhat/exec

Improve gitlab_shell spec and replace `system()` with `exec()`
parents 02c7da2e 7d4780ec
...@@ -44,13 +44,17 @@ class GitlabShell ...@@ -44,13 +44,17 @@ class GitlabShell
def process_cmd def process_cmd
repo_full_path = File.join(repos_path, repo_name) repo_full_path = File.join(repos_path, repo_name)
system("#{@git_cmd} #{repo_full_path}") exec_cmd "#{@git_cmd} #{repo_full_path}"
end end
def validate_access def validate_access
api.allowed?(@git_cmd, @repo_name, @key_id, '_any') api.allowed?(@git_cmd, @repo_name, @key_id, '_any')
end end
def exec_cmd args
Kernel::exec args
end
def api def api
GitlabNet.new GitlabNet.new
end end
......
...@@ -2,58 +2,113 @@ require_relative 'spec_helper' ...@@ -2,58 +2,113 @@ require_relative 'spec_helper'
require_relative '../lib/gitlab_shell' require_relative '../lib/gitlab_shell'
describe GitlabShell do describe GitlabShell do
describe :initialize do subject do
before do ARGV[0] = key_id
ssh_cmd 'git-receive-pack' GitlabShell.new.tap do |shell|
ARGV[0] = 'key-56' shell.stub(exec_cmd: :exec_called)
@shell = GitlabShell.new shell.stub(api: api)
end
end
let(:api) do
double(GitlabNet).tap do |api|
api.stub(discover: 'John Doe')
api.stub(allowed?: true)
end end
end
let(:key_id) { "key-#{rand(100) + 100}" }
let(:repository_path) { "/home/git#{rand(100)}/repos" }
before { GitlabConfig.any_instance.stub(:repos_path).and_return(repository_path) }
it { @shell.key_id.should == 'key-56' } describe :initialize do
it { @shell.repos_path.should == "/home/git/repositories" } before { ssh_cmd 'git-receive-pack' }
its(:key_id) { should == key_id }
its(:repos_path) { should == repository_path }
end end
describe :parse_cmd do describe :parse_cmd do
context 'w/o namespace' do context 'w/o namespace' do
before do before do
ssh_cmd 'git-upload-pack gitlab-ci.git' ssh_cmd 'git-upload-pack gitlab-ci.git'
@shell = GitlabShell.new subject.send :parse_cmd
@shell.send :parse_cmd
end end
it { @shell.repo_name.should == 'gitlab-ci.git' } its(:repo_name) { should == 'gitlab-ci.git' }
it { @shell.git_cmd.should == 'git-upload-pack' } its(:git_cmd) { should == 'git-upload-pack' }
end end
context 'namespace' do context 'namespace' do
before do before do
ssh_cmd 'git-upload-pack dmitriy.zaporozhets/gitlab-ci.git' ssh_cmd 'git-upload-pack dmitriy.zaporozhets/gitlab-ci.git'
@shell = GitlabShell.new subject.send :parse_cmd
@shell.send :parse_cmd
end end
it { @shell.repo_name.should == 'dmitriy.zaporozhets/gitlab-ci.git' } its(:repo_name) { should == 'dmitriy.zaporozhets/gitlab-ci.git' }
it { @shell.git_cmd.should == 'git-upload-pack' } its(:git_cmd) { should == 'git-upload-pack' }
end end
end end
describe :exec do describe :exec do
context 'git-upload-pack' do context 'git-upload-pack' do
before do before { ssh_cmd 'git-upload-pack gitlab-ci.git' }
ssh_cmd 'git-upload-pack gitlab-ci.git' after { subject.exec }
stubbed_shell
it "should process the command" do
subject.should_receive(:process_cmd).with()
end
it "should execute the command" do
subject.should_receive(:exec_cmd).with("git-upload-pack #{File.join(repository_path, 'gitlab-ci.git')}")
end end
it { @shell.exec.should be_true } it "should set the GL_ID environment variable" do
ENV.should_receive("[]=").with("GL_ID", key_id)
end
end end
context 'git-receive-pack' do context 'git-receive-pack' do
before do before { ssh_cmd 'git-receive-pack gitlab-ci.git' }
ssh_cmd 'git-receive-pack gitlab-ci.git' after { subject.exec }
stubbed_shell
it "should process the command" do
subject.should_receive(:process_cmd).with()
end
it "should execute the command" do
subject.should_receive(:exec_cmd).with("git-receive-pack #{File.join(repository_path, 'gitlab-ci.git')}")
end
end
context 'arbitrary command' do
before { ssh_cmd 'arbitrary command' }
after { subject.exec }
it "should not process the command" do
subject.should_not_receive(:process_cmd)
end end
it { @shell.exec.should be_true } it "should not execute the command" do
subject.should_not_receive(:exec_cmd)
end
end
context 'no command' do
before { ssh_cmd nil }
after { subject.exec }
it "should call api.discover" do
api.should_receive(:discover).with(key_id)
end
end
end
describe :validate_access do
before { ssh_cmd 'git-upload-pack gitlab-ci.git' }
after { subject.exec }
it "should call api.allowed?" do
api.should_receive(:allowed?).
with('git-upload-pack', 'gitlab-ci.git', key_id, '_any')
end end
end end
...@@ -61,10 +116,4 @@ describe GitlabShell do ...@@ -61,10 +116,4 @@ describe GitlabShell do
ENV['SSH_ORIGINAL_COMMAND'] = cmd ENV['SSH_ORIGINAL_COMMAND'] = cmd
end end
def stubbed_shell
ARGV[0] = 'key-56'
@shell = GitlabShell.new
@shell.stub(validate_access: true)
@shell.stub(process_cmd: true)
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