Merge branch '212566-foss-design-management-models' into 'master'

Move Design Management models to FOSS

See merge request gitlab-org/gitlab!30015

ee/app/models/design_management/action.rb → app/models/design_management/action.rb

@@ -11,7 +11,7 @@ module DesignManagement
     belongs_to :design, class_name: "DesignManagement::Design", inverse_of: :actions
     belongs_to :version, class_name: "DesignManagement::Version", inverse_of: :actions
 
-    enum event: [:creation, :modification, :deletion]
+    enum event: { creation: 0, modification: 1, deletion: 2 }
 
     # we assume sequential ordering.
     scope :ordered, -> { order(version_id: :asc) }

ee/app/models/design_management/design.rb → app/models/design_management/design.rb

@@ -18,7 +18,7 @@ module DesignManagement
     # This is a polymorphic association, so we can't count on FK's to delete the
     # data
     has_many :notes, as: :noteable, dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent
-    has_many :user_mentions, class_name: "DesignUserMention", dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent
+    has_many :user_mentions, class_name: 'DesignUserMention', dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent
 
     validates :project, :filename, presence: true
     validates :issue, presence: true, unless: :importing?

ee/app/models/design_management/design_at_version.rb → app/models/design_management/design_at_version.rb

@@ -11,8 +11,8 @@ module DesignManagement
     attr_reader :version
     attr_reader :design
 
-    validates_presence_of :version
-    validates_presence_of :design
+    validates :version, presence: true
+    validates :design, presence: true
 
     validate :design_and_version_belong_to_the_same_issue
     validate :design_and_version_have_issue_id

ee/app/models/design_management/repository.rb → app/models/design_management/repository.rb

@@ -13,10 +13,10 @@ module DesignManagement
     GA
 
     def initialize(project)
-      full_path = project.full_path + EE::Gitlab::GlRepository::DESIGN.path_suffix
-      disk_path = project.disk_path + EE::Gitlab::GlRepository::DESIGN.path_suffix
+      full_path = project.full_path + Gitlab::GlRepository::DESIGN.path_suffix
+      disk_path = project.disk_path + Gitlab::GlRepository::DESIGN.path_suffix
 
-      super(full_path, project, shard: project.repository_storage, disk_path: disk_path, repo_type: EE::Gitlab::GlRepository::DESIGN)
+      super(full_path, project, shard: project.repository_storage, disk_path: disk_path, repo_type: Gitlab::GlRepository::DESIGN)
     end
 
     # Override of a method called on Repository instances but sent via

app/models/diff_note.rb

@@ -9,7 +9,7 @@ class DiffNote < Note
   include Gitlab::Utils::StrongMemoize
 
   def self.noteable_types
-    %w(MergeRequest Commit)
+    %w(MergeRequest Commit DesignManagement::Design)
   end
 
   validates :original_position, presence: true
@@ -60,6 +60,8 @@ class DiffNote < Note
   # Returns the diff file from `position`
   def latest_diff_file
     strong_memoize(:latest_diff_file) do
+      next if for_design?
+
       position.diff_file(repository)
     end
   end
@@ -67,6 +69,8 @@ class DiffNote < Note
   # Returns the diff file from `original_position`
   def diff_file
     strong_memoize(:diff_file) do
+      next if for_design?
+
       enqueue_diff_file_creation_job if should_create_diff_file?
 
       fetch_diff_file
@@ -145,7 +149,7 @@ class DiffNote < Note
   end
 
   def supported?
-    for_commit? || self.noteable.has_complete_diff_refs?
+    for_commit? || for_design? || self.noteable.has_complete_diff_refs?
   end
 
   def set_line_code
@@ -184,5 +188,3 @@ class DiffNote < Note
     noteable.respond_to?(:repository) ? noteable.repository : project.repository
   end
 end
-
-DiffNote.prepend_if_ee('::EE::DiffNote')

app/models/issue.rb

@@ -49,6 +49,12 @@ class Issue < ApplicationRecord
   has_many :zoom_meetings
   has_many :user_mentions, class_name: "IssueUserMention", dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent
   has_many :sent_notifications, as: :noteable
+  has_many :designs, class_name: 'DesignManagement::Design', inverse_of: :issue
+  has_many :design_versions, class_name: 'DesignManagement::Version', inverse_of: :issue do
+    def most_recent
+      ordered.first
+    end
+  end
 
   has_one :sentry_issue
   has_one :alert_management_alert, class_name: 'AlertManagement::Alert'
@@ -334,6 +340,10 @@ class Issue < ApplicationRecord
     previous_changes['updated_at']&.first || updated_at
   end
 
+  def design_collection
+    @design_collection ||= ::DesignManagement::DesignCollection.new(self)
+  end
+
   private
 
   def ensure_metrics

app/models/note.rb

@@ -279,6 +279,10 @@ class Note < ApplicationRecord
     !for_personal_snippet?
   end
 
+  def for_design?
+    noteable_type == DesignManagement::Design.name
+  end
+
   def for_issuable?
     for_issue? || for_merge_request?
   end

app/models/project.rb

@@ -215,6 +215,7 @@ class Project < ApplicationRecord
   has_many :protected_branches
   has_many :protected_tags
   has_many :repository_languages, -> { order "share DESC" }
