From f248be7257e82d15fa6441c551e4314bd36343d4 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Fri, 9 Mar 2018 14:18:59 -0600 Subject: require jQuery to be explicitly imported --- spec/javascripts/notes_spec.js | 1 + 1 file changed, 1 insertion(+) (limited to 'spec/javascripts/notes_spec.js') diff --git a/spec/javascripts/notes_spec.js b/spec/javascripts/notes_spec.js index d4a148e6ab1..ba0a70bed17 100644 --- a/spec/javascripts/notes_spec.js +++ b/spec/javascripts/notes_spec.js @@ -1,4 +1,5 @@ /* eslint-disable space-before-function-paren, no-unused-expressions, no-var, object-shorthand, comma-dangle, max-len */ +import $ from 'jquery'; import _ from 'underscore'; import MockAdapter from 'axios-mock-adapter'; import axios from '~/lib/utils/axios_utils'; -- cgit v1.2.1 From c1708514f594040deedb87216945a29c3bc28bb9 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Mon, 19 Mar 2018 23:01:17 -0500 Subject: move render_gfm into behaviors directory --- spec/javascripts/notes_spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/javascripts/notes_spec.js') diff --git a/spec/javascripts/notes_spec.js b/spec/javascripts/notes_spec.js index ba0a70bed17..8f317b06792 100644 --- a/spec/javascripts/notes_spec.js +++ b/spec/javascripts/notes_spec.js @@ -7,7 +7,7 @@ import * as urlUtils from '~/lib/utils/url_utility'; import 'autosize'; import '~/gl_form'; import '~/lib/utils/text_utility'; -import '~/render_gfm'; +import '~/behaviors/markdown/render_gfm'; import Notes from '~/notes'; import timeoutPromise from './helpers/set_timeout_promise_helper'; -- cgit v1.2.1 From e1213ff6ae1750f7b08caed73089e3ffb0951c73 Mon Sep 17 00:00:00 2001 From: Jacob Schatz Date: Wed, 21 Mar 2018 15:45:23 -0400 Subject: Adds tests --- spec/javascripts/notes_spec.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'spec/javascripts/notes_spec.js') diff --git a/spec/javascripts/notes_spec.js b/spec/javascripts/notes_spec.js index 8f317b06792..1858d6b6474 100644 --- a/spec/javascripts/notes_spec.js +++ b/spec/javascripts/notes_spec.js @@ -549,6 +549,20 @@ import timeoutPromise from './helpers/set_timeout_promise_helper'; }); }); + it('should disable the submit button when comment button is clicked', (done) => { + expect($form.find('.js-comment-submit-button').is(':disabled')).toEqual(false); + + mockNotesPost(); + $('.js-comment-button').click(); + expect($form.find('.js-comment-submit-button').is(':disabled')).toEqual(true); + + setTimeout(() => { + expect($form.find('.js-comment-submit-button').is(':disabled')).toEqual(false); + + done(); + }); + }); + it('should show actual note element when new comment is done posting', (done) => { mockNotesPost(); -- cgit v1.2.1