kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

spec fixes

This commit is contained in:
Phil Hughes 2017-10-10 10:47:29 +01:00
parent 44d3745e51
commit 556ef5ed9f
No known key found for this signature in database
GPG Key ID: 32245528C52E0F9F
4 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/gl_field_errors.js
View File

@ -32,9 +32,9 @@ export default class GlFieldErrors {
const $form = $(e.currentTarget); const $form = $(e.currentTarget);
if (!$form.attr('novalidate')) { if (!$form.attr('novalidate')) {
if (!event.currentTarget.checkValidity()) { if (!e.currentTarget.checkValidity()) {
event.preventDefault(); e.preventDefault();
event.stopPropagation(); e.stopPropagation();
} }
} }
} }

4
app/assets/javascripts/notes.js
View File

@ -558,7 +558,7 @@ export default class Notes {
*/ */
setupNoteForm(form) { setupNoteForm(form) {
var textarea, key; var textarea, key;
new GLForm(form, this.enableGFM); this.glForm = new GLForm(form, this.enableGFM);
textarea = form.find('.js-note-text'); textarea = form.find('.js-note-text');
key = [ key = [
'Note', 'Note',
@ -1153,7 +1153,7 @@ export default class Notes {
var targetId = $originalContentEl.data('target-id'); var targetId = $originalContentEl.data('target-id');
var targetType = $originalContentEl.data('target-type'); var targetType = $originalContentEl.data('target-type');
new GLForm($editForm.find('form'), this.enableGFM); this.glForm = new GLForm($editForm.find('form'), this.enableGFM);
$editForm.find('form') $editForm.find('form')
.attr('action', postUrl) .attr('action', postUrl)

9
spec/javascripts/gl_form_spec.js
View File

@ -1,18 +1,11 @@
import autosize from 'vendor/autosize'; import autosize from 'vendor/autosize';
import '~/gl_form'; import GLForm from '~/gl_form';
import '~/lib/utils/text_utility'; import '~/lib/utils/text_utility';
import '~/lib/utils/common_utils'; import '~/lib/utils/common_utils';
window.autosize = autosize; window.autosize = autosize;
describe('GLForm', () => { describe('GLForm', () => {
const global = window.gl || (window.gl = {});
const GLForm = global.GLForm;
it('should be defined in the global scope', () => {
expect(GLForm).toBeDefined();
});
describe('when instantiated', function () { describe('when instantiated', function () {
beforeEach((done) => { beforeEach((done) => {
this.form = $('<form class="gfm-form"><textarea class="js-gfm-input"></form>'); this.form = $('<form class="gfm-form"><textarea class="js-gfm-input"></form>');

20
spec/javascripts/notes_spec.js
View File

@ -426,19 +426,17 @@ import '~/notes';
}); });
describe('putEditFormInPlace', () => { describe('putEditFormInPlace', () => {
it('should call gl.GLForm with GFM parameter passed through', () => { it('should call GLForm with GFM parameter passed through', () => {
spyOn(gl, 'GLForm'); const notes = new Notes('', []);
const $el = $(`
<div>
<form></form>
</div>
`);
const $el = jasmine.createSpyObj('$form', ['find', 'closest']); notes.putEditFormInPlace($el);
$el.find.and.returnValue($('<div>'));
$el.closest.and.returnValue($('<div>'));
Notes.prototype.putEditFormInPlace.call({ expect(notes.glForm.enableGFM).toBeTruthy();
getEditFormSelector: () => '',
enableGFM: true
}, $el);
expect(gl.GLForm).toHaveBeenCalledWith(jasmine.any(Object), true);
}); });
}); });