+  has_many :designs, inverse_of: :project, class_name: 'DesignManagement::Design'
 
   has_many :project_authorizations
   has_many :authorized_users, through: :project_authorizations, source: :user, class_name: 'User'
@@ -791,6 +792,11 @@ class Project < ApplicationRecord
     Feature.enabled?(:jira_issue_import, self, default_enabled: true)
   end
 
+  # LFS and hashed repository storage are required for using Design Management.
+  def design_management_enabled?
+    lfs_enabled? && hashed_storage?(:repository)
+  end
+
   def team
     @team ||= ProjectTeam.new(self)
   end
@@ -799,6 +805,12 @@ class Project < ApplicationRecord
     @repository ||= Repository.new(full_path, self, shard: repository_storage, disk_path: disk_path)
   end
 
+  def design_repository
+    strong_memoize(:design_repository) do
+      DesignManagement::Repository.new(self)
+    end
+  end
+
   def cleanup
     @repository = nil
   end

ee/app/models/ee/diff_note.rb

-# frozen_string_literal: true
-
-module EE
-  module DiffNote
-    extend ::Gitlab::Utils::Override
-    extend ActiveSupport::Concern
-
-    class_methods do
-      def noteable_types
-        super + %w(DesignManagement::Design)
-      end
-    end
-
-    override :supported?
-    def supported?
-      for_design? || super
-    end
-
-    # diffs are currently not suported for designs
-    # this needs to be decoupled from the `Project#repository`
-    override :latest_diff_file
-    def latest_diff_file
-      return super unless for_design?
-    end
-
-    override :diff_file
-    def diff_file
-      return super unless for_design?
-    end
-  end
-end

ee/app/models/ee/issue.rb

@@ -32,12 +32,6 @@ module EE
       has_one :epic_issue
       has_one :epic, through: :epic_issue
       belongs_to :promoted_to_epic, class_name: 'Epic'
-      has_many :designs, class_name: "DesignManagement::Design", inverse_of: :issue
-      has_many :design_versions, class_name: "DesignManagement::Version", inverse_of: :issue do
-        def most_recent
-          ordered.first
-        end
-      end
 
       has_one :status_page_published_incident, class_name: 'StatusPage::PublishedIncident', inverse_of: :issue
 
@@ -163,10 +157,6 @@ module EE
       @group ||= project.group
     end
 
-    def design_collection
-      @design_collection ||= ::DesignManagement::DesignCollection.new(self)
-    end
-
     def promoted?
       !!promoted_to_epic_id
     end

ee/app/models/ee/note.rb

@@ -57,10 +57,6 @@ module EE
       for_epic? || super
     end
 
-    def for_design?
-      noteable_type == DesignManagement::Design.name
-    end
-
     override :resource_parent
     def resource_parent
       for_epic? ? noteable.group : super

ee/app/models/ee/project.rb

@@ -57,7 +57,6 @@ module EE
       has_many :approval_rules, class_name: 'ApprovalProjectRule'
       has_many :approval_merge_request_rules, through: :merge_requests, source: :approval_rules
       has_many :audit_events, as: :entity
-      has_many :designs, inverse_of: :project, class_name: 'DesignManagement::Design'
       has_many :path_locks
       has_many :requirements, inverse_of: :project, class_name: 'RequirementsManagement::Requirement'
 
@@ -656,22 +655,11 @@ module EE
       super.presence || build_feature_usage
     end
 
-    # LFS and hashed repository storage are required for using Design Management.
-    def design_management_enabled?
-      lfs_enabled? && hashed_storage?(:repository)
-    end
-
-    def design_repository
-      strong_memoize(:design_repository) do
-        DesignManagement::Repository.new(self)
-      end
-    end
-
     override(:expire_caches_before_rename)
     def expire_caches_before_rename(old_path)
       super
 
-      design = ::Repository.new("#{old_path}#{::EE::Gitlab::GlRepository::DESIGN.path_suffix}", self, shard: repository_storage, repo_type: ::EE::Gitlab::GlRepository::DESIGN)
+      design = ::Repository.new("#{old_path}#{::Gitlab::GlRepository::DESIGN.path_suffix}", self, shard: repository_storage, repo_type: ::Gitlab::GlRepository::DESIGN)
 
       if design.exists?
         design.before_delete

ee/app/services/ee/projects/hashed_storage/base_repository_service.rb

@@ -42,7 +42,7 @@ module EE
         end
 
         def design_path_suffix
-          @design_path_suffix ||= EE::Gitlab::GlRepository::DESIGN.path_suffix
+          @design_path_suffix ||= ::Gitlab::GlRepository::DESIGN.path_suffix
         end
 
         def old_design_disk_path

ee/app/services/ee/projects/transfer_service.rb

@@ -52,11 +52,11 @@ module EE
       end
 
       def old_design_repo_path
-        "#{old_path}#{EE::Gitlab::GlRepository::DESIGN.path_suffix}"
+        "#{old_path}#{::Gitlab::GlRepository::DESIGN.path_suffix}"
       end
 
       def new_design_repo_path
-        "#{new_path}#{EE::Gitlab::GlRepository::DESIGN.path_suffix}"
+        "#{new_path}#{::Gitlab::GlRepository::DESIGN.path_suffix}"
       end
     end
   end

