diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-02 18:06:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-02 18:06:12 +0300 |
commit | 4f4dcd3c5d7a15b7eab5fa28e27482fa68c750a3 (patch) | |
tree | 75e1d73289b774a909461007406eb22b33989265 /spec | |
parent | 2cf5eb1498d6613523b39a829eb00f76df17e781 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/git/repository_spec.rb | 29 | ||||
-rw-r--r-- | spec/lib/gitlab/gitaly_client/repository_service_spec.rb | 22 | ||||
-rw-r--r-- | spec/spec_helper.rb | 4 |
3 files changed, 55 insertions, 0 deletions
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb index dcb7401b695..354260f23f6 100644 --- a/spec/lib/gitlab/git/repository_spec.rb +++ b/spec/lib/gitlab/git/repository_spec.rb @@ -2236,4 +2236,33 @@ describe Gitlab::Git::Repository, :seed_helper do expect(repository.commit(new_commit.oid).id).to eq(new_commit.oid) end end + + describe '#rename' do + let(:project) { create(:project, :repository)} + let(:repository) { project.repository } + + it 'moves the repository' do + checksum = repository.checksum + new_relative_path = "rename_test/relative/path" + renamed_repository = Gitlab::Git::Repository.new(repository.storage, new_relative_path, nil, nil) + + repository.rename(new_relative_path) + + expect(renamed_repository.checksum).to eq(checksum) + expect(repository.exists?).to be false + end + end + + describe '#remove' do + let(:project) { create(:project, :repository)} + let(:repository) { project.repository } + + it 'removes the repository' do + expect(repository.exists?).to be true + + repository.remove + + expect(repository.raw_repository.exists?).to be false + end + end end diff --git a/spec/lib/gitlab/gitaly_client/repository_service_spec.rb b/spec/lib/gitlab/gitaly_client/repository_service_spec.rb index a3808adb376..f4b73931f21 100644 --- a/spec/lib/gitlab/gitaly_client/repository_service_spec.rb +++ b/spec/lib/gitlab/gitaly_client/repository_service_spec.rb @@ -272,4 +272,26 @@ describe Gitlab::GitalyClient::RepositoryService do end end end + + describe 'remove' do + it 'sends a remove_repository message' do + expect_any_instance_of(Gitaly::RepositoryService::Stub) + .to receive(:remove_repository) + .with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash)) + .and_return(double(value: true)) + + client.remove + end + end + + describe 'rename' do + it 'sends a rename_repository message' do + expect_any_instance_of(Gitaly::RepositoryService::Stub) + .to receive(:rename_repository) + .with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash)) + .and_return(double(value: true)) + + client.rename('some/new/path') + end + end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index ebfdc1bab44..d6c326764d1 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -350,6 +350,10 @@ FactoryBot::SyntaxRunner.class_eval do include RSpec::Mocks::ExampleMethods end +# Use FactoryBot 4.x behavior: +# https://github.com/thoughtbot/factory_bot/blob/master/GETTING_STARTED.md#associations +FactoryBot.use_parent_strategy = false + ActiveRecord::Migration.maintain_test_schema! Shoulda::Matchers.configure do |config| |