summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-08-04 21:57:03 +0100
committerFilipa Lacerda <filipa@gitlab.com>2017-08-04 21:57:03 +0100
commit7065bb3ef31fe04bea39aa07d620552eaaa26aba (patch)
treec049fec945e88341e9d119e0c9e4b1a3b3307a08
parentc28df4bce9bb1ca6f6cfb5861ab28fc2b08689e3 (diff)
downloadgitlab-ce-7065bb3ef31fe04bea39aa07d620552eaaa26aba.tar.gz
Fix vue broken test
-rw-r--r--app/assets/javascripts/notes/components/issue_comment_form.vue11
-rw-r--r--app/assets/javascripts/notes/components/issue_note_form.vue6
-rw-r--r--spec/javascripts/behaviors/quick_submit_spec.js6
-rw-r--r--spec/javascripts/notes/components/issue_placeholder_system_note_spec.js5
4 files changed, 14 insertions, 14 deletions
diff --git a/app/assets/javascripts/notes/components/issue_comment_form.vue b/app/assets/javascripts/notes/components/issue_comment_form.vue
index 15b9aacc028..45043818055 100644
--- a/app/assets/javascripts/notes/components/issue_comment_form.vue
+++ b/app/assets/javascripts/notes/components/issue_comment_form.vue
@@ -218,8 +218,10 @@
:img-size="40"
/>
</div>
- <div class="js-main-target-form timeline-content timeline-content-form common-note-form">
- <form>
+ <div >
+ <form
+ class="js-main-target-form timeline-content timeline-content-form common-note-form"
+ @submit="handleSave(true)">
<markdown-field
:markdown-preview-url="markdownPreviewUrl"
:markdown-docs="markdownDocsUrl"
@@ -228,7 +230,7 @@
<textarea
id="note-body"
name="note[note]"
- class="note-textarea js-gfm-input markdown-area"
+ class="note-textarea js-gfm-input js-autosize markdown-area"
data-supports-quick-actions="true"
aria-label="Description"
v-model="note"
@@ -300,8 +302,7 @@
</ul>
</div>
<button
- type="button"
- @click="handleSave(true)"
+ type="submit"
v-if="canUpdateIssue"
:class="actionButtonClassNames"
class="btn btn-nr btn-comment btn-comment-and-close">
diff --git a/app/assets/javascripts/notes/components/issue_note_form.vue b/app/assets/javascripts/notes/components/issue_note_form.vue
index 731080fd396..6bd5bd2d8a1 100644
--- a/app/assets/javascripts/notes/components/issue_note_form.vue
+++ b/app/assets/javascripts/notes/components/issue_note_form.vue
@@ -118,7 +118,8 @@
</div>
<div class="flash-container timeline-content"></div>
<form
- class="edit-note common-note-form js-vue-quick-submit">
+ class="edit-note common-note-form"
+ @submit="handleUpdate">
<markdown-field
:markdown-preview-url="markdownPreviewUrl"
:markdown-docs="markdownDocsUrl"
@@ -141,8 +142,7 @@
</markdown-field>
<div class="note-form-actions clearfix">
<button
- type="button"
- @click="handleUpdate"
+ type="submit"
:disabled="isDisabled"
class="btn btn-nr btn-save">
{{saveButtonTitle}}
diff --git a/spec/javascripts/behaviors/quick_submit_spec.js b/spec/javascripts/behaviors/quick_submit_spec.js
index 0d3f3e9673a..6dc48f9a293 100644
--- a/spec/javascripts/behaviors/quick_submit_spec.js
+++ b/spec/javascripts/behaviors/quick_submit_spec.js
@@ -38,19 +38,19 @@ import '~/behaviors/quick_submit';
return expect(this.spies.submit).not.toHaveBeenTriggered();
});
it('disables input of type submit', function() {
- const submitButton = $('.js-vue-quick-submit input[type=submit]');
+ const submitButton = $('.js-quick-submit input[type=submit]');
this.textarea.trigger(keydownEvent());
expect(submitButton).toBeDisabled();
});
it('disables button of type submit', function() {
- const submitButton = $('.js-vue-quick-submit input[type=submit]');
+ const submitButton = $('.js-quick-submit input[type=submit]');
this.textarea.trigger(keydownEvent());
expect(submitButton).toBeDisabled();
});
it('only clicks one submit', function() {
- const existingSubmit = $('.js-vue-quick-submit input[type=submit]');
+ const existingSubmit = $('.js-quick-submit input[type=submit]');
// Add an extra submit button
const newSubmit = $('<button type="submit">Submit it</button>');
newSubmit.insertAfter(this.textarea);
diff --git a/spec/javascripts/notes/components/issue_placeholder_system_note_spec.js b/spec/javascripts/notes/components/issue_placeholder_system_note_spec.js
index fd28b33d60b..d508a49f710 100644
--- a/spec/javascripts/notes/components/issue_placeholder_system_note_spec.js
+++ b/spec/javascripts/notes/components/issue_placeholder_system_note_spec.js
@@ -18,8 +18,7 @@ describe('issue placeholder system note component', () => {
it('should render system note placeholder with plain text', () => {
const vm = mountComponent('This is a placeholder');
- expect(vm.$el.tagName).toEqua('LI');
-
- expect(vm.$el.querySelector('.timeline-content i').textContent.trim()).toEqua('This is a placeholder');
+ expect(vm.$el.tagName).toEqual('LI');
+ expect(vm.$el.querySelector('.timeline-content em').textContent.trim()).toEqual('This is a placeholder');
});
});