Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

5 files changed, 20 insertions, 1 deletions

diff --git a/spec/lib/api/entities/clusters/agent_spec.rb b/spec/lib/api/entities/clusters/agent_spec.rb
new file mode 100644
index 00000000000..04f7ec28407
--- /dev/null
+++ b/spec/lib/api/entities/clusters/agent_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe API::Entities::Clusters::Agent do
+  let_it_be(:cluster_agent) { create(:cluster_agent) }
+
+  subject { described_class.new(cluster_agent).as_json }
+
+  it 'includes basic fields' do
+    expect(subject).to include(
+      id: cluster_agent.id,
+      config_project: a_hash_including(id: cluster_agent.project_id)
+    )
+  end
+end
diff --git a/spec/lib/api/entities/design_management/design_spec.rb b/spec/lib/api/entities/design_management/design_spec.rb
index fe449e3e9bc..fe2b1dadfa7 100644
--- a/spec/lib/api/entities/design_management/design_spec.rb
+++ b/spec/lib/api/entities/design_management/design_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 
 RSpec.describe API::Entities::DesignManagement::Design do
   let_it_be(:design) { create(:design) }
+
   let(:entity) { described_class.new(design, request: double) }
 
   subject { entity.as_json }
diff --git a/spec/lib/api/entities/merge_request_changes_spec.rb b/spec/lib/api/entities/merge_request_changes_spec.rb
index f46d8981328..29bfd1da6cc 100644
--- a/spec/lib/api/entities/merge_request_changes_spec.rb
+++ b/spec/lib/api/entities/merge_request_changes_spec.rb
@@ -5,6 +5,7 @@ require 'spec_helper'
 RSpec.describe ::API::Entities::MergeRequestChanges do
   let_it_be(:user) { create(:user) }
   let_it_be(:merge_request) { create(:merge_request) }
+
   let(:entity) { described_class.new(merge_request, current_user: user) }
 
   subject(:basic_entity) { entity.as_json }
diff --git a/spec/lib/api/entities/project_import_failed_relation_spec.rb b/spec/lib/api/entities/project_import_failed_relation_spec.rb
index 51a684c4564..d3c24f6fce3 100644
--- a/spec/lib/api/entities/project_import_failed_relation_spec.rb
+++ b/spec/lib/api/entities/project_import_failed_relation_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe API::Entities::ProjectImportFailedRelation do
         id: import_failure.id,
         created_at: import_failure.created_at,
         exception_class: import_failure.exception_class,
-        exception_message: import_failure.exception_message,
+        exception_message: nil,
         relation_name: import_failure.relation_key,
         source: import_failure.source
       )
diff --git a/spec/lib/api/entities/release_spec.rb b/spec/lib/api/entities/release_spec.rb
index d57c283c1f4..06062634015 100644
--- a/spec/lib/api/entities/release_spec.rb
+++ b/spec/lib/api/entities/release_spec.rb
@@ -4,6 +4,7 @@ require 'spec_helper'
 
 RSpec.describe API::Entities::Release do
   let_it_be(:project) { create(:project) }
+
   let(:release) { create(:release, project: project) }
   let(:evidence) { release.evidences.first }
   let(:user) { create(:user) }