Merge branch 'master' into 48746-fix-files-uploaded-in-base64

spec/javascripts/jobs/store/mutations_spec.js

@@ -108,21 +108,33 @@ describe('Jobs Store Mutations', () => {
   });
   describe('RECEIVE_JOB_SUCCESS', () => {
-    beforeEach(() => {
-      mutations[types.RECEIVE_JOB_SUCCESS](stateCopy, { id: 1312321 });
-    });
-
     it('sets is loading to false', () => {
+      mutations[types.RECEIVE_JOB_SUCCESS](stateCopy, { id: 1312321 });
       expect(stateCopy.isLoading).toEqual(false);
     });
     it('sets hasError to false', () => {
+      mutations[types.RECEIVE_JOB_SUCCESS](stateCopy, { id: 1312321 });
       expect(stateCopy.hasError).toEqual(false);
     });
     it('sets job data', () => {
+      mutations[types.RECEIVE_JOB_SUCCESS](stateCopy, { id: 1312321 });
       expect(stateCopy.job).toEqual({ id: 1312321 });
     });
+
+    it('sets selectedStage when the selectedStage is More', () => {
+      expect(stateCopy.selectedStage).toEqual('More');
+      mutations[types.RECEIVE_JOB_SUCCESS](stateCopy, { id: 1312321, stage: 'deploy' });
+      expect(stateCopy.selectedStage).toEqual('deploy');
+    });
+
+    it('does not set selectedStage when the selectedStage is not More', () => {
+      stateCopy.selectedStage = 'notify'
+      expect(stateCopy.selectedStage).toEqual('notify');
+      mutations[types.RECEIVE_JOB_SUCCESS](stateCopy, { id: 1312321, stage: 'deploy' });
+      expect(stateCopy.selectedStage).toEqual('notify');
+    });
   });
   describe('RECEIVE_JOB_ERROR', () => {
@@ -200,9 +212,14 @@ describe('Jobs Store Mutations', () => {
   describe('REQUEST_JOBS_FOR_STAGE', () => {
     it('sets isLoadingStages to true', () => {
-      mutations[types.REQUEST_JOBS_FOR_STAGE](stateCopy);
+      mutations[types.REQUEST_JOBS_FOR_STAGE](stateCopy, { name: 'deploy' });
       expect(stateCopy.isLoadingJobs).toEqual(true);
     });
+
+    it('sets selectedStage', () => {
+      mutations[types.REQUEST_JOBS_FOR_STAGE](stateCopy, { name: 'deploy' });
+      expect(stateCopy.selectedStage).toEqual('deploy');
+    })
   });
   describe('RECEIVE_JOBS_FOR_STAGE_SUCCESS', () => {

spec/javascripts/lib/utils/common_utils_spec.js

@@ -9,6 +9,7 @@ describe('common_utils', () => {
     it('returns an anchor tag with url', () => {
       expect(commonUtils.parseUrl('/some/absolute/url').pathname).toContain('some/absolute/url');
     });
+
     it('url is escaped', () => {
       // IE11 will return a relative pathname while other browsers will return a full pathname.
       // parseUrl uses an anchor element for parsing an url. With relative urls, the anchor
@@ -42,7 +43,7 @@ describe('common_utils', () => {
     it('should remove the question mark from the search params', () => {
       const paramsArray = commonUtils.urlParamsToArray('?test=thing');
-      expect(paramsArray[0][0] !== '?').toBe(true);
+      expect(paramsArray[0][0]).not.toBe('?');
     });
   });

spec/javascripts/line_highlighter_spec.js

@@ -23,17 +23,20 @@ import LineHighlighter from '~/line_highlighter';
         __setLocationHash__: spyOn(this["class"], '__setLocationHash__').and.callFake(function() {})
       };
     });
+
     describe('behavior', function() {
       it('highlights one line given in the URL hash', function() {
         new LineHighlighter({ hash: '#L13' });
         return expect($('#LC13')).toHaveClass(this.css);
       });
+
       it('highlights one line given in the URL hash with given CSS class name', function() {
         const hiliter = new LineHighlighter({ hash: '#L13', highlightLineClass: 'hilite' });
         expect(hiliter.highlightLineClass).toBe('hilite');
         expect($('#LC13')).toHaveClass('hilite');
         expect($('#LC13')).not.toHaveClass('hll');
       });
+
       it('highlights a range of lines given in the URL hash', function() {
         var line, results;
         new LineHighlighter({ hash: '#L5-25' });
@@ -44,18 +47,21 @@ import LineHighlighter from '~/line_highlighter';
         }
         return results;
       });
+
       it('scrolls to the first highlighted line on initial load', function() {
         var spy;
         spy = spyOn($, 'scrollTo');
         new LineHighlighter({ hash: '#L5-25' });
         return expect(spy).toHaveBeenCalledWith('#L5', jasmine.anything());
       });
+
       it('discards click events', function() {
         var spy;
         spy = spyOnEvent('a[data-line-number]', 'click');
         clickLine(13);
         return expect(spy).toHaveBeenPrevented();
       });
+
       it('handles garbage input from the hash', function() {
         var func;
         func = function() {
@@ -64,6 +70,7 @@ import LineHighlighter from '~/line_highlighter';
         return expect(func).not.toThrow();
       });
     });
+
     describe('clickHandler', function() {
       it('handles clicking on a child icon element', function() {
         var spy;
@@ -72,11 +79,13 @@ import LineHighlighter from '~/line_highlighter';
         expect(spy).toHaveBeenCalledWith(13);
         return expect($('#LC13')).toHaveClass(this.css);
       });
+
       describe('without shiftKey', function() {
         it('highlights one line when clicked', function() {
           clickLine(13);
           return expect($('#LC13')).toHaveClass(this.css);
         });
+
         it('unhighlights previously highlighted lines', function() {
           clickLine(13);
           clickLine(20);
@@ -101,6 +110,7 @@ import LineHighlighter from '~/line_highlighter';
           expect(spy).toHaveBeenCalledWith(13);
           return expect(spy).toHaveBeenCalledWith(13, 20);
         });
+
         describe('without existing highlight', function() {
           it('highlights the clicked line', function() {
             clickLine(13, {
@@ -118,6 +128,7 @@ import LineHighlighter from '~/line_highlighter';
             return expect(spy).toHaveBeenCalledWith(13);
           });
         });
+
         describe('with existing single-line highlight', function() {
           it('uses existing line as last line when target is lesser', function() {
             var line, results;
@@ -155,6 +166,7 @@ import LineHighlighter from '~/line_highlighter';
               shiftKey: true
             });
           });
+
           it('uses target as first line when it is less than existing first line', function() {
             var line, results;
             clickLine(5, {
@@ -182,13 +194,16 @@ import LineHighlighter from '~/line_highlighter';
         });
       });
     });
+
     describe('hashToRange', function() {
       beforeEach(function() {
         return this.subject = this["class"].hashToRange;
       });
+
       it('extracts a single line number from the hash', function() {
         return expect(this.subject('#L5')).toEqual([5, null]);
       });
+
       it('extracts a range of line numbers from the hash', function() {
         return expect(this.subject('#L5-15')).toEqual([5, 15]);
       });
@@ -196,10 +211,12 @@ import LineHighlighter from '~/line_highlighter';
         return expect(this.subject('#foo')).toEqual([null, null]);
       });
     });
+
     describe('highlightLine', function() {
       beforeEach(function() {
         return this.subject = this["class"].highlightLine;
       });
+
       it('highlights the specified line', function() {
         this.subject(13);
         return expect($('#LC13')).toHaveClass(this.css);
@@ -213,6 +230,7 @@ import LineHighlighter from '~/line_highlighter';
       beforeEach(function() {
         return this.subject = this["class"].setHash;
       });
+
       it('sets the location hash for a single line', function() {
         this.subject(5);
         return expect(this.spies.__setLocationHash__).toHaveBeenCalledWith('#L5');

spec/javascripts/new_branch_spec.js

@@ -21,18 +21,22 @@ import NewBranchForm from '~/new_branch_form';
         });
         return this.form = new NewBranchForm($('.js-create-branch-form'), []);
       });
+
       it("can't start with a dot", function() {
         fillNameWith('.foo');
         return expectToHaveError("can't start with '.'");
       });
+
       it("can't start with a slash", function() {
         fillNameWith('/foo');
         return expectToHaveError("can't start with '/'");
       });
+
       it("can't have two consecutive dots", function() {
         fillNameWith('foo..bar');
         return expectToHaveError("can't contain '..'");
       });
+
       it("can't have spaces anywhere", function() {
         fillNameWith(' foo');
         expectToHaveError("can't contain spaces");
@@ -41,6 +45,7 @@ import NewBranchForm from '~/new_branch_form';
         fillNameWith('foo ');
         return expectToHaveError("can't contain spaces");
       });
+
       it("can't have ~ anywhere", function() {
         fillNameWith('~foo');
         expectToHaveError("can't contain '~'");
@@ -49,6 +54,7 @@ import NewBranchForm from '~/new_branch_form';
         fillNameWith('foo~');
         return expectToHaveError("can't contain '~'");
       });
+
       it("can't have tilde anwhere", function() {
         fillNameWith('~foo');
         expectToHaveError("can't contain '~'");
@@ -57,6 +63,7 @@ import NewBranchForm from '~/new_branch_form';
         fillNameWith('foo~');
         return expectToHaveError("can't contain '~'");
       });
+
       it("can't have caret anywhere", function() {
         fillNameWith('^foo');
         expectToHaveError("can't contain '^'");
@@ -65,6 +72,7 @@ import NewBranchForm from '~/new_branch_form';
         fillNameWith('foo^');
         return expectToHaveError("can't contain '^'");
       });
+
       it("can't have : anywhere", function() {
         fillNameWith(':foo');
         expectToHaveError("can't contain ':'");
@@ -73,6 +81,7 @@ import NewBranchForm from '~/new_branch_form';
         fillNameWith(':foo');
         return expectToHaveError("can't contain ':'");
       });
+
       it("can't have question mark anywhere", function() {
         fillNameWith('?foo');
         expectToHaveError("can't contain '?'");
@@ -81,6 +90,7 @@ import NewBranchForm from '~/new_branch_form';
         fillNameWith('foo?');
         return expectToHaveError("can't contain '?'");
       });
+
       it("can't have asterisk anywhere", function() {
         fillNameWith('*foo');
         expectToHaveError("can't contain '*'");
@@ -89,6 +99,7 @@ import NewBranchForm from '~/new_branch_form';
         fillNameWith('foo*');
         return expectToHaveError("can't contain '*'");
       });
+
       it("can't have open bracket anywhere", function() {
         fillNameWith('[foo');
         expectToHaveError("can't contain '['");
@@ -97,6 +108,7 @@ import NewBranchForm from '~/new_branch_form';
         fillNameWith('foo[');
         return expectToHaveError("can't contain '['");
       });
+
       it("can't have a backslash anywhere", function() {
         fillNameWith('\\foo');
         expectToHaveError("can't contain '\\'");
@@ -105,6 +117,7 @@ import NewBranchForm from '~/new_branch_form';
         fillNameWith('foo\\');
         return expectToHaveError("can't contain '\\'");
       });
+
       it("can't contain a sequence @{ anywhere", function() {
         fillNameWith('@{foo');
         expectToHaveError("can't contain '@{'");
@@ -113,48 +126,59 @@ import NewBranchForm from '~/new_branch_form';
         fillNameWith('foo@{');
         return expectToHaveError("can't contain '@{'");
       });
+
       it("can't have consecutive slashes", function() {
         fillNameWith('foo//bar');
         return expectToHaveError("can't contain consecutive slashes");
       });
+
       it("can't end with a slash", function() {
         fillNameWith('foo/');
         return expectToHaveError("can't end in '/'");
       });
+
       it("can't end with a dot", function() {
         fillNameWith('foo.');
         return expectToHaveError("can't end in '.'");
       });
+
       it("can't end with .lock", function() {
         fillNameWith('foo.lock');
         return expectToHaveError("can't end in '.lock'");
       });
+
       it("can't be the single character @", function() {
         fillNameWith('@');
         return expectToHaveError("can't be '@'");
       });
+
       it("concatenates all error messages", function() {
         fillNameWith('/foo bar?~.');
         return expectToHaveError("can't start with '/', can't contain spaces, '?', '~', can't end in '.'");
       });
+
       it("doesn't duplicate error messages", function() {
         fillNameWith('?foo?bar?zoo?');
         return expectToHaveError("can't contain '?'");
       });
+
       it("removes the error message when is a valid name", function() {
         fillNameWith('foo?bar');
         expect($('.js-branch-name-error span').length).toEqual(1);
         fillNameWith('foobar');
         return expect($('.js-branch-name-error span').length).toEqual(0);
       });
+
       it("can have dashes anywhere", function() {
         fillNameWith('-foo-bar-zoo-');
         return expect($('.js-branch-name-error span').length).toEqual(0);
       });
+
       it("can have underscores anywhere", function() {
         fillNameWith('_foo_bar_zoo_');
         return expect($('.js-branch-name-error span').length).toEqual(0);
       });
+
       it("can have numbers anywhere", function() {
         fillNameWith('1foo2bar3zoo4');
         return expect($('.js-branch-name-error span').length).toEqual(0);

spec/javascripts/notes/components/note_form_spec.js

@@ -100,6 +100,7 @@ describe('issue_note_form component', () => {
           expect(vm.handleUpdate).toHaveBeenCalled();
         });
+
         it('should save note when ctrl+enter is pressed', () => {
           spyOn(vm, 'handleUpdate').and.callThrough();
           vm.$el.querySelector('textarea').value = 'Foo';

spec/javascripts/notes_spec.js

@@ -538,7 +538,7 @@ import timeoutPromise from './helpers/set_timeout_promise_helper';
         mockNotesPost();
         $('.js-comment-button').click();
-        expect($notesContainer.find('.note.being-posted').length > 0).toEqual(true);
+        expect($notesContainer.find('.note.being-posted').length).toBeGreaterThan(0);
       });
       it('should remove placeholder note when new comment is done posting', done => {
@@ -582,7 +582,7 @@ import timeoutPromise from './helpers/set_timeout_promise_helper';
         $('.js-comment-button').click();
         setTimeout(() => {
-          expect($notesContainer.find(`#note_${note.id}`).length > 0).toEqual(true);
+          expect($notesContainer.find(`#note_${note.id}`).length).toBeGreaterThan(0);
           done();
         });
@@ -776,7 +776,7 @@ import timeoutPromise from './helpers/set_timeout_promise_helper';
         $form.find('textarea.js-note-text').val(sampleComment);
         const { formData, formContent, formAction } = this.notes.getFormData($form);
-        expect(formData.indexOf(sampleComment) > -1).toBe(true);
+        expect(formData.indexOf(sampleComment)).toBeGreaterThan(-1);
         expect(formContent).toEqual(sampleComment);
         expect(formAction).toEqual($form.attr('action'));
       });

spec/javascripts/reports/components/report_section_spec.js

@@ -86,6 +86,7 @@ describe('Report section', () => {
       });
     });
   });
+
   describe('when it is loading', () => {
     it('should render loading indicator', () => {
       vm = mountComponent(ReportSection, {

spec/javascripts/right_sidebar_spec.js

@@ -60,10 +60,12 @@ import Sidebar from '~/right_sidebar';
         $toggle.click();
         assertSidebarState('expanded');
       });
+
       it('should float over the page and when sidebar icons clicked', function() {
         $labelsIcon.click();
         return assertSidebarState('expanded');
       });
+
       it('should collapse when the icon arrow clicked while it is floating on page', function() {
         $labelsIcon.click();
         assertSidebarState('expanded');

spec/javascripts/search_autocomplete_spec.js

@@ -140,6 +140,7 @@ describe('Search autocomplete dropdown', () => {
     removeBodyAttributes();
     window.gon = {};
   });
+
   it('should show Dashboard specific dropdown menu', function() {
     var list;
     addBodyAttributes();
@@ -148,6 +149,7 @@ describe('Search autocomplete dropdown', () => {
     list = widget.wrap.find('.dropdown-menu').find('ul');
     return assertLinks(list, dashboardIssuesPath, dashboardMRsPath);
   });
+
   it('should show Group specific dropdown menu', function() {
     var list;
     addBodyAttributes('group');
@@ -156,6 +158,7 @@ describe('Search autocomplete dropdown', () => {
     list = widget.wrap.find('.dropdown-menu').find('ul');
     return assertLinks(list, groupIssuesPath, groupMRsPath);
   });
+
   it('should show Project specific dropdown menu', function() {
     var list;
     addBodyAttributes('project');
@@ -164,6 +167,7 @@ describe('Search autocomplete dropdown', () => {
     list = widget.wrap.find('.dropdown-menu').find('ul');
     return assertLinks(list, projectIssuesPath, projectMRsPath);
   });
+
   it('should show only Project mergeRequest dropdown menu items when project issues are disabled', function() {
     addBodyAttributes('project');
     disableProjectIssues();
@@ -172,6 +176,7 @@ describe('Search autocomplete dropdown', () => {
     const list = widget.wrap.find('.dropdown-menu').find('ul');
     assertLinks(list, null, projectMRsPath);
   });
+
   it('should not show category related menu if there is text in the input', function() {
     var link, list;
     addBodyAttributes('project');
@@ -182,6 +187,7 @@ describe('Search autocomplete dropdown', () => {
     link = "a[href='" + projectIssuesPath + '/?assignee_id=' + userId + "']";
     return expect(list.find(link).length).toBe(0);
   });
+
   it('should not submit the search form when selecting an autocomplete row with the keyboard', function() {
     var ENTER = 13;
     var DOWN = 40;

spec/javascripts/syntax_highlight_spec.js

@@ -25,6 +25,7 @@ describe('Syntax Highlighter', function() {
     beforeEach(function() {
       return setFixtures("<div class=\"parent\">\n  <div class=\"js-syntax-highlight\"></div>\n  <div class=\"foo\"></div>\n  <div class=\"js-syntax-highlight\"></div>\n</div>");
     });
+
     it('applies highlighting to all applicable children', function() {
       stubUserColorScheme('monokai');
       syntaxHighlight($('.parent'));

spec/javascripts/vue_mr_widget/components/mr_widget_memory_usage_spec.js

@@ -137,7 +137,7 @@ describe('MemoryUsage', () => {
         } = vm;
         expect(hasMetrics).toBeTruthy();
-        expect(memoryMetrics.length > 0).toBeTruthy();
+        expect(memoryMetrics.length).toBeGreaterThan(0);
         expect(deploymentTime).toEqual(deployment_time);
         expect(memoryFrom).toEqual('9.13');
         expect(memoryTo).toEqual('4.28');

spec/javascripts/vue_mr_widget/components/states/mr_widget_merged_spec.js

@@ -157,6 +157,16 @@ describe('MRWidgetMerged', () => {
     expect(selectors.copyMergeShaButton.getAttribute('data-clipboard-text')).toBe(vm.mr.mergeCommitSha);
   });
+  it('hides button to copy commit SHA if SHA does not exist', (done) => {
+    vm.mr.mergeCommitSha = null;
+
+    Vue.nextTick(() => {
+      expect(selectors.copyMergeShaButton).not.toExist();
+      expect(vm.$el.querySelector('.mr-info-list').innerText).not.toContain('with');
+      done();
+    });
+  });
+
   it('shows merge commit SHA link', () => {
     expect(selectors.mergeCommitShaLink).toExist();
     expect(selectors.mergeCommitShaLink.text).toContain(vm.mr.shortMergeCommitSha);

spec/javascripts/vue_shared/components/memory_graph_spec.js

@@ -52,8 +52,8 @@ describe('MemoryGraph', () => {
       it('should show human readable median value based on provided median timestamp', () => {
         vm.deploymentTime = mockMedian;
         const formattedMedian = vm.getFormattedMedian;
-        expect(formattedMedian.indexOf('Deployed') > -1).toBeTruthy();
-        expect(formattedMedian.indexOf('ago') > -1).toBeTruthy();
+        expect(formattedMedian.indexOf('Deployed')).toBeGreaterThan(-1);
+        expect(formattedMedian.indexOf('ago')).toBeGreaterThan(-1);
       });
     });
   });

spec/lib/gitlab/ci/status/pipeline/factory_spec.rb

@@ -11,7 +11,7 @@ describe Gitlab::Ci::Status::Pipeline::Factory do
   end
   context 'when pipeline has a core status' do
-    HasStatus::AVAILABLE_STATUSES.each do |simple_status|
+    (HasStatus::AVAILABLE_STATUSES - HasStatus::BLOCKED_STATUS).each do |simple_status|
       context "when core status is #{simple_status}" do
         let(:pipeline) { create(:ci_pipeline, status: simple_status) }
@@ -23,24 +23,12 @@ describe Gitlab::Ci::Status::Pipeline::Factory do
           expect(factory.core_status).to be_a expected_status
         end
-        if simple_status == 'manual'
-          it 'matches a correct extended statuses' do
-            expect(factory.extended_statuses)
-              .to eq [Gitlab::Ci::Status::Pipeline::Blocked]
-          end
-        elsif simple_status == 'scheduled'
-          it 'matches a correct extended statuses' do
-            expect(factory.extended_statuses)
-              .to eq [Gitlab::Ci::Status::Pipeline::Scheduled]
-          end
-        else
-          it 'does not match extended statuses' do
-            expect(factory.extended_statuses).to be_empty
-          end
-
-          it "fabricates a core status #{simple_status}" do
-            expect(status).to be_a expected_status
-          end
+        it 'does not match extended statuses' do
+          expect(factory.extended_statuses).to be_empty
+        end
+
+        it "fabricates a core status #{simple_status}" do
+          expect(status).to be_a expected_status
         end
         it 'extends core status with common pipeline methods' do
@@ -51,6 +39,48 @@ describe Gitlab::Ci::Status::Pipeline::Factory do
         end
       end
     end
+
+    context "when core status is manual" do
+      let(:pipeline) { create(:ci_pipeline, status: :manual) }
+
+      it "matches manual core status" do
+        expect(factory.core_status)
+          .to be_a Gitlab::Ci::Status::Manual
+      end
+
+      it 'matches a correct extended statuses' do
+        expect(factory.extended_statuses)
+          .to eq [Gitlab::Ci::Status::Pipeline::Blocked]
+      end
+
+      it 'extends core status with common pipeline methods' do
+        expect(status).to have_details
+        expect(status).not_to have_action
+        expect(status.details_path)
+          .to include "pipelines/#{pipeline.id}"
+      end
+    end
+
+    context "when core status is scheduled" do
+      let(:pipeline) { create(:ci_pipeline, status: :scheduled) }
+
+      it "matches scheduled core status" do
+        expect(factory.core_status)
+          .to be_a Gitlab::Ci::Status::Scheduled
+      end
+
+      it 'matches a correct extended statuses' do
+        expect(factory.extended_statuses)
+          .to eq [Gitlab::Ci::Status::Pipeline::Scheduled]
+      end
+
+      it 'extends core status with common pipeline methods' do
+        expect(status).to have_details
+        expect(status).not_to have_action
+        expect(status.details_path)
+          .to include "pipelines/#{pipeline.id}"
+      end
+    end
   end
   context 'when pipeline has warnings' do

spec/lib/gitlab/gon_helper_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::GonHelper do
+  let(:helper) do
+    Class.new do
+      include Gitlab::GonHelper
+    end.new
+  end
+
+  describe '#push_frontend_feature_flag' do
+    it 'pushes a feature flag to the frontend' do
+      gon = instance_double('gon')
+
+      allow(helper)
+        .to receive(:gon)
+        .and_return(gon)
+
+      expect(Feature)
+        .to receive(:enabled?)
+        .with(:my_feature_flag, 10)
+        .and_return(true)
+
+      expect(gon)
+        .to receive(:push)
+        .with({ features: { 'myFeatureFlag' => true } }, true)
+
+      helper.push_frontend_feature_flag(:my_feature_flag, 10)
+    end
+  end
+end

spec/models/deployment_spec.rb

@@ -39,6 +39,29 @@ describe Deployment do
     end
   end
+  describe 'scopes' do
+    describe 'last_for_environment' do
+      let(:production) { create(:environment) }
+      let(:staging) { create(:environment) }
+      let(:testing) { create(:environment) }
+
+      let!(:deployments) do
+        [
+          create(:deployment, environment: production),
+          create(:deployment, environment: staging),
+          create(:deployment, environment: production)
+        ]
+      end
+
+      it 'retrieves last deployments for environments' do
+        last_deployments = described_class.last_for_environment([staging, production, testing])
+
+        expect(last_deployments.size).to eq(2)
+        expect(last_deployments).to eq(deployments.last(2))
+      end
+    end
+  end
+
   describe '#includes_commit?' do
     let(:project) { create(:project, :repository) }
     let(:environment) { create(:environment, project: project) }

spec/services/projects/destroy_service_spec.rb

@@ -65,10 +65,12 @@ describe Projects::DestroyService do
   context 'Sidekiq inline' do
     before do
-      # Run sidekiq immediatly to check that renamed repository will be removed
+      # Run sidekiq immediately to check that renamed repository will be removed
       perform_enqueued_jobs { destroy_project(project, user, {}) }
     end
+    it_behaves_like 'deleting the project'
+
     context 'when has remote mirrors' do
       let!(:project) do
         create(:project, :repository, namespace: user.namespace).tap do |project|
@@ -82,13 +84,28 @@ describe Projects::DestroyService do
       end
     end
-    it_behaves_like 'deleting the project'
-
     it 'invalidates personal_project_count cache' do
       expect(user).to receive(:invalidate_personal_projects_count)
       destroy_project(project, user)
     end
+
+    context 'when project has exports' do
+      let!(:project_with_export) do
+        create(:project, :repository, namespace: user.namespace).tap do |project|
+          create(:import_export_upload,
+                 project: project,
+                 export_file: fixture_file_upload('spec/fixtures/project_export.tar.gz'))
+        end
+      end
+      let!(:async) { true }
+
+      it 'destroys project and export' do
+        expect { destroy_project(project_with_export, user) }.to change(ImportExportUpload, :count).by(-1)
+
+        expect(Project.all).not_to include(project_with_export)
+      end
+    end
   end
   context 'Sidekiq fake' do

yarn.lock

@@ -616,10 +616,10 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
-"@gitlab-org/gitlab-svgs@^1.23.0", "@gitlab-org/gitlab-svgs@^1.29.0":
-  version "1.31.0"
-  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.31.0.tgz#495b074669f93af40e34f9978ce887773dea470a"
-  integrity sha512-tJbf99XX/ddFkXCXxQr9a0GJD9rPVoW3qMbU14dkxwG4WBmPEoVg+e7sLvm9OWTD1uUqiVW3qWKp++SGhhcRlw==
+"@gitlab-org/gitlab-svgs@^1.23.0", "@gitlab-org/gitlab-svgs@^1.32.0":
+  version "1.32.0"
+  resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.32.0.tgz#a65ab7724fa7d55be8e5cc9b2dbe3f0757432fd3"
+  integrity sha512-L3o8dFUd2nSkVZBwh2hCJWzNzADJ3dTBZxamND8NLosZK9/ohNhccmsQOZGyMCUHaOzm4vifaaXkAXh04UtMKA==
 "@gitlab-org/gitlab-ui@^1.8.0":
   version "1.8.0"