Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 0 deletions

diff --git a/spec/javascripts/behaviors/shortcuts/shortcuts_issuable_spec.js b/spec/javascripts/behaviors/shortcuts/shortcuts_issuable_spec.js
index 5e457a4e823..f6232026915 100644
--- a/spec/javascripts/behaviors/shortcuts/shortcuts_issuable_spec.js
+++ b/spec/javascripts/behaviors/shortcuts/shortcuts_issuable_spec.js
@@ -52,6 +52,7 @@ describe('ShortcutsIssuable', function() {
         return documentFragment;
       });
     };
+
     describe('with empty selection', () => {
       it('does not return an error', () => {
         ShortcutsIssuable.replyWithSelectedText(true);
@@ -297,5 +298,18 @@ describe('ShortcutsIssuable', function() {
         });
       });
     });
+
+    describe('with a valid selection with no text content', () => {
+      it('returns the proper markdown', done => {
+        stubSelection('<img src="foo" alt="image" />');
+        ShortcutsIssuable.replyWithSelectedText(true);
+
+        setTimeout(() => {
+          expect($(FORM_SELECTOR).val()).toBe('> ![image](http://localhost:9876/foo)\n\n');
+
+          done();
+        });
+      });
+    });
   });
 });