Merge branch 'markdown-toolbar-btn-fix' into 'master'
Fixes the markdown toolbar buttons Closes #55618 See merge request gitlab-org/gitlab-ce!23979
This commit is contained in:
commit
82772caf72
3 changed files with 12 additions and 3 deletions
|
@ -82,7 +82,7 @@ export function insertMarkdownText({
|
||||||
tag,
|
tag,
|
||||||
cursorOffset,
|
cursorOffset,
|
||||||
blockTag,
|
blockTag,
|
||||||
selected,
|
selected = '',
|
||||||
wrap,
|
wrap,
|
||||||
select,
|
select,
|
||||||
}) {
|
}) {
|
||||||
|
@ -212,7 +212,7 @@ export function addMarkdownListeners(form) {
|
||||||
blockTag: $this.data('mdBlock'),
|
blockTag: $this.data('mdBlock'),
|
||||||
wrap: !$this.data('mdPrepend'),
|
wrap: !$this.data('mdPrepend'),
|
||||||
select: $this.data('mdSelect'),
|
select: $this.data('mdSelect'),
|
||||||
tagContent: $this.data('mdTagContent').toString(),
|
tagContent: $this.data('mdTagContent'),
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
5
changelogs/unreleased/markdown-toolbar-btn-fix.yml
Normal file
5
changelogs/unreleased/markdown-toolbar-btn-fix.yml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Fixed markdown toolbar buttons
|
||||||
|
merge_request:
|
||||||
|
author:
|
||||||
|
type: fixed
|
|
@ -14,7 +14,7 @@ describe "User creates issue" do
|
||||||
visit(new_project_issue_path(project))
|
visit(new_project_issue_path(project))
|
||||||
end
|
end
|
||||||
|
|
||||||
it "creates issue" do
|
it "creates issue", :js do
|
||||||
page.within(".issue-form") do
|
page.within(".issue-form") do
|
||||||
expect(page).to have_no_content("Assign to")
|
expect(page).to have_no_content("Assign to")
|
||||||
.and have_no_content("Labels")
|
.and have_no_content("Labels")
|
||||||
|
@ -27,11 +27,15 @@ describe "User creates issue" do
|
||||||
issue_title = "500 error on profile"
|
issue_title = "500 error on profile"
|
||||||
|
|
||||||
fill_in("Title", with: issue_title)
|
fill_in("Title", with: issue_title)
|
||||||
|
first('.js-md').click
|
||||||
|
first('.qa-issuable-form-description').native.send_keys('Description')
|
||||||
|
|
||||||
click_button("Submit issue")
|
click_button("Submit issue")
|
||||||
|
|
||||||
expect(page).to have_content(issue_title)
|
expect(page).to have_content(issue_title)
|
||||||
.and have_content(user.name)
|
.and have_content(user.name)
|
||||||
.and have_content(project.name)
|
.and have_content(project.name)
|
||||||
|
expect(page).to have_selector('strong', text: 'Description')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue