diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /spec/lib/gitlab/checks | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
download | gitlab-ce-85dc423f7090da0a52c73eb66faf22ddb20efff9.tar.gz |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'spec/lib/gitlab/checks')
-rw-r--r-- | spec/lib/gitlab/checks/lfs_integrity_spec.rb | 20 | ||||
-rw-r--r-- | spec/lib/gitlab/checks/project_moved_spec.rb | 8 | ||||
-rw-r--r-- | spec/lib/gitlab/checks/snippet_check_spec.rb | 14 |
3 files changed, 16 insertions, 26 deletions
diff --git a/spec/lib/gitlab/checks/lfs_integrity_spec.rb b/spec/lib/gitlab/checks/lfs_integrity_spec.rb index 8fec702790c..4583cd72cfd 100644 --- a/spec/lib/gitlab/checks/lfs_integrity_spec.rb +++ b/spec/lib/gitlab/checks/lfs_integrity_spec.rb @@ -57,25 +57,5 @@ RSpec.describe Gitlab::Checks::LfsIntegrity do expect(subject.objects_missing?).to be_falsey end end - - context 'for forked project', :sidekiq_might_not_need_inline do - let(:parent_project) { create(:project, :repository) } - let(:project) { fork_project(parent_project, nil, repository: true) } - - before do - allow(project).to receive(:lfs_enabled?).and_return(true) - end - - it 'is true parent project is missing LFS objects' do - expect(subject.objects_missing?).to be_truthy - end - - it 'is false parent project already contains LFS objects for the fork' do - lfs_object = create(:lfs_object, oid: blob_object.lfs_oid) - create(:lfs_objects_project, project: parent_project, lfs_object: lfs_object) - - expect(subject.objects_missing?).to be_falsey - end - end end end diff --git a/spec/lib/gitlab/checks/project_moved_spec.rb b/spec/lib/gitlab/checks/project_moved_spec.rb index e15fa90443b..c7dad0a91d4 100644 --- a/spec/lib/gitlab/checks/project_moved_spec.rb +++ b/spec/lib/gitlab/checks/project_moved_spec.rb @@ -57,12 +57,12 @@ RSpec.describe Gitlab::Checks::ProjectMoved, :clean_gitlab_redis_shared_state do shared_examples 'returns redirect message' do it do message = <<~MSG - Project '#{redirect_path}' was moved to '#{project.full_path}'. + Project '#{redirect_path}' was moved to '#{project.full_path}'. - Please update your Git remote: + Please update your Git remote: - git remote set-url origin #{url_to_repo} - MSG + git remote set-url origin #{url_to_repo} + MSG expect(subject.message).to eq(message) end diff --git a/spec/lib/gitlab/checks/snippet_check_spec.rb b/spec/lib/gitlab/checks/snippet_check_spec.rb index 2c027486bc9..037de8e9369 100644 --- a/spec/lib/gitlab/checks/snippet_check_spec.rb +++ b/spec/lib/gitlab/checks/snippet_check_spec.rb @@ -5,10 +5,12 @@ require 'spec_helper' RSpec.describe Gitlab::Checks::SnippetCheck do include_context 'change access checks context' - let(:snippet) { create(:personal_snippet, :repository) } + let_it_be(:snippet) { create(:personal_snippet, :repository) } + let(:user_access) { Gitlab::UserAccessSnippet.new(user, snippet: snippet) } + let(:default_branch) { snippet.default_branch } - subject { Gitlab::Checks::SnippetCheck.new(changes, logger: logger) } + subject { Gitlab::Checks::SnippetCheck.new(changes, default_branch: default_branch, logger: logger) } describe '#validate!' do it 'does not raise any error' do @@ -39,5 +41,13 @@ RSpec.describe Gitlab::Checks::SnippetCheck do end end end + + context 'when default_branch is nil' do + let(:default_branch) { nil } + + it 'raises an error' do + expect { subject.validate! }.to raise_error(Gitlab::GitAccess::ForbiddenError, 'You can not create or delete branches.') + end + end end end |