summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-09-15 15:06:18 +0000
committerFatih Acet <acetfatih@gmail.com>2016-09-15 15:06:18 +0000
commit247ae1317492ffd36c7a120101ecb242bcdaf93e (patch)
tree6882a6a67665b2a1f866797c42002ff32d54d0b4 /spec
parent4b6fd0df62a987d9a5f6f0ba3df8a986396901e0 (diff)
parent287663b2b11c052906aefe42354f75718f980568 (diff)
downloadgitlab-ce-247ae1317492ffd36c7a120101ecb242bcdaf93e.tar.gz
Merge branch 'issue-description-scroll-fix' into 'master'
Trigger autosize update after template selection ## What does this MR do? Triggers an autosize update after selecting an issue template. The autosize plugin doesn't react to value changes and therefore doesn't automatically update when the user selects the template. This merge request adds it so that it detects if the editor the template selector is a jQuery object (not Ace editor) & then triggers the autosize event to allow the user to scroll the textarea. ## Screenshots (if relevant) ![resize](/uploads/1ab04b4202309b13f1178e04c0953112/resize.gif) ## What are the relevant issue numbers? Closes #21982 See merge request !6282
Diffstat (limited to 'spec')
-rw-r--r--spec/features/projects/issuable_templates_spec.rb13
1 files changed, 13 insertions, 0 deletions
diff --git a/spec/features/projects/issuable_templates_spec.rb b/spec/features/projects/issuable_templates_spec.rb
index 4a83740621a..d0f4e5469ed 100644
--- a/spec/features/projects/issuable_templates_spec.rb
+++ b/spec/features/projects/issuable_templates_spec.rb
@@ -13,10 +13,12 @@ feature 'issuable templates', feature: true, js: true do
context 'user creates an issue using templates' do
let(:template_content) { 'this is a test "bug" template' }
+ let(:longtemplate_content) { %Q(this\n\n\n\n\nis\n\n\n\n\na\n\n\n\n\nbug\n\n\n\n\ntemplate) }
let(:issue) { create(:issue, author: user, assignee: user, project: project) }
background do
project.repository.commit_file(user, '.gitlab/issue_templates/bug.md', template_content, 'added issue template', 'master', false)
+ project.repository.commit_file(user, '.gitlab/issue_templates/test.md', longtemplate_content, 'added issue template', 'master', false)
visit edit_namespace_project_issue_path project.namespace, project, issue
fill_in :'issue[title]', with: 'test issue title'
end
@@ -27,6 +29,17 @@ feature 'issuable templates', feature: true, js: true do
preview_template
save_changes
end
+
+ it 'updates height of markdown textarea' do
+ start_height = page.evaluate_script('$(".markdown-area").outerHeight()')
+
+ select_template 'test'
+ wait_for_ajax
+
+ end_height = page.evaluate_script('$(".markdown-area").outerHeight()')
+
+ expect(end_height).not_to eq(start_height)
+ end
end
context 'user creates a merge request using templates' do