ee/app/services/ee/projects/update_repository_storage_service.rb

@@ -10,7 +10,7 @@ module EE
         super
 
         if project.design_repository.exists?
-          mirror_repository(new_repository_storage_key, type: Gitlab::GlRepository::DESIGN)
+          mirror_repository(new_repository_storage_key, type: ::Gitlab::GlRepository::DESIGN)
         end
       end
 

ee/app/services/geo/move_repository_service.rb

@@ -81,7 +81,7 @@ module Geo
     end
 
     def design_path_suffix
-      EE::Gitlab::GlRepository::DESIGN.path_suffix
+      ::Gitlab::GlRepository::DESIGN.path_suffix
     end
 
     def old_design_disk_path

ee/lib/ee/gitlab/git_access_design.rb

+# frozen_string_literal: true
+
+module EE
+  module Gitlab
+    module GitAccessDesign
+      extend ::Gitlab::Utils::Override
+
+      private
+
+      override :check_protocol!
+      def check_protocol!
+        return if geo?
+
+        super
+      end
+
+      override :check_can_create_design!
+      def check_can_create_design!
+        return if geo?
+
+        super
+      end
+    end
+  end
+end

ee/lib/ee/gitlab/gl_repository.rb

-# frozen_string_literal: true
-
-module EE
-  module Gitlab
-    module GlRepository
-      extend ::Gitlab::Utils::Override
-      extend ActiveSupport::Concern
-
-      DESIGN = ::Gitlab::GlRepository::RepoType.new(
-        name: :design,
-        access_checker_class: ::Gitlab::GitAccessDesign,
-        repository_resolver: -> (project) { ::DesignManagement::Repository.new(project) },
-        suffix: :design
-      )
-
-      EE_TYPES = {
-        DESIGN.name.to_s => DESIGN
-      }.freeze
-
-      override :types
-      def types
-        super.merge(EE_TYPES)
-      end
-    end
-  end
-end

ee/lib/ee/gitlab/gl_repository/repo_type.rb

-# frozen_string_literal: true
-
-module EE
-  module Gitlab
-    module GlRepository
-      module RepoType
-        def design?
-          self == DESIGN
-        end
-      end
-    end
-  end
-end

ee/spec/factories/notes.rb

@@ -11,20 +11,6 @@ FactoryBot.modify do
       noteable { association(:vulnerability, project: project) }
     end
 
-    trait :on_design do
-      transient do
-        issue { association(:issue, project: project) }
-      end
-      noteable { association(:design, :with_file, issue: issue) }
-
-      after(:build) do |note|
-        next if note.project == note.noteable.project
-
-        # note validations require consistency between these two objects
-        note.project = note.noteable.project
-      end
-    end
-
     trait :with_review do
       review
     end
@@ -36,8 +22,4 @@ FactoryBot.define do
   factory :note_on_vulnerability, parent: :note, traits: [:on_vulnerability]
 
   factory :discussion_note_on_vulnerability, parent: :note, traits: [:on_vulnerability], class: 'DiscussionNote'
-
-  factory :diff_note_on_design, parent: :note, traits: [:on_design], class: 'DiffNote' do
-    position { build(:image_diff_position, file: noteable.full_path, diff_refs: noteable.diff_refs) }
-  end
 end

ee/spec/factories/projects.rb

@@ -30,12 +30,6 @@ FactoryBot.modify do
       end
     end
 
-    trait :design_repo do
-      after(:create) do |project|
-        raise 'Failed to create design repository!' unless project.design_repository.create_if_not_exists
-      end
-    end
-
     trait :import_none do
       import_status { :none }
     end

ee/spec/factories/uploads.rb

-# frozen_string_literal: true
-
-FactoryBot.modify do
-  factory :upload do
-    trait :design_action_image_v432x230_upload do
-      mount_point { :image_v432x230 }
-      model { create(:design_action) }
-      uploader { ::DesignManagement::DesignV432x230Uploader.name }
-    end
-  end
-end

ee/spec/lib/ee/gitlab/git_access_design_spec.rb

+# frozen_string_literal: true
+require 'spec_helper'
+
+describe Gitlab::GitAccessDesign do
+  include DesignManagementTestHelpers
+  using RSpec::Parameterized::TableSyntax
+
+  let_it_be(:project) { create(:project) }
+  let_it_be(:user) { project.owner }
+  let(:actor) { :geo }
+
+  subject(:access) do
+    described_class.new(actor, project, protocol, authentication_abilities: [:read_project, :download_code, :push_code])
+  end
+
+  describe '#check' do
+    subject { access.check('git-receive-pack', ::Gitlab::GitAccess::ANY) }
+
+    before do
+      enable_design_management
+    end
+
+    where(:protocol_name) do
+      %w(ssh web http https)
+    end
+
+    with_them do
+      let(:protocol) { protocol_name }
+
+      it { is_expected.to be_a(::Gitlab::GitAccessResult::Success) }
+    end
+  end
+end

ee/spec/lib/ee/gitlab/gl_repository_spec.rb

