Commit 496d92a2 authored by Stan Hu's avatar Stan Hu

Merge branch '6929-geo-uninitialized-constant-gitlab-geo-importexportdownloader' into 'master'

Resolve "Geo: Uninitialized constant Gitlab::Geo::ImportExportDownloader"

Closes #6929

See merge request gitlab-org/gitlab-ee!6567
parents 4cbec69e 14fd263d
......@@ -5,7 +5,7 @@ module Geo
attr_reader :object_type, :object_db_id
DEFAULT_OBJECT_TYPES = %w[attachment avatar file namespace_file personal_file].freeze
DEFAULT_OBJECT_TYPES = %w[attachment avatar file import_export namespace_file personal_file].freeze
DEFAULT_SERVICE_TYPE = 'file'.freeze
def initialize(object_type, object_db_id)
......
---
title: Fix geo download service ImportExportDownloader unitialized constant
merge_request: 6567
author:
type: fixed
......@@ -10,6 +10,7 @@ FactoryBot.define do
trait(:lfs) { file_type :lfs }
trait(:namespace_file) { file_type :namespace_file }
trait(:personal_file) { file_type :personal_file }
trait(:import_export) { file_type :import_export }
trait :with_file do
after(:build, :stub) do |registry, _|
......
......@@ -309,6 +309,12 @@ describe Geo::FileDownloadService do
end
end
context 'Import/Export' do
it_behaves_like "a service that downloads the file and registers the sync result", 'import_export' do
let(:file) { create(:upload, model: build(:import_export_upload)) }
end
end
context 'bad object type' do
it 'raises an error' do
expect { described_class.new(:bad, 1).execute }.to raise_error(NameError)
......
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