Add latest changes from gitlab-org/gitlab@master

2 files changed, 46 insertions, 0 deletions

diff --git a/spec/support/shared_examples/features/content_editor_shared_examples.rb b/spec/support/shared_examples/features/content_editor_shared_examples.rb
index 2fd1b2e9048..591f7973454 100644
--- a/spec/support/shared_examples/features/content_editor_shared_examples.rb
+++ b/spec/support/shared_examples/features/content_editor_shared_examples.rb
@@ -76,4 +76,49 @@ RSpec.shared_examples 'edits content using the content editor' do
       expect(find('[data-testid="code-block-bubble-menu"]')).to have_text('Custom (nomnoml)')
     end
   end
+
+  describe 'mermaid diagram' do
+    before do
+      find(content_editor_testid).send_keys [:enter, :enter]
+
+      find(content_editor_testid).send_keys '```mermaid '
+      find(content_editor_testid).send_keys ['graph TD;', :enter, '  JohnDoe12 --> HelloWorld34']
+    end
+
+    it 'renders and updates the diagram correctly in a sandboxed iframe' do
+      iframe = find(content_editor_testid).find('iframe')
+      expect(iframe['src']).to include('/-/sandbox/mermaid')
+
+      within_frame(iframe) do
+        expect(find('svg').text).to include('JohnDoe12')
+        expect(find('svg').text).to include('HelloWorld34')
+      end
+
+      expect(iframe['height'].to_i).to be > 100
+
+      find(content_editor_testid).send_keys [:enter, '  JaneDoe34 --> HelloWorld56']
+
+      within_frame(iframe) do
+        page.has_content?('JaneDoe34')
+
+        expect(find('svg').text).to include('JaneDoe34')
+        expect(find('svg').text).to include('HelloWorld56')
+      end
+    end
+
+    it 'toggles the diagram when preview button is clicked' do
+      find('[data-testid="preview-diagram"]').click
+
+      expect(find(content_editor_testid)).not_to have_selector('iframe')
+
+      find('[data-testid="preview-diagram"]').click
+
+      iframe = find(content_editor_testid).find('iframe')
+
+      within_frame(iframe) do
+        expect(find('svg').text).to include('JohnDoe12')
+        expect(find('svg').text).to include('HelloWorld34')
+      end
+    end
+  end
 end
diff --git a/spec/support/shared_examples/graphql/mutations/incident_management_timeline_events_shared_examples.rb b/spec/support/shared_examples/graphql/mutations/incident_management_timeline_events_shared_examples.rb
index b989dbc6524..cd591248ff6 100644
--- a/spec/support/shared_examples/graphql/mutations/incident_management_timeline_events_shared_examples.rb
+++ b/spec/support/shared_examples/graphql/mutations/incident_management_timeline_events_shared_examples.rb
@@ -21,6 +21,7 @@ RSpec.shared_examples 'creating an incident timeline event' do
     expect(timeline_event.occurred_at.to_s).to eq(expected_timeline_event.occurred_at)
     expect(timeline_event.incident).to eq(expected_timeline_event.incident)
     expect(timeline_event.author).to eq(expected_timeline_event.author)
+    expect(timeline_event.editable).to eq(expected_timeline_event.editable)
   end
 end