-# frozen_string_literal: true
-require 'spec_helper'
-
-describe Gitlab::GlRepository do
-  describe "DESIGN" do
-    it "uses the design access checker" do
-      expect(described_class::DESIGN.access_checker_class).to eq(::Gitlab::GitAccessDesign)
-    end
-
-    it "builds a design repository" do
-      expect(described_class::DESIGN.repository_resolver.call(create(:project)))
-        .to be_a(::DesignManagement::Repository)
-    end
-  end
-
-  describe '.parse' do
-    let_it_be(:project) { create(:project, :repository) }
-
-    it 'parses a design gl_repository' do
-      expect(described_class.parse("design-#{project.id}")).to eq([project, project, EE::Gitlab::GlRepository::DESIGN])
-    end
-  end
-
-  describe '.types' do
-    it 'contains both the EE and CE repository types' do
-      expected_types = Gitlab::GlRepository::TYPES.merge(EE::Gitlab::GlRepository::EE_TYPES)
-
-      expect(described_class.types).to eq(expected_types)
-    end
-  end
-end

ee/spec/models/ee/diff_note_spec.rb

-# frozen_string_literal: true
-require 'spec_helper'
-
-describe DiffNote do
-  describe 'Validations' do
-    it 'allows diffnotes on designs' do
-      diff_note = build(:diff_note_on_design)
-
-      expect(diff_note).to be_valid
-    end
-  end
-
-  context 'diff files' do
-    let(:design) { create(:design, :with_file, versions_count: 2) }
-    let(:diff_note) { create(:diff_note_on_design, noteable: design) }
-
-    describe '#latest_diff_file' do
-      it 'does not return a diff file' do
-        expect(diff_note.latest_diff_file).to be_nil
-      end
-    end
-
-    describe '#diff_file' do
-      it 'does not return a diff file' do
-        expect(diff_note.diff_file).to be_nil
-      end
-    end
-  end
-end

ee/spec/models/issue_spec.rb

@@ -169,8 +169,6 @@ describe Issue do
   end
 
   describe 'relations' do
-    it { is_expected.to have_many(:designs) }
-    it { is_expected.to have_many(:design_versions) }
     it { is_expected.to have_and_belong_to_many(:prometheus_alert_events) }
     it { is_expected.to have_and_belong_to_many(:self_managed_prometheus_alert_events) }
     it { is_expected.to have_many(:prometheus_alerts) }
@@ -593,50 +591,6 @@ describe Issue do
     end
   end
 
-  describe "#design_collection" do
-    it "returns a design collection" do
-      issue = build(:issue)
-      collection = issue.design_collection
-
-      expect(collection).to be_a(DesignManagement::DesignCollection)
-      expect(collection.issue).to eq(issue)
-    end
-  end
-
-  describe 'current designs' do
-    let(:issue) { create(:issue) }
-
-    subject { issue.designs.current }
-
-    context 'an issue has no designs' do
-      it { is_expected.to be_empty }
-    end
-
-    context 'an issue only has current designs' do
-      let!(:design_a) { create(:design, :with_file, issue: issue) }
-      let!(:design_b) { create(:design, :with_file, issue: issue) }
-      let!(:design_c) { create(:design, :with_file, issue: issue) }
-
-      it { is_expected.to include(design_a, design_b, design_c) }
-    end
-
-    context 'an issue only has deleted designs' do
-      let!(:design_a) { create(:design, :with_file, issue: issue, deleted: true) }
-      let!(:design_b) { create(:design, :with_file, issue: issue, deleted: true) }
-      let!(:design_c) { create(:design, :with_file, issue: issue, deleted: true) }
-
-      it { is_expected.to be_empty }
-    end
-
-    context 'an issue has a mixture of current and deleted designs' do
-      let!(:design_a) { create(:design, :with_file, issue: issue) }
-      let!(:design_b) { create(:design, :with_file, issue: issue, deleted: true) }
-      let!(:design_c) { create(:design, :with_file, issue: issue) }
-
-      it { is_expected.to contain_exactly(design_a, design_c) }
-    end
-  end
-
   describe "#issue_link_type" do
     let(:issue) { build(:issue) }
 

ee/spec/models/note_spec.rb

@@ -171,14 +171,6 @@ describe Note do
     end
   end
 
-  describe '#for_design' do
-    it 'is true when the noteable is a design' do
-      note = build(:note, noteable: build(:design))
-
-      expect(note).to be_for_design
-    end
-  end
-
   describe '.by_humans' do
     it 'excludes notes by bots and service users' do
       user_note = create(:note)

ee/spec/models/project_spec.rb

@@ -2076,28 +2076,6 @@ describe Project do
     end
   end
 
-  describe '#design_management_enabled?' do
-    let(:project) { build(:project) }
-
-    where(:lfs_enabled, :hashed_storage_enabled, :expectation) do
-      false | false | false
-      true  | false | false
-      false | true  | false
-      true  | true  | true
-    end
-
-    with_them do
-      before do
-        expect(project).to receive(:lfs_enabled?).and_return(lfs_enabled)
-        allow(project).to receive(:hashed_storage?).with(:repository).and_return(hashed_storage_enabled)
-      end
-
-      it do
-        expect(project.design_management_enabled?).to be(expectation)
-      end
-    end
-  end
-
   describe "#kerberos_url_to_repo" do
     let(:project) { create(:project, path: "somewhere") }
 
