Merge branch '207895-dismissed-findings-should-turn-in-to-dismissed-vulnerabilities' into 'master'

Match Vulnerability state to Vulnerabilites::Occurrence state

See merge request gitlab-org/gitlab!29049

ee/app/services/vulnerabilities/create_service.rb

@@ -35,7 +35,7 @@ module Vulnerabilities
         author: @author,
         project: @project,
         title: finding.name,
-        state: Vulnerability.states[:detected],
+        state: finding.state,
         severity: finding.severity,
         severity_overridden: false,
         confidence: finding.confidence,

ee/spec/services/vulnerabilities/create_service_spec.rb

@@ -26,7 +26,7 @@ describe Vulnerabilities::CreateService do
         have_attributes(
           author: user,
           title: finding.name,
-          state: 'detected',
+          state: finding.state,
           severity: finding.severity,
           severity_overridden: false,
           confidence: finding.confidence,
@@ -35,6 +35,16 @@ describe Vulnerabilities::CreateService do
         ))
     end
 
+    context 'and finding is dismissed' do
+      let(:finding) { create(:vulnerabilities_occurrence, :dismissed, project: project) }
+
+      it 'creates a vulnerability in a dismissed state' do
+        expect { subject }.to change { project.vulnerabilities.count }.by(1)
+
+        expect(project.vulnerabilities.last.state).to eq('dismissed')
+      end
+    end
+
     it 'starts a new transaction for the create sequence' do
       allow(Vulnerabilities::Occurrence).to receive(:transaction).and_call_original