Merge remote-tracking branch 'origin/master' into 20422-hide-ui-variables-by-default

6 files changed, 71 insertions, 42 deletions

diff --git a/spec/serializers/diff_file_entity_spec.rb b/spec/serializers/diff_file_entity_spec.rb
index 7497b8f27bd..073c13c2cbb 100644
--- a/spec/serializers/diff_file_entity_spec.rb
+++ b/spec/serializers/diff_file_entity_spec.rb
@@ -13,39 +13,6 @@ describe DiffFileEntity do
 
   subject { entity.as_json }
 
-  shared_examples 'diff file entity' do
-    it 'exposes correct attributes' do
-      expect(subject).to include(
-        :submodule, :submodule_link, :submodule_tree_url, :file_path,
-        :deleted_file, :old_path, :new_path, :mode_changed,
-        :a_mode, :b_mode, :text, :old_path_html,
-        :new_path_html, :highlighted_diff_lines, :parallel_diff_lines,
-        :blob, :file_hash, :added_lines, :removed_lines, :diff_refs, :content_sha,
-        :stored_externally, :external_storage, :too_large, :collapsed, :new_file,
-        :context_lines_path
-      )
-    end
-
-    it 'includes viewer' do
-      expect(subject[:viewer].with_indifferent_access)
-          .to match_schema('entities/diff_viewer')
-    end
-
-    # Converted diff files from GitHub import does not contain blob file
-    # and content sha.
-    context 'when diff file does not have a blob and content sha' do
-      it 'exposes some attributes as nil' do
-        allow(diff_file).to receive(:content_sha).and_return(nil)
-        allow(diff_file).to receive(:blob).and_return(nil)
-
-        expect(subject[:context_lines_path]).to be_nil
-        expect(subject[:view_path]).to be_nil
-        expect(subject[:highlighted_diff_lines]).to be_nil
-        expect(subject[:can_modify_blob]).to be_nil
-      end
-    end
-  end
-
   context 'when there is no merge request' do
     it_behaves_like 'diff file entity'
   end
diff --git a/spec/serializers/discussion_diff_file_entity_spec.rb b/spec/serializers/discussion_diff_file_entity_spec.rb
new file mode 100644
index 00000000000..101ac918a98
--- /dev/null
+++ b/spec/serializers/discussion_diff_file_entity_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe DiscussionDiffFileEntity do
+  include RepoHelpers
+
+  let(:project) { create(:project, :repository) }
+  let(:repository) { project.repository }
+  let(:commit) { project.commit(sample_commit.id) }
+  let(:diff_refs) { commit.diff_refs }
+  let(:diff) { commit.raw_diffs.first }
+  let(:diff_file) { Gitlab::Diff::File.new(diff, diff_refs: diff_refs, repository: repository) }
+  let(:entity) { described_class.new(diff_file, request: {}) }
+
+  subject { entity.as_json }
+
+  context 'when there is no merge request' do
+    it_behaves_like 'diff file discussion entity'
+  end
+
+  context 'when there is a merge request' do
+    let(:user) { create(:user) }
+    let(:request) { EntityRequest.new(project: project, current_user: user) }
+    let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
+    let(:entity) { described_class.new(diff_file, request: request, merge_request: merge_request) }
+
+    it_behaves_like 'diff file discussion entity'
+
+    it 'exposes additional attributes' do
+      expect(subject).to include(:edit_path)
+    end
+
+    it 'exposes no diff lines' do
+      expect(subject).not_to include(:highlighted_diff_lines,
+                                     :parallel_diff_lines)
+    end
+  end
+end
diff --git a/spec/serializers/discussion_entity_spec.rb b/spec/serializers/discussion_entity_spec.rb
index 0590304e832..138749b0fdf 100644
--- a/spec/serializers/discussion_entity_spec.rb
+++ b/spec/serializers/discussion_entity_spec.rb
@@ -74,13 +74,5 @@ describe DiscussionEntity do
         :active
       )
     end
-
-    context 'when diff file is a image' do
-      it 'exposes image attributes' do
-        allow(discussion).to receive(:on_image?).and_return(true)
-
-        expect(subject.keys).to include(:image_diff_html)
-      end
-    end
   end
 end
diff --git a/spec/serializers/issue_board_entity_spec.rb b/spec/serializers/issue_board_entity_spec.rb
new file mode 100644
index 00000000000..06d9d3657e6
--- /dev/null
+++ b/spec/serializers/issue_board_entity_spec.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe IssueBoardEntity do
+  let(:project)  { create(:project) }
+  let(:resource) { create(:issue, project: project) }
+  let(:user)     { create(:user) }
+
+  let(:request) { double('request', current_user: user) }
+
+  subject { described_class.new(resource, request: request).as_json }
+
+  it 'has basic attributes' do
+    expect(subject).to include(:id, :iid, :title, :confidential, :due_date, :project_id, :relative_position,
+                               :project, :labels)
+  end
+
+  it 'has path and endpoints' do
+    expect(subject).to include(:reference_path, :real_path, :issue_sidebar_endpoint,
+                               :toggle_subscription_endpoint, :assignable_labels_endpoint)
+  end
+end
diff --git a/spec/serializers/issue_serializer_spec.rb b/spec/serializers/issue_serializer_spec.rb
index 75578816e75..e8c46c0cdee 100644
--- a/spec/serializers/issue_serializer_spec.rb
+++ b/spec/serializers/issue_serializer_spec.rb
@@ -24,4 +24,12 @@ describe IssueSerializer do
       expect(json_entity).to match_schema('entities/issue_sidebar')
     end
   end
+
+  context 'board issue serialization' do
+    let(:serializer) { 'board' }
+
+    it 'matches board issue json schema' do
+      expect(json_entity).to match_schema('entities/issue_board')
+    end
+  end
 end
diff --git a/spec/serializers/pipeline_entity_spec.rb b/spec/serializers/pipeline_entity_spec.rb
index e67d12b7a89..774486dcb6d 100644
--- a/spec/serializers/pipeline_entity_spec.rb
+++ b/spec/serializers/pipeline_entity_spec.rb
@@ -44,7 +44,7 @@ describe PipelineEntity do
         expect(subject).to include :flags
         expect(subject[:flags])
           .to include :latest, :stuck, :auto_devops,
-                      :yaml_errors, :retryable, :cancelable
+                      :yaml_errors, :retryable, :cancelable, :merge_request
       end
     end