@@ -2562,7 +2540,7 @@ describe Project do
         .and_return(wiki)
 
       allow(Repository).to receive(:new)
-        .with('foo.design', project, shard: project.repository_storage, repo_type: ::EE::Gitlab::GlRepository::DESIGN)
+        .with('foo.design', project, shard: project.repository_storage, repo_type: ::Gitlab::GlRepository::DESIGN)
         .and_return(design)
 
       expect(design).to receive(:before_delete)

ee/spec/requests/api/internal/base_spec.rb

@@ -78,7 +78,7 @@ describe API::Internal::Base do
 
     context "for design repositories" do
       let_it_be(:project) { create(:project) }
-      let(:gl_repository) { EE::Gitlab::GlRepository::DESIGN.identifier_for_container(project) }
+      let(:gl_repository) { ::Gitlab::GlRepository::DESIGN.identifier_for_container(project) }
 
       it "does not allow access" do
         post(api("/internal/allowed"),

ee/spec/services/design_management/delete_designs_service_spec.rb

@@ -102,7 +102,7 @@ describe DesignManagement::DeleteDesignsService do
         end
 
         it 'calls repository#log_geo_updated_event' do
-          design_repository = EE::Gitlab::GlRepository::DESIGN.repository_resolver.call(project)
+          design_repository = ::Gitlab::GlRepository::DESIGN.repository_resolver.call(project)
           allow_next_instance_of(described_class) do |instance|
             allow(instance).to receive(:repository).and_return(design_repository)
           end

ee/spec/services/design_management/save_designs_service_spec.rb

@@ -10,7 +10,7 @@ describe DesignManagement::SaveDesignsService do
   let(:issue) { create(:issue) }
   let(:user) { developer }
   let(:files) { [rails_sample] }
-  let(:design_repository) { EE::Gitlab::GlRepository::DESIGN.repository_resolver.call(project) }
+  let(:design_repository) { ::Gitlab::GlRepository::DESIGN.repository_resolver.call(project) }
   let(:rails_sample_name) { 'rails_sample.jpg' }
   let(:rails_sample) { sample_image(rails_sample_name) }
   let(:dk_png) { sample_image('dk.png') }

ee/spec/services/projects/transfer_service_spec.rb

@@ -98,7 +98,7 @@ describe Projects::TransferService do
     end
 
     describe 'when the project has a design repository' do
-      let(:project_repo_path) { "#{project.path}#{EE::Gitlab::GlRepository::DESIGN.path_suffix}" }
+      let(:project_repo_path) { "#{project.path}#{::Gitlab::GlRepository::DESIGN.path_suffix}" }
       let(:old_full_path) { "#{user.namespace.full_path}/#{project_repo_path}" }
       let(:new_full_path) { "#{group.full_path}/#{project_repo_path}" }
 

ee/lib/gitlab/git_access_design.rb → lib/gitlab/git_access_design.rb

@@ -2,11 +2,9 @@
 
 module Gitlab
   class GitAccessDesign < GitAccess
-    def check(cmd, _changes)
-      unless geo?
-        check_protocol!
-        check_can_create_design!
-      end
+    def check(_cmd, _changes)
+      check_protocol!
+      check_can_create_design!
 
       success_result
     end
@@ -26,3 +24,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::GitAccessDesign.prepend_if_ee('EE::Gitlab::GitAccessDesign')

lib/gitlab/gl_repository.rb

@@ -23,11 +23,18 @@ module Gitlab
       project_resolver: -> (snippet) { snippet&.project },
       guest_read_ability: :read_snippet
     ).freeze
+    DESIGN = ::Gitlab::GlRepository::RepoType.new(
+      name: :design,
+      access_checker_class: ::Gitlab::GitAccessDesign,
+      repository_resolver: -> (project) { ::DesignManagement::Repository.new(project) },
+      suffix: :design
+    ).freeze
 
     TYPES = {
       PROJECT.name.to_s => PROJECT,
       WIKI.name.to_s => WIKI,
-      SNIPPET.name.to_s => SNIPPET
+      SNIPPET.name.to_s => SNIPPET,
+      DESIGN.name.to_s => DESIGN
     }.freeze
 
     def self.types
@@ -58,5 +65,3 @@ module Gitlab
     private_class_method :instance
   end
 end
-
-Gitlab::GlRepository.prepend_if_ee('::EE::Gitlab::GlRepository')

lib/gitlab/gl_repository/repo_type.rb

@@ -57,6 +57,10 @@ module Gitlab
         self == SNIPPET
       end
 
+      def design?
+        self == DESIGN
+      end
+
       def path_suffix
         suffix ? ".#{suffix}" : ''
       end
@@ -87,5 +91,3 @@ module Gitlab
     end
   end
 end
-
-Gitlab::GlRepository::RepoType.prepend_if_ee('EE::Gitlab::GlRepository::RepoType')

spec/factories/notes.rb

@@ -107,6 +107,10 @@ FactoryBot.define do
       end
     end
 
+    factory :diff_note_on_design, parent: :note, traits: [:on_design], class: 'DiffNote' do
+      position { build(:image_diff_position, file: noteable.full_path, diff_refs: noteable.diff_refs) }
+    end
+
     trait :on_commit do
       association :project, :repository
       noteable { nil }
@@ -136,6 +140,20 @@ FactoryBot.define do
       project { nil }
     end
 
+    trait :on_design do
+      transient do
+        issue { association(:issue, project: project) }
+      end
+      noteable { association(:design, :with_file, issue: issue) }
+
+      after(:build) do |note|
+        next if note.project == note.noteable.project
+
+        # note validations require consistency between these two objects
+        note.project = note.noteable.project
+      end
+    end
+
     trait :system do
       system { true }
     end

spec/factories/projects.rb

@@ -215,6 +215,12 @@ FactoryBot.define do
       end
     end
 
+    trait :design_repo do
+      after(:create) do |project|
+        raise 'Failed to create design repository!' unless project.design_repository.create_if_not_exists
+      end
+    end
+
     trait :remote_mirror do
       transient do
         remote_name { "remote_mirror_#{SecureRandom.hex}" }

spec/factories/uploads.rb

@@ -65,5 +65,11 @@ FactoryBot.define do
       model { create(:note) }
       uploader { "AttachmentUploader" }
     end
+
+    trait :design_action_image_v432x230_upload do
+      mount_point { :image_v432x230 }
+      model { create(:design_action) }
+      uploader { ::DesignManagement::DesignV432x230Uploader.name }
+    end
   end
 end

ee/spec/lib/gitlab/git_access_design_spec.rb → spec/lib/gitlab/git_access_design_spec.rb

@@ -13,41 +13,42 @@ describe Gitlab::GitAccessDesign do
     described_class.new(actor, project, protocol, authentication_abilities: [:read_project, :download_code, :push_code])
   end
 
-  describe "#check!" do
+  describe '#check' do
     subject { access.check('git-receive-pack', ::Gitlab::GitAccess::ANY) }
 
     before do
       enable_design_management
     end
 
-    context "when the user is allowed to manage designs" do
-      it { is_expected.to be_a(::Gitlab::GitAccessResult::Success) }
+    context 'when the user is allowed to manage designs' do
+      # TODO This test is being temporarily skipped unless run in EE,
+      # as we are in the process of moving Design Management to FOSS in 13.0
+      # in steps. In the current step the policies have not yet been moved
+      # which means that although the `GitAccessDesign` class has moved, the
+      # user will always be denied access in FOSS.
+      #
+      # See https://gitlab.com/gitlab-org/gitlab/-/issues/212566#note_327724283.
+      it do
+        skip 'See https://gitlab.com/gitlab-org/gitlab/-/issues/212566#note_327724283' unless Gitlab.ee?
+
+        is_expected.to be_a(::Gitlab::GitAccessResult::Success)
+      end
     end
 
-    context "when the user is not allowed to manage designs" do
+    context 'when the user is not allowed to manage designs' do
       let_it_be(:user) { create(:user) }
 
-      it "raises an error " do
+      it 'raises an error' do
         expect { subject }.to raise_error(::Gitlab::GitAccess::ForbiddenError)
       end
     end
 
-    context "when the protocol is not web" do
+    context 'when the protocol is not web' do
       let(:protocol) { 'https' }
 
-      it "raises an error " do
+      it 'raises an error' do
         expect { subject }.to raise_error(::Gitlab::GitAccess::ForbiddenError)
       end
     end
-
-    context 'Geo' do
-      let(:actor) { :geo }
-
-      context 'http protocol' do
-        let(:protocol) { 'http' }
-
-        it { is_expected.to be_a(::Gitlab::GitAccessResult::Success) }
-      end
-    end
   end
 end

spec/lib/gitlab/gl_repository/repo_type_spec.rb

@@ -7,6 +7,7 @@ describe Gitlab::GlRepository::RepoType do
   let_it_be(:project_snippet) { create(:project_snippet, project: project, author: project.owner) }
   let(:project_path) { project.repository.full_path }
   let(:wiki_path) { project.wiki.repository.full_path }
+  let(:design_path) { project.design_repository.full_path }
   let(:personal_snippet_path) { "snippets/#{personal_snippet.id}" }
   let(:project_snippet_path) { "#{project.full_path}/snippets/#{project_snippet.id}" }
 
@@ -24,6 +25,7 @@ describe Gitlab::GlRepository::RepoType do
         expect(described_class).not_to be_wiki
         expect(described_class).to be_project
         expect(described_class).not_to be_snippet
+        expect(described_class).not_to be_design
       end
     end
 
@@ -33,6 +35,7 @@ describe Gitlab::GlRepository::RepoType do
         expect(described_class.valid?(wiki_path)).to be_truthy
         expect(described_class.valid?(personal_snippet_path)).to be_truthy
         expect(described_class.valid?(project_snippet_path)).to be_truthy
+        expect(described_class.valid?(design_path)).to be_truthy
       end
     end
   end
@@ -51,6 +54,7 @@ describe Gitlab::GlRepository::RepoType do
         expect(described_class).to be_wiki
         expect(described_class).not_to be_project
         expect(described_class).not_to be_snippet
+        expect(described_class).not_to be_design
       end
     end
 
