Add latest changes from gitlab-org/gitlab@master

2 files changed, 60 insertions, 10 deletions

diff --git a/spec/services/groups/import_export/export_service_spec.rb b/spec/services/groups/import_export/export_service_spec.rb
index 0d7fa98e16b..e026d2166d6 100644
--- a/spec/services/groups/import_export/export_service_spec.rb
+++ b/spec/services/groups/import_export/export_service_spec.rb
@@ -3,6 +3,37 @@
 require 'spec_helper'
 
 describe Groups::ImportExport::ExportService do
+  describe '#async_execute' do
+    let(:user) { create(:user) }
+    let(:group) { create(:group) }
+
+    context 'when the job can be successfully scheduled' do
+      let(:export_service) { described_class.new(group: group, user: user) }
+
+      it 'enqueues an export job' do
+        expect(GroupExportWorker).to receive(:perform_async).with(user.id, group.id, {})
+
+        export_service.async_execute
+      end
+
+      it 'returns truthy' do
+        expect(export_service.async_execute).to be_present
+      end
+    end
+
+    context 'when the job cannot be scheduled' do
+      let(:export_service) { described_class.new(group: group, user: user) }
+
+      before do
+        allow(GroupExportWorker).to receive(:perform_async).and_return(nil)
+      end
+
+      it 'returns falsey' do
+        expect(export_service.async_execute).to be_falsey
+      end
+    end
+  end
+
   describe '#execute' do
     let!(:user) { create(:user) }
     let(:group) { create(:group) }
@@ -103,5 +134,23 @@ describe Groups::ImportExport::ExportService do
         end
       end
     end
+
+    context 'when there is an existing export file' do
+      subject(:export_service) { described_class.new(group: group, user: user) }
+
+      let(:import_export_upload) do
+        create(
+          :import_export_upload,
+          group: group,
+          export_file: fixture_file_upload('spec/fixtures/group_export.tar.gz')
+        )
+      end
+
+      it 'removes it' do
+        existing_file = import_export_upload.export_file
+
+        expect { export_service.execute }.to change { existing_file.file }.to(be_nil)
+      end
+    end
   end
 end
diff --git a/spec/services/jira_import/start_import_service_spec.rb b/spec/services/jira_import/start_import_service_spec.rb
index 038c53b2b22..8d9ba5ac692 100644
--- a/spec/services/jira_import/start_import_service_spec.rb
+++ b/spec/services/jira_import/start_import_service_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe JiraImport::StartImportService do
   let_it_be(:user) { create(:user) }
-  let(:project) { create(:project) }
+  let_it_be(:project, reload: true) { create(:project) }
 
   subject { described_class.new(user, project, '').execute }
 
@@ -46,10 +46,12 @@ describe JiraImport::StartImportService do
         end
 
         context 'when correct data provided' do
-          subject { described_class.new(user, project, 'some-key').execute }
+          let(:fake_key)  { 'some-key' }
+
+          subject { described_class.new(user, project, fake_key).execute }
 
           context 'when import is already running' do
-            let!(:import_state) { create(:import_state, project: project, status: :started) }
+            let_it_be(:jira_import_state) { create(:jira_import_state, :started, project: project) }
 
             it_behaves_like 'responds with error', 'Jira import is already running.'
           end
@@ -62,17 +64,16 @@ describe JiraImport::StartImportService do
           it 'schedules jira import' do
             subject
 
-            expect(project.import_state.status).to eq('scheduled')
+            expect(project.latest_jira_import).to be_scheduled
           end
 
           it 'creates jira import data' do
-            subject
+            jira_import = subject.payload[:import_data]
 
-            jira_import_data = project.import_data.becomes(JiraImportData)
-            expect(jira_import_data.force_import?).to be true
-            imported_project_data = jira_import_data.projects.last
-            expect(imported_project_data.key).to eq('some-key')
-            expect(imported_project_data.scheduled_by['user_id']).to eq(user.id)
+            expect(jira_import.jira_project_xid).to eq(0)
+            expect(jira_import.jira_project_name).to eq(fake_key)
+            expect(jira_import.jira_project_key).to eq(fake_key)
+            expect(jira_import.user).to eq(user)
           end
         end
       end