Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 4 deletions

diff --git a/doc/development/fips_compliance.md b/doc/development/fips_compliance.md
index 187a9b0cc93..147ff5fa6e9 100644
--- a/doc/development/fips_compliance.md
+++ b/doc/development/fips_compliance.md
@@ -22,7 +22,7 @@ mean FIPS 140-2.
 
 ## Current status
 
-GitLab is actively working towards FIPS compliance. Progress on this initiative can be tracked with this [FIPS compliance Epic](https://gitlab.com/groups/gitlab-org/-/epics/6452).
+GitLab has completed FIPS 140-2 Compliance for the build specified in this documentation. You can find our FIPS 140-2 Attestation in our [customer assurance package](https://about.gitlab.com/security/cap/), specifically the community package.
 
 ## FIPS compliance at GitLab
 
diff --git a/spec/features/projects/terraform_spec.rb b/spec/features/projects/terraform_spec.rb
index bbc7f675c55..5e2f65165c2 100644
--- a/spec/features/projects/terraform_spec.rb
+++ b/spec/features/projects/terraform_spec.rb
@@ -56,9 +56,9 @@ RSpec.describe 'Terraform', :js, feature_category: :projects do
       end
 
       context 'when clicking on the delete button' do
-        let(:additional_state) { create(:terraform_state, project: project) }
+        let!(:additional_state) { create(:terraform_state, project: project) }
 
-        it 'removes the state', :aggregate_failures, quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/333640' do
+        it 'removes the state', :aggregate_failures do
           visit project_terraform_index_path(project)
 
           expect(page).to have_content(additional_state.name)
@@ -69,7 +69,12 @@ RSpec.describe 'Terraform', :js, feature_category: :projects do
           click_button 'Remove'
 
           expect(page).to have_content("#{additional_state.name} successfully removed")
-          expect { additional_state.reload }.to raise_error ActiveRecord::RecordNotFound
+
+          find("[data-testid='remove-icon']").hover
+          expect(page).to have_content("Deletion in progress")
+
+          additional_state.reload
+          expect(additional_state.deleted_at).not_to be_nil
         end
       end