@@ -60,6 +64,7 @@ describe Gitlab::GlRepository::RepoType do
         expect(described_class.valid?(wiki_path)).to be_truthy
         expect(described_class.valid?(personal_snippet_path)).to be_falsey
         expect(described_class.valid?(project_snippet_path)).to be_falsey
+        expect(described_class.valid?(design_path)).to be_falsey
       end
     end
   end
@@ -79,6 +84,7 @@ describe Gitlab::GlRepository::RepoType do
           expect(described_class).to be_snippet
           expect(described_class).not_to be_wiki
           expect(described_class).not_to be_project
+          expect(described_class).not_to be_design
         end
       end
 
@@ -88,6 +94,7 @@ describe Gitlab::GlRepository::RepoType do
           expect(described_class.valid?(wiki_path)).to be_falsey
           expect(described_class.valid?(personal_snippet_path)).to be_truthy
           expect(described_class.valid?(project_snippet_path)).to be_truthy
+          expect(described_class.valid?(design_path)).to be_falsey
         end
       end
     end
@@ -115,8 +122,38 @@ describe Gitlab::GlRepository::RepoType do
           expect(described_class.valid?(wiki_path)).to be_falsey
           expect(described_class.valid?(personal_snippet_path)).to be_truthy
           expect(described_class.valid?(project_snippet_path)).to be_truthy
+          expect(described_class.valid?(design_path)).to be_falsey
         end
       end
     end
   end
+
+  describe Gitlab::GlRepository::DESIGN do
+    it_behaves_like 'a repo type' do
+      let(:expected_identifier) { "design-#{project.id}" }
+      let(:expected_id) { project.id.to_s }
+      let(:expected_suffix) { '.design' }
+      let(:expected_repository) { project.design_repository }
+      let(:expected_container) { project }
+    end
+
+    it 'knows its type' do
+      aggregate_failures do
+        expect(described_class).to be_design
+        expect(described_class).not_to be_project
+        expect(described_class).not_to be_wiki
+        expect(described_class).not_to be_snippet
+      end
+    end
+
+    it 'checks if repository path is valid' do
+      aggregate_failures do
+        expect(described_class.valid?(design_path)).to be_truthy
+        expect(described_class.valid?(project_path)).to be_falsey
+        expect(described_class.valid?(wiki_path)).to be_falsey
+        expect(described_class.valid?(personal_snippet_path)).to be_falsey
+        expect(described_class.valid?(project_snippet_path)).to be_falsey
+      end
+    end
+  end
 end

spec/lib/gitlab/gl_repository_spec.rb

@@ -19,6 +19,10 @@ describe ::Gitlab::GlRepository do
       expect(described_class.parse("snippet-#{snippet.id}")).to eq([snippet, nil, Gitlab::GlRepository::SNIPPET])
     end
 
+    it 'parses a design gl_repository' do
+      expect(described_class.parse("design-#{project.id}")).to eq([project, project, Gitlab::GlRepository::DESIGN])
+    end
+
     it 'throws an argument error on an invalid gl_repository type' do
       expect { described_class.parse("badformat-#{project.id}") }.to raise_error(ArgumentError)
     end
@@ -27,4 +31,15 @@ describe ::Gitlab::GlRepository do
       expect { described_class.parse("project-foo") }.to raise_error(ArgumentError)
     end
   end
+
+  describe 'DESIGN' do
+    it 'uses the design access checker' do
+      expect(described_class::DESIGN.access_checker_class).to eq(::Gitlab::GitAccessDesign)
+    end
+
+    it 'builds a design repository' do
+      expect(described_class::DESIGN.repository_resolver.call(create(:project)))
+        .to be_a(::DesignManagement::Repository)
+    end
+  end
 end

ee/spec/models/design_management/design_spec.rb → spec/models/design_management/design_spec.rb

@@ -380,8 +380,15 @@ describe DesignManagement::Design do
     end
   end
 
+  # TODO these tests are being temporarily skipped unless run in EE,
+  # as we are in the process of moving Design Management to FOSS in 13.0
+  # in steps. In the current step the routes have not yet been moved.
+  #
+  # See https://gitlab.com/gitlab-org/gitlab/-/issues/212566#note_327724283.
   describe '#note_etag_key' do
     it 'returns a correct etag key' do
