diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-12-21 13:15:55 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-01-02 17:37:04 +0000 |
commit | 72506595457431f0d6c5da996ea332788c3a80dd (patch) | |
tree | 82bd6958f455801324b22b8b920cf5adf1950585 | |
parent | 89bd77b635dd96c184b5cd9f940f32e504484986 (diff) | |
download | gitlab-ce-72506595457431f0d6c5da996ea332788c3a80dd.tar.gz |
Merge branch 'markdown-toolbar-btn-fix' into 'master'
Fixes the markdown toolbar buttons
Closes #55618
See merge request gitlab-org/gitlab-ce!23979
(cherry picked from commit 82772caf727e3ea59513ffff6693bab1ee37b53f)
3019a567 Fixes the markdown toolbar buttons
-rw-r--r-- | app/assets/javascripts/lib/utils/text_markdown.js | 4 | ||||
-rw-r--r-- | changelogs/unreleased/markdown-toolbar-btn-fix.yml | 5 | ||||
-rw-r--r-- | spec/features/issues/user_creates_issue_spec.rb | 6 |
3 files changed, 12 insertions, 3 deletions
diff --git a/app/assets/javascripts/lib/utils/text_markdown.js b/app/assets/javascripts/lib/utils/text_markdown.js index c095a017866..1254ec798a6 100644 --- a/app/assets/javascripts/lib/utils/text_markdown.js +++ b/app/assets/javascripts/lib/utils/text_markdown.js @@ -82,7 +82,7 @@ export function insertMarkdownText({ tag, cursorOffset, blockTag, - selected, + selected = '', wrap, select, }) { @@ -212,7 +212,7 @@ export function addMarkdownListeners(form) { blockTag: $this.data('mdBlock'), wrap: !$this.data('mdPrepend'), select: $this.data('mdSelect'), - tagContent: $this.data('mdTagContent').toString(), + tagContent: $this.data('mdTagContent'), }); }); } diff --git a/changelogs/unreleased/markdown-toolbar-btn-fix.yml b/changelogs/unreleased/markdown-toolbar-btn-fix.yml new file mode 100644 index 00000000000..eefb4d19f86 --- /dev/null +++ b/changelogs/unreleased/markdown-toolbar-btn-fix.yml @@ -0,0 +1,5 @@ +--- +title: Fixed markdown toolbar buttons +merge_request: +author: +type: fixed diff --git a/spec/features/issues/user_creates_issue_spec.rb b/spec/features/issues/user_creates_issue_spec.rb index 687a6f1eafc..a2ab97b4116 100644 --- a/spec/features/issues/user_creates_issue_spec.rb +++ b/spec/features/issues/user_creates_issue_spec.rb @@ -12,7 +12,7 @@ describe "User creates issue" do visit(new_project_issue_path(project)) end - it "creates issue" do + it "creates issue", :js do page.within(".issue-form") do expect(page).to have_no_content("Assign to") .and have_no_content("Labels") @@ -25,11 +25,15 @@ describe "User creates issue" do issue_title = "500 error on profile" fill_in("Title", with: issue_title) + first('.js-md').click + first('.qa-issuable-form-description').native.send_keys('Description') + click_button("Submit issue") expect(page).to have_content(issue_title) .and have_content(user.name) .and have_content(project.name) + expect(page).to have_selector('strong', text: 'Description') end end |