3 files changed, 50 insertions, 4 deletions

diff --git a/spec/services/packages/create_dependency_service_spec.rb b/spec/services/packages/create_dependency_service_spec.rb
index 261c6b395d5..55414ea68fe 100644
--- a/spec/services/packages/create_dependency_service_spec.rb
+++ b/spec/services/packages/create_dependency_service_spec.rb
@@ -58,9 +58,9 @@ RSpec.describe Packages::CreateDependencyService do
         let_it_be(:rows) { [{ name: 'express', version_pattern: '^4.16.4' }] }
 
         it 'creates dependences and links' do
-          original_bulk_insert = ::Gitlab::Database.main.method(:bulk_insert)
-          expect(::Gitlab::Database.main)
-            .to receive(:bulk_insert) do |table, rows, return_ids: false, disable_quote: [], on_conflict: nil|
+          original_bulk_insert = ::ApplicationRecord.method(:legacy_bulk_insert)
+          expect(::ApplicationRecord)
+            .to receive(:legacy_bulk_insert) do |table, rows, return_ids: false, disable_quote: [], on_conflict: nil|
               call_count = table == Packages::Dependency.table_name ? 2 : 1
               call_count.times { original_bulk_insert.call(table, rows, return_ids: return_ids, disable_quote: disable_quote, on_conflict: on_conflict) }
             end.twice
diff --git a/spec/services/packages/npm/create_package_service_spec.rb b/spec/services/packages/npm/create_package_service_spec.rb
index ba5729eaf59..b1beb2adb3b 100644
--- a/spec/services/packages/npm/create_package_service_spec.rb
+++ b/spec/services/packages/npm/create_package_service_spec.rb
@@ -16,6 +16,7 @@ RSpec.describe Packages::Npm::CreatePackageService do
 
   let(:override) { {} }
   let(:package_name) { "@#{namespace.path}/my-app" }
+  let(:version_data) { params.dig('versions', '1.0.1') }
 
   subject { described_class.new(project, user, params).execute }
 
@@ -25,6 +26,7 @@ RSpec.describe Packages::Npm::CreatePackageService do
         .to change { Packages::Package.count }.by(1)
         .and change { Packages::Package.npm.count }.by(1)
         .and change { Packages::Tag.count }.by(1)
+        .and change { Packages::Npm::Metadatum.count }.by(1)
     end
 
     it_behaves_like 'assigns the package creator' do
@@ -40,6 +42,8 @@ RSpec.describe Packages::Npm::CreatePackageService do
       expect(package.version).to eq(version)
     end
 
+    it { expect(subject.npm_metadatum.package_json).to eq(version_data) }
+
     it { expect(subject.name).to eq(package_name) }
     it { expect(subject.version).to eq(version) }
 
@@ -54,6 +58,48 @@ RSpec.describe Packages::Npm::CreatePackageService do
         expect { subject }.to change { Packages::PackageFileBuildInfo.count }.by(1)
       end
     end
+
+    context 'with a too large metadata structure' do
+      before do
+        params[:versions][version][:test] = 'test' * 10000
+      end
+
+      it 'does not create the package' do
+        expect { subject }.to raise_error(ActiveRecord::RecordInvalid, 'Validation failed: Package json structure is too large')
+        .and not_change { Packages::Package.count }
+        .and not_change { Packages::Package.npm.count }
+        .and not_change { Packages::Tag.count }
+        .and not_change { Packages::Npm::Metadatum.count }
+      end
+    end
+
+    described_class::PACKAGE_JSON_NOT_ALLOWED_FIELDS.each do |field|
+      context "with not allowed #{field} field" do
+        before do
+          params[:versions][version][field] = 'test'
+        end
+
+        it 'is persisted without the field' do
+          expect { subject }
+            .to change { Packages::Package.count }.by(1)
+            .and change { Packages::Package.npm.count }.by(1)
+            .and change { Packages::Tag.count }.by(1)
+            .and change { Packages::Npm::Metadatum.count }.by(1)
+          expect(subject.npm_metadatum.package_json[field]).to be_blank
+        end
+      end
+    end
+
+    context 'with packages_npm_abbreviated_metadata disabled' do
+      before do
+        stub_feature_flags(packages_npm_abbreviated_metadata: false)
+      end
+
+      it 'creates a package without metadatum' do
+        expect { subject }
+          .not_to change { Packages::Npm::Metadatum.count }
+      end
+    end
   end
 
   describe '#execute' do
diff --git a/spec/services/packages/update_tags_service_spec.rb b/spec/services/packages/update_tags_service_spec.rb
index 6e67489fec9..c4256699c94 100644
--- a/spec/services/packages/update_tags_service_spec.rb
+++ b/spec/services/packages/update_tags_service_spec.rb
@@ -50,7 +50,7 @@ RSpec.describe Packages::UpdateTagsService do
 
       it 'is a no op' do
         expect(package).not_to receive(:tags)
-        expect(::Gitlab::Database.main).not_to receive(:bulk_insert)
+        expect(::ApplicationRecord).not_to receive(:legacy_bulk_insert)
 
         subject
       end