+      skip 'See https://gitlab.com/gitlab-org/gitlab/-/issues/212566#note_327724283' unless Gitlab.ee?
+
       design = create(:design)
 
       expect(design.note_etag_key).to eq(

spec/models/diff_note_spec.rb

@@ -287,6 +287,24 @@ describe DiffNote do
         reply_diff_note.reload.diff_file
       end
     end
+
+    context 'when noteable is a Design' do
+      it 'does not return a diff file' do
+        diff_note = create(:diff_note_on_design)
+
+        expect(diff_note.diff_file).to be_nil
+      end
+    end
+  end
+
+  describe '#latest_diff_file' do
+    context 'when noteable is a Design' do
+      it 'does not return a diff file' do
+        diff_note = create(:diff_note_on_design)
+
+        expect(diff_note.latest_diff_file).to be_nil
+      end
+    end
   end
 
   describe "#diff_line" do

spec/models/issue_spec.rb

@@ -15,8 +15,20 @@ describe Issue do
     it { is_expected.to belong_to(:closed_by).class_name('User') }
     it { is_expected.to have_many(:assignees) }
     it { is_expected.to have_many(:user_mentions).class_name("IssueUserMention") }
+    it { is_expected.to have_many(:designs) }
+    it { is_expected.to have_many(:design_versions) }
     it { is_expected.to have_one(:sentry_issue) }
     it { is_expected.to have_one(:alert_management_alert) }
+
+    describe 'versions.most_recent' do
+      it 'returns the most recent version' do
+        issue = create(:issue)
+        create_list(:design_version, 2, issue: issue)
+        last_version = create(:design_version, issue: issue)
+
+        expect(issue.design_versions.most_recent).to eq(last_version)
+      end
+    end
   end
 
   describe 'modules' do
@@ -970,4 +982,48 @@ describe Issue do
       expect(issue.previous_updated_at).to eq(Time.new(2013, 02, 06))
     end
   end
+
+  describe '#design_collection' do
+    it 'returns a design collection' do
+      issue = build(:issue)
+      collection = issue.design_collection
+
+      expect(collection).to be_a(DesignManagement::DesignCollection)
+      expect(collection.issue).to eq(issue)
+    end
+  end
+
+  describe 'current designs' do
+    let(:issue) { create(:issue) }
+
+    subject { issue.designs.current }
+
+    context 'an issue has no designs' do
+      it { is_expected.to be_empty }
+    end
+
+    context 'an issue only has current designs' do
+      let!(:design_a) { create(:design, :with_file, issue: issue) }
+      let!(:design_b) { create(:design, :with_file, issue: issue) }
+      let!(:design_c) { create(:design, :with_file, issue: issue) }
+
+      it { is_expected.to include(design_a, design_b, design_c) }
+    end
+
+    context 'an issue only has deleted designs' do
+      let!(:design_a) { create(:design, :with_file, issue: issue, deleted: true) }
+      let!(:design_b) { create(:design, :with_file, issue: issue, deleted: true) }
+      let!(:design_c) { create(:design, :with_file, issue: issue, deleted: true) }
+
+      it { is_expected.to be_empty }
+    end
+
+    context 'an issue has a mixture of current and deleted designs' do
+      let!(:design_a) { create(:design, :with_file, issue: issue) }
+      let!(:design_b) { create(:design, :with_file, issue: issue, deleted: true) }
+      let!(:design_c) { create(:design, :with_file, issue: issue) }
+
+      it { is_expected.to contain_exactly(design_a, design_c) }
+    end
+  end
 end

spec/models/note_spec.rb

@@ -751,6 +751,14 @@ describe Note do
     end
   end
 
+  describe '#for_design' do
+    it 'is true when the noteable is a design' do
+      note = build(:note, noteable: build(:design))
+
+      expect(note).to be_for_design
+    end
+  end
+
   describe '#to_ability_name' do
     it 'returns note' do
       expect(build(:note).to_ability_name).to eq('note')

spec/models/project_spec.rb

@@ -6,6 +6,7 @@ describe Project do
   include ProjectForksHelper
   include GitHelpers
   include ExternalAuthorizationServiceHelpers
+  using RSpec::Parameterized::TableSyntax
 
   it_behaves_like 'having unique enum values'
 
@@ -6058,6 +6059,28 @@ describe Project do
     end
   end
 
+  describe '#design_management_enabled?' do
+    let(:project) { build(:project) }
+
+    where(:lfs_enabled, :hashed_storage_enabled, :expectation) do
+      false | false | false
+      true  | false | false
+      false | true  | false
+      true  | true  | true
+    end
+
+    with_them do
+      before do
+        expect(project).to receive(:lfs_enabled?).and_return(lfs_enabled)
+        allow(project).to receive(:hashed_storage?).with(:repository).and_return(hashed_storage_enabled)
+      end
+
+      it do
+        expect(project.design_management_enabled?).to be(expectation)
+      end
+    end
+  end
+
   def finish_job(export_job)
     export_job.start
     export_job.finish

ee/spec/services/design_management/design_user_notes_count_service_spec.rb → spec/services/design_management/design_user_notes_count_service_spec.rb

@@ -23,8 +23,15 @@ describe DesignManagement::DesignUserNotesCountService, :use_clean_rails_memory_
     end
   end
 
+  # TODO These tests are being temporarily skipped unless run in EE,
+  # as we are in the process of moving Design Management to FOSS in 13.0
+  # in steps. In the current step the services have not yet been moved.
+  #
+  # See https://gitlab.com/gitlab-org/gitlab/-/issues/212566#note_327724283.
   describe 'cache invalidation' do
     it 'changes when a new note is created' do
+      skip 'See https://gitlab.com/gitlab-org/gitlab/-/issues/212566#note_327724283' unless Gitlab.ee?
+
       new_note_attrs = attributes_for(:diff_note_on_design, noteable: design)
 
       expect do
@@ -33,6 +40,8 @@ describe DesignManagement::DesignUserNotesCountService, :use_clean_rails_memory_
     end
 
     it 'changes when a note is destroyed' do
+      skip 'See https://gitlab.com/gitlab-org/gitlab/-/issues/212566#note_327724283' unless Gitlab.ee?
+
       note = create(:diff_note_on_design, noteable: design)
 
       expect do