Commit 27bc2178 authored by Gabriel Mazetto's avatar Gabriel Mazetto

Fix specs

parent 5af456a0
...@@ -23,7 +23,7 @@ RSpec.describe Geo::DeletedProject, type: :model do ...@@ -23,7 +23,7 @@ RSpec.describe Geo::DeletedProject, type: :model do
describe '#repository' do describe '#repository' do
it 'returns a valid repository' do it 'returns a valid repository' do
expect(subject.repository).to be_kind_of(Repository) expect(subject.repository).to be_kind_of(Repository)
expect(subject.repository.path_with_namespace).to eq('root/sample') expect(subject.repository.full_path).to eq('root/sample')
end end
end end
end end
...@@ -1860,7 +1860,7 @@ describe Repository do ...@@ -1860,7 +1860,7 @@ describe Repository do
describe '#push_remote_branches' do describe '#push_remote_branches' do
it 'push branches to the remote repo' do it 'push branches to the remote repo' do
expect_any_instance_of(Gitlab::Shell).to receive(:push_remote_branches) expect_any_instance_of(Gitlab::Shell).to receive(:push_remote_branches)
.with(repository.storage_path, repository.path_with_namespace, 'remote_name', ['branch']) .with(repository.storage_path, repository.disk_path, 'remote_name', ['branch'])
repository.push_remote_branches('remote_name', ['branch']) repository.push_remote_branches('remote_name', ['branch'])
end end
...@@ -1869,7 +1869,7 @@ describe Repository do ...@@ -1869,7 +1869,7 @@ describe Repository do
describe '#delete_remote_branches' do describe '#delete_remote_branches' do
it 'delete branches to the remote repo' do it 'delete branches to the remote repo' do
expect_any_instance_of(Gitlab::Shell).to receive(:delete_remote_branches) expect_any_instance_of(Gitlab::Shell).to receive(:delete_remote_branches)
.with(repository.storage_path, repository.path_with_namespace, 'remote_name', ['branch']) .with(repository.storage_path, repository.disk_path, 'remote_name', ['branch'])
repository.delete_remote_branches('remote_name', ['branch']) repository.delete_remote_branches('remote_name', ['branch'])
end end
...@@ -1888,7 +1888,7 @@ describe Repository do ...@@ -1888,7 +1888,7 @@ describe Repository do
masterrev = repository.find_branch('master').dereferenced_target.id masterrev = repository.find_branch('master').dereferenced_target.id
expect_any_instance_of(Gitlab::Shell).to receive(:list_remote_tags) expect_any_instance_of(Gitlab::Shell).to receive(:list_remote_tags)
.with(repository.storage_path, repository.path_with_namespace, 'upstream') .with(repository.storage_path, repository.disk_path, 'upstream')
.and_return({ 'v0.0.1' => masterrev }) .and_return({ 'v0.0.1' => masterrev })
tags = repository.remote_tags('upstream') tags = repository.remote_tags('upstream')
......
...@@ -2,7 +2,7 @@ require 'spec_helper' ...@@ -2,7 +2,7 @@ require 'spec_helper'
describe GeoRepositoryDestroyWorker do describe GeoRepositoryDestroyWorker do
let!(:project) { create :project_empty_repo } let!(:project) { create :project_empty_repo }
let!(:path) { project.repository.path_with_namespace } let!(:path) { project.repository.full_path }
let!(:remove_path) { path.sub(/\.git\Z/, "+#{project.id}+deleted.git") } let!(:remove_path) { path.sub(/\.git\Z/, "+#{project.id}+deleted.git") }
let(:perform!) { subject.perform(project.id, project.name, path) } let(:perform!) { subject.perform(project.id, project.name, path) }
......
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