Add latest changes from gitlab-org/gitlab@master

4 files changed, 29 insertions, 20 deletions

diff --git a/spec/services/notes/create_service_spec.rb b/spec/services/notes/create_service_spec.rb
index 22606cc2461..17ef8a85c2b 100644
--- a/spec/services/notes/create_service_spec.rb
+++ b/spec/services/notes/create_service_spec.rb
@@ -116,6 +116,35 @@ RSpec.describe Notes::CreateService do
         end
       end
 
+      context 'in a commit', :snowplow do
+        let_it_be(:commit) { create(:commit, project: project) }
+        let(:opts) { { note: 'Awesome comment', noteable_type: 'Commit', commit_id: commit.id } }
+
+        let(:counter) { Gitlab::UsageDataCounters::NoteCounter }
+
+        let(:execute_create_service) { described_class.new(project, user, opts).execute }
+
+        before do
+          stub_feature_flags(notes_create_service_tracking: false)
+        end
+
+        it 'tracks commit comment usage data', :clean_gitlab_redis_shared_state do
+          expect(counter).to receive(:count).with(:create, 'Commit').and_call_original
+
+          expect do
+            execute_create_service
+          end.to change { counter.read(:create, 'Commit') }.by(1)
+        end
+
+        it_behaves_like 'Snowplow event tracking with Redis context' do
+          let(:category) { described_class.name }
+          let(:action) { 'create_commit_comment' }
+          let(:label) { 'counts.commit_comment' }
+          let(:namespace) { project.namespace }
+          let(:feature_flag_name) { :route_hll_to_snowplow_phase4 }
+        end
+      end
+
       describe 'event tracking', :snowplow do
         let(:event) { Gitlab::UsageDataCounters::IssueActivityUniqueCounter::ISSUE_COMMENT_ADDED }
         let(:execute_create_service) { described_class.new(project, user, opts).execute }
diff --git a/spec/services/packages/debian/create_package_file_service_spec.rb b/spec/services/packages/debian/create_package_file_service_spec.rb
index 291f6df991c..7f84e749279 100644
--- a/spec/services/packages/debian/create_package_file_service_spec.rb
+++ b/spec/services/packages/debian/create_package_file_service_spec.rb
@@ -137,13 +137,5 @@ RSpec.describe Packages::Debian::CreatePackageFileService do
         expect { package_file }.to raise_error(ActiveRecord::RecordInvalid)
       end
     end
-
-    context 'when FIPS mode enabled', :fips_mode do
-      let(:file) { nil }
-
-      it 'raises an error' do
-        expect { package_file }.to raise_error(::Packages::FIPS::DisabledError)
-      end
-    end
   end
 end
diff --git a/spec/services/packages/debian/extract_changes_metadata_service_spec.rb b/spec/services/packages/debian/extract_changes_metadata_service_spec.rb
index 4765e6c3bd4..ced846866c2 100644
--- a/spec/services/packages/debian/extract_changes_metadata_service_spec.rb
+++ b/spec/services/packages/debian/extract_changes_metadata_service_spec.rb
@@ -13,12 +13,6 @@ RSpec.describe Packages::Debian::ExtractChangesMetadataService do
 
     subject { service.execute }
 
-    context 'with FIPS mode enabled', :fips_mode do
-      it 'raises an error' do
-        expect { subject }.to raise_error(::Packages::FIPS::DisabledError)
-      end
-    end
-
     context 'with valid package file' do
       it 'extract metadata', :aggregate_failures do
         expected_fields = { 'Architecture' => 'source amd64', 'Binary' => 'libsample0 sample-dev sample-udeb' }
diff --git a/spec/services/packages/debian/generate_distribution_service_spec.rb b/spec/services/packages/debian/generate_distribution_service_spec.rb
index fe5fbfbbe1f..53805d03655 100644
--- a/spec/services/packages/debian/generate_distribution_service_spec.rb
+++ b/spec/services/packages/debian/generate_distribution_service_spec.rb
@@ -15,12 +15,6 @@ RSpec.describe Packages::Debian::GenerateDistributionService do
       context "for #{container_type}" do
         include_context 'with Debian distribution', container_type
 
-        context 'with FIPS mode enabled', :fips_mode do
-          it 'raises an error' do
-            expect { subject }.to raise_error(::Packages::FIPS::DisabledError)
-          end
-        end
-
         it_behaves_like 'Generate Debian Distribution and component files'
       end
     end