diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-06 18:08:08 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-06 18:08:08 +0000 |
commit | 83731155d997ae24c7e0cd5ffa6f0dba41bec6dc (patch) | |
tree | 31f785012137fda4ac9a470f4f07c961b42d0299 /spec | |
parent | 57a37ce99f297cddae12cb4d982b6d572f932bb4 (diff) | |
download | gitlab-ce-83731155d997ae24c7e0cd5ffa6f0dba41bec6dc.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
14 files changed, 287 insertions, 181 deletions
diff --git a/spec/factories/snippets.rb b/spec/factories/snippets.rb index 2cdb8019696..8ab5c7f1fa5 100644 --- a/spec/factories/snippets.rb +++ b/spec/factories/snippets.rb @@ -34,7 +34,7 @@ FactoryBot.define do trait :empty_repo do after(:create) do |snippet| - raise "Failed to create repository!" unless snippet.repository.create_if_not_exists + raise "Failed to create repository!" unless snippet.create_repository end end end diff --git a/spec/lib/gitlab/background_migration/user_mentions/create_resource_user_mention_spec.rb b/spec/lib/gitlab/background_migration/user_mentions/create_resource_user_mention_spec.rb deleted file mode 100644 index 9c085b3cef8..00000000000 --- a/spec/lib/gitlab/background_migration/user_mentions/create_resource_user_mention_spec.rb +++ /dev/null @@ -1,77 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' -require './db/post_migrate/20200127131953_migrate_snippet_mentions_to_db' -require './db/post_migrate/20200127151953_migrate_snippet_notes_mentions_to_db' - -describe Gitlab::BackgroundMigration::UserMentions::CreateResourceUserMention, schema: 20200127151953 do - include MigrationsHelpers - - context 'when migrating data' do - let(:users) { table(:users) } - let(:namespaces) { table(:namespaces) } - let(:projects) { table(:projects) } - let(:notes) { table(:notes) } - - let(:author) { users.create!(email: 'author@example.com', notification_email: 'author@example.com', name: 'author', username: 'author', projects_limit: 10, state: 'active') } - let(:member) { users.create!(email: 'member@example.com', notification_email: 'member@example.com', name: 'member', username: 'member', projects_limit: 10, state: 'active') } - let(:admin) { users.create!(email: 'administrator@example.com', notification_email: 'administrator@example.com', name: 'administrator', username: 'administrator', admin: 1, projects_limit: 10, state: 'active') } - let(:john_doe) { users.create!(email: 'john_doe@example.com', notification_email: 'john_doe@example.com', name: 'john_doe', username: 'john_doe', projects_limit: 10, state: 'active') } - let(:skipped) { users.create!(email: 'skipped@example.com', notification_email: 'skipped@example.com', name: 'skipped', username: 'skipped', projects_limit: 10, state: 'active') } - - let(:mentioned_users) { [author, member, admin, john_doe, skipped] } - let(:mentioned_users_refs) { mentioned_users.map { |u| "@#{u.username}" }.join(' ') } - - let(:group) { namespaces.create!(name: 'test1', path: 'test1', runners_token: 'my-token1', project_creation_level: 1, visibility_level: 20, type: 'Group') } - let(:inaccessible_group) { namespaces.create!(name: 'test2', path: 'test2', runners_token: 'my-token2', project_creation_level: 1, visibility_level: 0, type: 'Group') } - let(:project) { projects.create!(name: 'gitlab1', path: 'gitlab1', namespace_id: group.id, visibility_level: 0) } - - let(:mentioned_groups) { [group, inaccessible_group] } - let(:group_mentions) { [group, inaccessible_group].map { |gr| "@#{gr.path}" }.join(' ') } - let(:description_mentions) { "description with mentions #{mentioned_users_refs} and #{group_mentions}" } - - before do - # build personal namespaces and routes for users - mentioned_users.each { |u| u.becomes(User).save! } - - # build namespaces and routes for groups - mentioned_groups.each do |gr| - gr.name += '-org' - gr.path += '-org' - gr.becomes(Namespace).save! - end - end - - context 'migrate snippet mentions' do - let(:snippets) { table(:snippets) } - let(:snippet_user_mentions) { table(:snippet_user_mentions) } - - let!(:snippet1) { snippets.create!(project_id: project.id, author_id: author.id, title: 'title1', description: description_mentions) } - let!(:snippet2) { snippets.create!(project_id: project.id, author_id: author.id, title: 'title2', description: 'some description') } - let!(:snippet3) { snippets.create!(project_id: project.id, author_id: author.id, title: 'title3', description: 'description with an email@example.com and some other @ char here.') } - - let(:user_mentions) { snippet_user_mentions } - let(:resource) { snippet1 } - - it_behaves_like 'resource mentions migration', MigrateSnippetMentionsToDb, Snippet - - context 'mentions in note' do - let!(:note1) { notes.create!(noteable_id: snippet1.id, noteable_type: 'Snippet', project_id: project.id, author_id: author.id, note: description_mentions) } - let!(:note2) { notes.create!(noteable_id: snippet1.id, noteable_type: 'Snippet', project_id: project.id, author_id: author.id, note: 'sample note') } - let!(:note3) { notes.create!(noteable_id: snippet1.id, noteable_type: 'Snippet', project_id: project.id, author_id: author.id, note: description_mentions, system: true) } - # this not does not have actual mentions - let!(:note4) { notes.create!(noteable_id: snippet1.id, noteable_type: 'Snippet', project_id: project.id, author_id: author.id, note: 'note3 for an email@somesite.com and some other rando @ ref' ) } - # this note points to an innexistent noteable record in snippets table - let!(:note5) { notes.create!(noteable_id: snippets.maximum(:id) + 10, noteable_type: 'Snippet', project_id: project.id, author_id: author.id, note: description_mentions) } - - it_behaves_like 'resource notes mentions migration', MigrateSnippetNotesMentionsToDb, Snippet - end - end - end - - context 'checks no_quote_columns' do - it 'has correct no_quote_columns' do - expect(Gitlab::BackgroundMigration::UserMentions::Models::Snippet.no_quote_columns).to match([:note_id, :snippet_id]) - end - end -end diff --git a/spec/lib/gitlab/import_export/import_export_spec.rb b/spec/lib/gitlab/import_export/import_export_spec.rb index 2ece0dd4b56..300ba66ee5b 100644 --- a/spec/lib/gitlab/import_export/import_export_spec.rb +++ b/spec/lib/gitlab/import_export/import_export_spec.rb @@ -21,4 +21,12 @@ describe Gitlab::ImportExport do expect(described_class.export_filename(exportable: project).length).to be < 70 end end + + describe '#snippet_repo_bundle_filename_for' do + let(:snippet) { build(:snippet, id: 1) } + + it 'generates the snippet bundle name' do + expect(described_class.snippet_repo_bundle_filename_for(snippet)).to eq "#{snippet.hexdigest}.bundle" + end + end end diff --git a/spec/lib/gitlab/import_export/importer_spec.rb b/spec/lib/gitlab/import_export/importer_spec.rb index 07857269004..e03c95525df 100644 --- a/spec/lib/gitlab/import_export/importer_spec.rb +++ b/spec/lib/gitlab/import_export/importer_spec.rb @@ -50,7 +50,8 @@ describe Gitlab::ImportExport::Importer do Gitlab::ImportExport::WikiRestorer, Gitlab::ImportExport::UploadsRestorer, Gitlab::ImportExport::LfsRestorer, - Gitlab::ImportExport::StatisticsRestorer + Gitlab::ImportExport::StatisticsRestorer, + Gitlab::ImportExport::SnippetsRepoRestorer ].each do |restorer| it "calls the #{restorer}" do fake_restorer = double(restorer.to_s) diff --git a/spec/lib/gitlab/import_export/snippet_repo_restorer_spec.rb b/spec/lib/gitlab/import_export/snippet_repo_restorer_spec.rb new file mode 100644 index 00000000000..d72d41ddf38 --- /dev/null +++ b/spec/lib/gitlab/import_export/snippet_repo_restorer_spec.rb @@ -0,0 +1,70 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe Gitlab::ImportExport::SnippetRepoRestorer do + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project, namespace: user.namespace) } + let(:snippet) { create(:project_snippet, project: project, author: user) } + + let(:shared) { project.import_export_shared } + let(:exporter) { Gitlab::ImportExport::SnippetsRepoSaver.new(project: project, shared: shared, current_user: user) } + let(:restorer) do + described_class.new(user: user, + shared: shared, + snippet: snippet, + path_to_bundle: snippet_bundle_path) + end + + after do + FileUtils.rm_rf(shared.export_path) + end + + shared_examples 'no bundle file present' do + it 'creates the repository from the database content' do + expect(snippet.repository_exists?).to be_falsey + + aggregate_failures do + expect(restorer.restore).to be_truthy + + expect(snippet.repository_exists?).to be_truthy + expect(snippet.snippet_repository).not_to be_nil + + blob = snippet.repository.blob_at('HEAD', snippet.file_name) + expect(blob).not_to be_nil + expect(blob.data).to eq(snippet.content) + end + end + end + + context 'when the snippet does not have a bundle file path' do + let(:snippet_bundle_path) { nil } + + it_behaves_like 'no bundle file present' + end + + context 'when the snippet bundle path is not present' do + let(:snippet_bundle_path) { 'foo' } + + it_behaves_like 'no bundle file present' + end + + context 'when the snippet bundle exists' do + let!(:snippet_with_repo) { create(:project_snippet, :repository, project: project) } + let(:bundle_path) { ::Gitlab::ImportExport.snippets_repo_bundle_path(shared.export_path) } + let(:snippet_bundle_path) { File.join(bundle_path, "#{snippet_with_repo.hexdigest}.bundle") } + let(:result) { exporter.save } + + it 'creates the repository from the bundle' do + expect(exporter.save).to be_truthy + + expect(snippet.repository_exists?).to be_falsey + expect(snippet.snippet_repository).to be_nil + expect(snippet.repository).to receive(:create_from_bundle).and_call_original + + expect(restorer.restore).to be_truthy + expect(snippet.repository_exists?).to be_truthy + expect(snippet.snippet_repository).not_to be_nil + end + end +end diff --git a/spec/lib/gitlab/import_export/snippet_repo_saver_spec.rb b/spec/lib/gitlab/import_export/snippet_repo_saver_spec.rb new file mode 100644 index 00000000000..7ad1ff213a1 --- /dev/null +++ b/spec/lib/gitlab/import_export/snippet_repo_saver_spec.rb @@ -0,0 +1,48 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe Gitlab::ImportExport::SnippetRepoSaver do + describe 'bundle a project Git repo' do + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project, namespace: user.namespace) } + let_it_be(:snippet) { create(:project_snippet, :repository, project: project, author: user) } + let(:shared) { project.import_export_shared } + let(:bundler) { described_class.new(project: project, shared: shared, repository: snippet.repository) } + let(:bundle_path) { ::Gitlab::ImportExport.snippets_repo_bundle_path(shared.export_path) } + + around do |example| + FileUtils.mkdir_p(bundle_path) + example.run + ensure + FileUtils.rm_rf(bundle_path) + end + + context 'with project snippet' do + it 'bundles the repo successfully' do + aggregate_failures do + expect(bundler.save).to be_truthy + expect(Dir.empty?(bundle_path)).to be_falsey + end + end + + context 'when snippet does not have a repository' do + let(:snippet) { build(:personal_snippet) } + + it 'returns true' do + expect(bundler.save).to be_truthy + end + + it 'does not create any file' do + aggregate_failures do + expect(snippet.repository).not_to receive(:bundle_to_disk) + + bundler.save + + expect(Dir.empty?(bundle_path)).to be_truthy + end + end + end + end + end +end diff --git a/spec/lib/gitlab/import_export/snippets_repo_restorer_spec.rb b/spec/lib/gitlab/import_export/snippets_repo_restorer_spec.rb new file mode 100644 index 00000000000..242f6f6b58c --- /dev/null +++ b/spec/lib/gitlab/import_export/snippets_repo_restorer_spec.rb @@ -0,0 +1,55 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe Gitlab::ImportExport::SnippetsRepoRestorer do + include GitHelpers + + describe 'bundle a snippet Git repo' do + let_it_be(:user) { create(:user) } + let_it_be(:project) { create(:project, namespace: user.namespace) } + let_it_be(:snippet_with_repo) { create(:project_snippet, :repository, project: project, author: user) } + let_it_be(:snippet_without_repo) { create(:project_snippet, project: project, author: user) } + + let(:shared) { project.import_export_shared } + let(:exporter) { Gitlab::ImportExport::SnippetsRepoSaver.new(current_user: user, project: project, shared: shared) } + let(:bundle_dir) { ::Gitlab::ImportExport.snippets_repo_bundle_path(shared.export_path) } + let(:restorer) do + described_class.new(user: user, + shared: shared, + project: project) + end + let(:service) { instance_double(Gitlab::ImportExport::SnippetRepoRestorer) } + + before do + exporter.save + end + + after do + FileUtils.rm_rf(shared.export_path) + end + + it 'calls SnippetRepoRestorer per each snippet with the bundle path' do + allow(service).to receive(:restore).and_return(true) + + expect(Gitlab::ImportExport::SnippetRepoRestorer).to receive(:new).with(hash_including(snippet: snippet_with_repo, path_to_bundle: bundle_path(snippet_with_repo))).and_return(service) + expect(Gitlab::ImportExport::SnippetRepoRestorer).to receive(:new).with(hash_including(snippet: snippet_without_repo, path_to_bundle: bundle_path(snippet_without_repo))).and_return(service) + + expect(restorer.restore).to be_truthy + end + + context 'when one snippet cannot be saved' do + it 'returns false and do not process other snippets' do + allow(Gitlab::ImportExport::SnippetRepoRestorer).to receive(:new).with(hash_including(snippet: snippet_with_repo)).and_return(service) + allow(service).to receive(:restore).and_return(false) + + expect(Gitlab::ImportExport::SnippetRepoRestorer).not_to receive(:new).with(hash_including(snippet: snippet_without_repo)) + expect(restorer.restore).to be_falsey + end + end + + def bundle_path(snippet) + File.join(bundle_dir, ::Gitlab::ImportExport.snippet_repo_bundle_filename_for(snippet)) + end + end +end diff --git a/spec/lib/gitlab/import_export/snippets_repo_saver_spec.rb b/spec/lib/gitlab/import_export/snippets_repo_saver_spec.rb new file mode 100644 index 00000000000..5332990a975 --- /dev/null +++ b/spec/lib/gitlab/import_export/snippets_repo_saver_spec.rb @@ -0,0 +1,56 @@ +# frozen_string_literal: true + +require 'spec_helper' + +describe Gitlab::ImportExport::SnippetsRepoSaver do + describe 'bundle a project Git repo' do + let_it_be(:user) { create(:user) } + let!(:project) { create(:project) } + let(:shared) { project.import_export_shared } + let(:bundler) { described_class.new(current_user: user, project: project, shared: shared) } + + after do + FileUtils.rm_rf(shared.export_path) + end + + it 'creates the snippet bundles dir if not exists' do + snippets_dir = ::Gitlab::ImportExport.snippets_repo_bundle_path(shared.export_path) + expect(Dir.exist?(snippets_dir)).to be_falsey + + bundler.save + + expect(Dir.exist?(snippets_dir)).to be_truthy + end + + context 'when project does not have any snippet' do + it 'does not perform any action' do + expect(Gitlab::ImportExport::SnippetRepoSaver).not_to receive(:new) + + bundler.save + end + end + + context 'when project has snippets' do + let!(:snippet1) { create(:project_snippet, :repository, project: project, author: user) } + let!(:snippet2) { create(:project_snippet, project: project, author: user) } + let(:service) { instance_double(Gitlab::ImportExport::SnippetRepoSaver) } + + it 'calls the SnippetRepoSaver for each snippet' do + allow(Gitlab::ImportExport::SnippetRepoSaver).to receive(:new).and_return(service) + expect(service).to receive(:save).and_return(true).twice + + bundler.save + end + + context 'when one snippet cannot be saved' do + it 'returns false and do not process other snippets' do + allow(Gitlab::ImportExport::SnippetRepoSaver).to receive(:new).with(hash_including(repository: snippet1.repository)).and_return(service) + allow(service).to receive(:save).and_return(false) + + expect(Gitlab::ImportExport::SnippetRepoSaver).not_to receive(:new).with(hash_including(repository: snippet2.repository)) + expect(bundler.save).to be_falsey + end + end + end + end +end diff --git a/spec/migrations/cleanup_empty_snippet_user_mentions_spec.rb b/spec/migrations/cleanup_empty_snippet_user_mentions_spec.rb deleted file mode 100644 index d229f0b2b59..00000000000 --- a/spec/migrations/cleanup_empty_snippet_user_mentions_spec.rb +++ /dev/null @@ -1,42 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' -require Rails.root.join('db', 'post_migrate', '20200127111953_cleanup_empty_snippet_user_mentions') - -describe CleanupEmptySnippetUserMentions, :migration, :sidekiq do - let(:users) { table(:users) } - let(:projects) { table(:projects) } - let(:namespaces) { table(:namespaces) } - let(:snippets) { table(:snippets) } - let(:snippet_user_mentions) { table(:snippet_user_mentions) } - let(:notes) { table(:notes) } - - let(:user) { users.create!(name: 'root', email: 'root@example.com', username: 'root', projects_limit: 0) } - let(:group) { namespaces.create!(name: 'group1', path: 'group1', owner_id: user.id) } - let(:project) { projects.create!(name: 'gitlab1', path: 'gitlab1', namespace_id: group.id, visibility_level: 0) } - let(:snippet) { snippets.create!(title: "title1", title_html: 'title1', description: 'snippet description with @root mention', project_id: project.id, author_id: user.id) } - - let!(:resource1) { notes.create!(note: 'note for @root to check', noteable_id: snippet.id, noteable_type: 'Snippet') } - let!(:resource2) { notes.create!(note: 'note for @root to check', noteable_id: snippet.id, noteable_type: 'Snippet', system: true) } - let!(:resource3) { notes.create!(note: 'note for @root to check', noteable_id: snippet.id, noteable_type: 'Snippet') } - - # non-migrateable resources - # this note is already migrated, as it has a record in the snippet_user_mentions table - let!(:resource4) { notes.create!(note: 'note for @root to check', noteable_id: snippet.id, noteable_type: 'Snippet') } - let!(:user_mention) { snippet_user_mentions.create!(snippet_id: snippet.id, note_id: resource4.id, mentioned_users_ids: [1]) } - # this note points to an innexistent noteable record - let!(:resource5) { notes.create!(note: 'note for @root to check', noteable_id: snippets.maximum(:id) + 10, noteable_type: 'Snippet') } - - # these should get cleanup, by the migration - let!(:blank_snippet_user_mention1) { snippet_user_mentions.create!(snippet_id: snippet.id, note_id: resource1.id)} - let!(:blank_snippet_user_mention2) { snippet_user_mentions.create!(snippet_id: snippet.id, note_id: resource2.id)} - let!(:blank_snippet_user_mention3) { snippet_user_mentions.create!(snippet_id: snippet.id, note_id: resource3.id)} - - it 'cleanups blank user mentions' do - expect(snippet_user_mentions.count).to eq 4 - - migrate! - - expect(snippet_user_mentions.count).to eq 1 - end -end diff --git a/spec/migrations/migrate_snippet_mentions_to_db_spec.rb b/spec/migrations/migrate_snippet_mentions_to_db_spec.rb deleted file mode 100644 index 6644329fc11..00000000000 --- a/spec/migrations/migrate_snippet_mentions_to_db_spec.rb +++ /dev/null @@ -1,28 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' -require Rails.root.join('db', 'post_migrate', '20200127131953_migrate_snippet_mentions_to_db') - -describe MigrateSnippetMentionsToDb, :migration, :sidekiq do - let(:users) { table(:users) } - let(:namespaces) { table(:namespaces) } - let(:projects) { table(:projects) } - let(:snippets) { table(:snippets) } - let(:snippet_user_mentions) { table(:snippet_user_mentions) } - - let(:user) { users.create!(name: 'root', email: 'root@example.com', username: 'root', projects_limit: 0) } - let(:group) { namespaces.create!(name: 'group1', path: 'group1', owner_id: user.id) } - let(:project) { projects.create!(name: 'gitlab1', path: 'gitlab1', namespace_id: group.id, visibility_level: 0) } - let!(:resource1) { snippets.create!(title: "title1", title_html: 'title1', description: 'snippet description with @root mention', project_id: project.id, author_id: user.id) } - let!(:resource2) { snippets.create!(title: "title2", title_html: "title2", description: 'snippet description with @group mention', project_id: project.id, author_id: user.id) } - let!(:resource3) { snippets.create!(title: "title3", title_html: "title3", description: 'snippet description with @project mention', project_id: project.id, author_id: user.id) } - - # non-migrateable resources - # this snippet is already migrated, as it has a record in the snippet_user_mentions table - let!(:resource4) { snippets.create!(title: "title4", title_html: "title4", description: 'snippet description with @project mention', project_id: project.id, author_id: user.id) } - let!(:user_mention) { snippet_user_mentions.create!(snippet_id: resource4.id, mentioned_users_ids: [1]) } - # this snippet has no mentions so should be filtered out - let!(:resource5) { snippets.create!(title: "title5", title_html: "title5", description: 'snippet description with no mention', project_id: project.id, author_id: user.id) } - - it_behaves_like 'schedules resource mentions migration', Snippet, false -end diff --git a/spec/migrations/migrate_snippet_notes_mentions_to_db_spec.rb b/spec/migrations/migrate_snippet_notes_mentions_to_db_spec.rb deleted file mode 100644 index 2ebe80e6ae3..00000000000 --- a/spec/migrations/migrate_snippet_notes_mentions_to_db_spec.rb +++ /dev/null @@ -1,31 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' -require Rails.root.join('db', 'post_migrate', '20200127151953_migrate_snippet_notes_mentions_to_db') - -describe MigrateSnippetNotesMentionsToDb, :migration, :sidekiq do - let(:users) { table(:users) } - let(:projects) { table(:projects) } - let(:namespaces) { table(:namespaces) } - let(:snippets) { table(:snippets) } - let(:snippet_user_mentions) { table(:snippet_user_mentions) } - let(:notes) { table(:notes) } - - let(:user) { users.create!(name: 'root', email: 'root@example.com', username: 'root', projects_limit: 0) } - let(:group) { namespaces.create!(name: 'group1', path: 'group1', owner_id: user.id) } - let(:project) { projects.create!(name: 'gitlab1', path: 'gitlab1', namespace_id: group.id, visibility_level: 0) } - let(:snippet) { snippets.create!(title: "title1", title_html: 'title1', description: 'snippet description with @root mention', project_id: project.id, author_id: user.id) } - - let!(:resource1) { notes.create!(note: 'note for @root to check', noteable_id: snippet.id, noteable_type: 'Snippet') } - let!(:resource2) { notes.create!(note: 'note for @root to check', noteable_id: snippet.id, noteable_type: 'Snippet', system: true) } - let!(:resource3) { notes.create!(note: 'note for @root to check', noteable_id: snippet.id, noteable_type: 'Snippet') } - - # non-migrateable resources - # this note is already migrated, as it has a record in the snippet_user_mentions table - let!(:resource4) { notes.create!(note: 'note for @root to check', noteable_id: snippet.id, noteable_type: 'Snippet') } - let!(:user_mention) { snippet_user_mentions.create!(snippet_id: snippet.id, note_id: resource4.id, mentioned_users_ids: [1]) } - # this note points to an innexistent noteable record - let!(:resource5) { notes.create!(note: 'note for @root to check', noteable_id: snippets.maximum(:id) + 10, noteable_type: 'Snippet') } - - it_behaves_like 'schedules resource mentions migration', Snippet, true -end diff --git a/spec/models/snippet_repository_spec.rb b/spec/models/snippet_repository_spec.rb index 5b16b945efe..120175fdd05 100644 --- a/spec/models/snippet_repository_spec.rb +++ b/spec/models/snippet_repository_spec.rb @@ -26,6 +26,44 @@ describe SnippetRepository do end end + describe '#create_file' do + let(:snippet) { create(:personal_snippet, :empty_repo, author: user) } + + it 'creates the file' do + snippet_repository.create_file(user, 'foo', 'bar', commit_opts) + blob = first_blob(snippet) + + aggregate_failures do + expect(blob).not_to be_nil + expect(blob.path).to eq 'foo' + expect(blob.data).to eq 'bar' + end + end + + it 'fills the file path if empty' do + snippet_repository.create_file(user, nil, 'bar', commit_opts) + blob = first_blob(snippet) + + aggregate_failures do + expect(blob).not_to be_nil + expect(blob.path).to eq 'snippetfile1.txt' + expect(blob.data).to eq 'bar' + end + end + + context 'when the file exists' do + let(:snippet) { create(:personal_snippet, :repository, author: user) } + + it 'captures the git exception and raises a SnippetRepository::CommitError' do + existing_blob = first_blob(snippet) + + expect do + snippet_repository.create_file(user, existing_blob.path, existing_blob.data, commit_opts) + end.to raise_error described_class::CommitError + end + end + end + describe '#multi_files_action' do let(:new_file) { { file_path: 'new_file_test', content: 'bar' } } let(:move_file) { { previous_path: 'CHANGELOG', file_path: 'CHANGELOG_new', content: 'bar' } } diff --git a/spec/services/projects/import_export/export_service_spec.rb b/spec/services/projects/import_export/export_service_spec.rb index 4d51deaa404..e00507d1827 100644 --- a/spec/services/projects/import_export/export_service_spec.rb +++ b/spec/services/projects/import_export/export_service_spec.rb @@ -64,6 +64,14 @@ describe Projects::ImportExport::ExportService do service.execute end + it 'saves the snippets' do + expect_next_instance_of(Gitlab::ImportExport::SnippetsRepoSaver) do |instance| + expect(instance).to receive(:save).and_call_original + end + + service.execute + end + context 'when all saver services succeed' do before do allow(service).to receive(:save_services).and_return(true) diff --git a/spec/support/shared_examples/lib/gitlab/background_migration/mentions_migration_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/background_migration/mentions_migration_shared_examples.rb index f5b889ef720..8f5bfdacc3a 100644 --- a/spec/support/shared_examples/lib/gitlab/background_migration/mentions_migration_shared_examples.rb +++ b/spec/support/shared_examples/lib/gitlab/background_migration/mentions_migration_shared_examples.rb @@ -72,7 +72,7 @@ shared_examples 'schedules resource mentions migration' do |resource_class, is_f it 'schedules background migrations' do Sidekiq::Testing.fake! do Timecop.freeze do - resource_count = is_for_notes ? Note.where(noteable_type: resource_class.to_s).count : resource_class.count + resource_count = is_for_notes ? Note.count : resource_class.count expect(resource_count).to eq 5 migrate! |