Merge branch 'id-autosave-for-new-mr' into 'master'

Fix sharing notes data in localStorage with all MRs See merge request gitlab-org/gitlab-ce!32699 (cherry picked from commit 6dd99d82) 4fb658d1 Fix sharing localStorage with all MRs

Merge branch 'id-autosave-for-new-mr' into 'master'
Fix sharing notes data in localStorage with all MRs See merge request gitlab-org/gitlab-ce!32699 (cherry picked from commit 6dd99d82) 4fb658d1 Fix sharing localStorage with all MRs
ae706227 · Stan Hu · 🤖 GitLab Bot 🤖 · 6f99007a · ae706227 · ae706227
--- a/app/serializers/merge_request_noteable_entity.rb
+++ b/app/serializers/merge_request_noteable_entity.rb
 # frozen_string_literal: true

-class MergeRequestNoteableEntity < Grape::Entity
+class MergeRequestNoteableEntity < IssuableEntity
  include RequestAwareEntity

  # Currently this attr is exposed to be used in app/assets/javascripts/notes/stores/getters.js

--- a/changelogs/unreleased/id-autosave-for-new-mr.yml
+++ b/changelogs/unreleased/id-autosave-for-new-mr.yml
+---
+title: Fix sharing localStorage with all MRs
+merge_request: 32699
+author:
+type: fixed
--- a/spec/features/merge_request/user_posts_notes_spec.rb
+++ b/spec/features/merge_request/user_posts_notes_spec.rb
@@ -5,7 +5,8 @@
 describe 'Merge request > User posts notes', :js do
  include NoteInteractionHelpers

-  let(:project) { create(:project, :repository) }
+  set(:project) { create(:project, :repository) }
+
  let(:user) { project.creator }
  let(:merge_request) do
    create(:merge_request, source_project: project, target_project: project)
@@ -33,17 +34,21 @@
    end

    describe 'with text' do
+      let(:text) { 'This is awesome' }
+
      before do
        page.within('.js-main-target-form') do
-          fill_in 'note[note]', with: 'This is awesome'
+          fill_in 'note[note]', with: text
        end
      end

-      it 'has enable submit button and preview button' do
+      it 'has enable submit button, preview button and saves content to local storage' do
        page.within('.js-main-target-form') do
          expect(page).not_to have_css('.js-comment-button[disabled]')
          expect(page).to have_css('.js-md-preview-button', visible: true)
        end
+
+        expect(page.evaluate_script("localStorage['autosave/Note/MergeRequest/#{merge_request.id}']")).to eq(text)
      end
    end
  end

--- a/spec/fixtures/api/schemas/entities/merge_request_noteable.json
+++ b/spec/fixtures/api/schemas/entities/merge_request_noteable.json
 {
  "type": "object",
  "properties" : {
+    "id": { "type": "integer" },
+    "iid": { "type": "integer" },
+    "title": { "type": "string" },
+    "description": { "type": "string" },
    "merge_params": { "type": ["object", "null"] },
    "state": { "type": "string" },
    "source_branch": { "type": "string" },

--- a/spec/serializers/merge_request_serializer_spec.rb
+++ b/spec/serializers/merge_request_serializer_spec.rb
 require 'spec_helper'

 describe MergeRequestSerializer do
-  let(:user) { create(:user) }
-  let(:resource) { create(:merge_request) }
+  set(:user) { create(:user) }
+  set(:resource) { create(:merge_request, description: "Description") }
+
  let(:json_entity) do
    described_class.new(current_user: user)
      .represent(resource, serializer: serializer)