Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

3 files changed, 21 insertions, 23 deletions

diff --git a/spec/models/design_management/design_at_version_spec.rb b/spec/models/design_management/design_at_version_spec.rb
index 3c1ff45c53f..220de80a52a 100644
--- a/spec/models/design_management/design_at_version_spec.rb
+++ b/spec/models/design_management/design_at_version_spec.rb
@@ -274,29 +274,6 @@ RSpec.describe DesignManagement::DesignAtVersion do
     build(:design_at_version, design: design, version: version).id
   end
 
-  describe '.instantiate' do
-    context 'when attrs are valid' do
-      subject do
-        described_class.instantiate(design: design, version: version)
-      end
-
-      it { is_expected.to be_a(described_class).and(be_valid) }
-    end
-
-    context 'when attrs are invalid' do
-      subject do
-        described_class.instantiate(
-          design: create(:design),
-          version: create(:design_version)
-        )
-      end
-
-      it 'raises a validation error' do
-        expect { subject }.to raise_error(ActiveModel::ValidationError)
-      end
-    end
-  end
-
   describe '.lazy_find' do
     let!(:version_a) do
       create(:design_version, designs: create_list(:design, 3, issue: issue))
diff --git a/spec/models/design_management/design_collection_spec.rb b/spec/models/design_management/design_collection_spec.rb
index 8575cc80b5b..bc8330c7dd3 100644
--- a/spec/models/design_management/design_collection_spec.rb
+++ b/spec/models/design_management/design_collection_spec.rb
@@ -101,6 +101,18 @@ RSpec.describe DesignManagement::DesignCollection do
     end
   end
 
+  describe "#empty?" do
+    it "is true when the design collection has no designs" do
+      expect(collection).to be_empty
+    end
+
+    it "is false when the design collection has designs" do
+      create(:design, issue: issue)
+
+      expect(collection).not_to be_empty
+    end
+  end
+
   describe "#versions" do
     it "includes versions for all designs" do
       version_1 = create(:design_version)
diff --git a/spec/models/design_management/design_spec.rb b/spec/models/design_management/design_spec.rb
index d4adc0d42d0..2ce9f00a056 100644
--- a/spec/models/design_management/design_spec.rb
+++ b/spec/models/design_management/design_spec.rb
@@ -206,6 +206,15 @@ RSpec.describe DesignManagement::Design do
     end
   end
 
+  describe ".build_full_path" do
+    it "builds the full path for a design" do
+      design = build(:design, issue: issue, filename: "hello.jpg")
+      expected_path = "#{DesignManagement.designs_directory}/issue-#{design.issue.iid}/hello.jpg"
+
+      expect(described_class.build_full_path(issue, design)).to eq(expected_path)
+    end
+  end
+
   describe '#visible_in?' do
     let_it_be(:issue) { create(:issue, project: issue.project) }