Add latest changes from gitlab-org/gitlab@master

3 files changed, 31 insertions, 6 deletions

diff --git a/spec/features/projects/jobs/user_browses_job_spec.rb b/spec/features/projects/jobs/user_browses_job_spec.rb
index 78fb72ad2df..dd57b4117f9 100644
--- a/spec/features/projects/jobs/user_browses_job_spec.rb
+++ b/spec/features/projects/jobs/user_browses_job_spec.rb
@@ -34,10 +34,6 @@ RSpec.describe 'User browses a job', :js, feature_category: :projects do
     wait_for_requests
 
     expect(page).to have_no_css('.artifacts')
-    expect(build).not_to have_trace
-    expect(build.artifacts_file.present?).to be_falsy
-    expect(build.artifacts_metadata.present?).to be_falsy
-
     expect(page).to have_content('Job has been erased')
   end
 
diff --git a/spec/frontend/boards/components/board_list_header_spec.js b/spec/frontend/boards/components/board_list_header_spec.js
index 80e77921459..9e65e900440 100644
--- a/spec/frontend/boards/components/board_list_header_spec.js
+++ b/spec/frontend/boards/components/board_list_header_spec.js
@@ -162,7 +162,7 @@ describe('Board List Header Component', () => {
 
       const icon = findCaret();
 
-      expect(icon.props('icon')).toBe('chevron-down');
+      expect(icon.props('icon')).toBe('chevron-lg-down');
     });
 
     it('should display expand icon when column is collapsed', async () => {
@@ -170,7 +170,7 @@ describe('Board List Header Component', () => {
 
       const icon = findCaret();
 
-      expect(icon.props('icon')).toBe('chevron-right');
+      expect(icon.props('icon')).toBe('chevron-lg-right');
     });
 
     it('should dispatch toggleListCollapse when clicking the collapse icon', async () => {
diff --git a/spec/models/packages/composer/metadatum_spec.rb b/spec/models/packages/composer/metadatum_spec.rb
index 1c888f1563c..326eba7aa0e 100644
--- a/spec/models/packages/composer/metadatum_spec.rb
+++ b/spec/models/packages/composer/metadatum_spec.rb
@@ -10,6 +10,35 @@ RSpec.describe Packages::Composer::Metadatum, type: :model do
     it { is_expected.to validate_presence_of(:package) }
     it { is_expected.to validate_presence_of(:target_sha) }
     it { is_expected.to validate_presence_of(:composer_json) }
+
+    describe '#composer_package_type' do
+      subject { build(:composer_metadatum, package: package) }
+
+      shared_examples 'an invalid record' do
+        it do
+          expect(subject).not_to be_valid
+          expect(subject.errors.to_a).to include('Package type must be Composer')
+        end
+      end
+
+      context 'when the metadatum package_type is Composer' do
+        let(:package) { build(:composer_package) }
+
+        it { is_expected.to be_valid }
+      end
+
+      context 'when the metadatum has no associated package' do
+        let(:package) { nil }
+
+        it_behaves_like 'an invalid record'
+      end
+
+      context 'when the metadatum package_type is not Composer' do
+        let(:package) { build(:npm_package) }
+
+        it_behaves_like 'an invalid record'
+      end
+    end
   end
 
   describe 'scopes' do