diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-26 11:03:01 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-26 11:03:01 +0000 |
| commit | 704b08adbd16a1d7f610478d8f77cca36a1981b5 (patch) | |
| tree | 2b1ee9d230ae4c5e76617e7979c174b5015accfb /spec/gitlab_projects_spec.rb | |
| parent | 56e216f33ca0db21336cc8dc1f7e09a834267772 (diff) | |
| parent | 3bd2b660ff550e3eddea5b4b113ee79cf66e0f7f (diff) | |
| download | gitlab-shell-704b08adbd16a1d7f610478d8f77cca36a1981b5.tar.gz | |
Merge branch 'create_hooks' into 'master'
Add bin/create-hooks command for backup restores
This solves the problem that `support/rewrite-hooks.sh` assumes that the gitlab-shell is installed in `/home/git/gitlab-shell`, which does not hold for omnibus-gitlab.
Diffstat (limited to 'spec/gitlab_projects_spec.rb')
| -rw-r--r-- | spec/gitlab_projects_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/gitlab_projects_spec.rb b/spec/gitlab_projects_spec.rb index bbe27e2..4341ca5 100644 --- a/spec/gitlab_projects_spec.rb +++ b/spec/gitlab_projects_spec.rb @@ -95,7 +95,7 @@ describe GitlabProjects do it "should create a directory" do gl_projects.stub(system: true) - gl_projects.stub(create_hooks: true) + GitlabProjects.stub(create_hooks: true) gl_projects.exec File.exists?(tmp_repo_path).should be_true end @@ -103,7 +103,7 @@ describe GitlabProjects do it "should receive valid cmd" do valid_cmd = ['git', "--git-dir=#{tmp_repo_path}", 'init', '--bare'] gl_projects.should_receive(:system).with(*valid_cmd).and_return(true) - gl_projects.should_receive(:create_hooks).with(tmp_repo_path) + GitlabProjects.should_receive(:create_hooks).with(tmp_repo_path) gl_projects.exec end |