Add latest changes from gitlab-org/gitlab@master

3 files changed, 11 insertions, 2 deletions

diff --git a/spec/features/groups/issues_spec.rb b/spec/features/groups/issues_spec.rb
index 39bcfd62cfb..8ecd2beba68 100644
--- a/spec/features/groups/issues_spec.rb
+++ b/spec/features/groups/issues_spec.rb
@@ -110,8 +110,6 @@ RSpec.describe 'Group issues page' do
         find('.empty-state .js-lazy-loaded')
         find('.new-project-item-link').click
 
-        find('.select2-input').set(group.name)
-
         page.within('.select2-results') do
           expect(page).to have_content(project.full_name)
           expect(page).not_to have_content(project_with_issues_disabled.full_name)
diff --git a/spec/fixtures/helm/helm_list_v2_empty_blob.json.gz b/spec/fixtures/helm/helm_list_v2_empty_blob.json.gz
new file mode 100644
index 00000000000..5647f052c3b
--- /dev/null
+++ b/spec/fixtures/helm/helm_list_v2_empty_blob.json.gz
diff --git a/spec/services/clusters/parse_cluster_applications_artifact_service_spec.rb b/spec/services/clusters/parse_cluster_applications_artifact_service_spec.rb
index 3b155d95345..e669e73ccb8 100644
--- a/spec/services/clusters/parse_cluster_applications_artifact_service_spec.rb
+++ b/spec/services/clusters/parse_cluster_applications_artifact_service_spec.rb
@@ -108,6 +108,17 @@ RSpec.describe Clusters::ParseClusterApplicationsArtifactService do
         end
       end
 
+      context 'blob is empty' do
+        let(:file) { fixture_file_upload(Rails.root.join("spec/fixtures/helm/helm_list_v2_empty_blob.json.gz")) }
+        let(:artifact) { create(:ci_job_artifact, :cluster_applications, job: job, file: file) }
+
+        it 'returns success' do
+          result = described_class.new(job, user).execute(artifact)
+
+          expect(result[:status]).to eq(:success)
+        end
+      end
+
       context 'job has deployment cluster' do
         context 'current user does not have access to deployment cluster' do
           let(:other_user) { create(:user) }