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

Fix MR and issue specs

Browse source
This commit is contained in:
Luke "Jared" Bennett 2017-07-07 16:04:43 +01:00
parent c7f23e2564
commit f28cd19dde
No known key found for this signature in database
GPG key ID: 402ED51FB5D306C2
4 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/helpers/issuables_helper.js
View file

@ -1,6 +1,6 @@
import CloseReopenReportToggle from '../close_reopen_report_toggle'; import CloseReopenReportToggle from '../close_reopen_report_toggle';
export default function initCloseReopenReport() { function initCloseReopenReport() {
const container = document.querySelector('.js-issuable-close-dropdown'); const container = document.querySelector('.js-issuable-close-dropdown');
if (!container) return undefined; if (!container) return undefined;
@ -19,3 +19,9 @@ export default function initCloseReopenReport() {
return closeReopenReportToggle; return closeReopenReportToggle;
} }
const IssuablesHelper = {
initCloseReopenReport,
};
export default IssuablesHelper;

8
app/assets/javascripts/issue.js
View file

@ -6,7 +6,7 @@ import '~/lib/utils/text_utility';
import './flash'; import './flash';
import './task_list'; import './task_list';
import CreateMergeRequestDropdown from './create_merge_request_dropdown'; import CreateMergeRequestDropdown from './create_merge_request_dropdown';
import initCloseReopenReport from './helpers/issuables_helper'; import IssuablesHelper from './helpers/issuables_helper';
class Issue { class Issue {
constructor() { constructor() {
@ -98,10 +98,10 @@ class Issue {
} }
initCloseReopenReport() { initCloseReopenReport() {
this.closeReopenReportToggle = initCloseReopenReport(); this.closeReopenReportToggle = IssuablesHelper.initCloseReopenReport();
this.closeButtons = this.closeButtons.not('.issuable-close-button'); if (this.closeButtons) this.closeButtons = this.closeButtons.not('.issuable-close-button');
this.reopenButtons = this.reopenButtons.not('.issuable-close-button'); if (this.reopenButtons) this.reopenButtons = this.reopenButtons.not('.issuable-close-button');
} }
disableCloseReopenButton($button, shouldDisable) { disableCloseReopenButton($button, shouldDisable) {

4
app/assets/javascripts/merge_request.js
View file

@ -4,7 +4,7 @@
import 'vendor/jquery.waitforimages'; import 'vendor/jquery.waitforimages';
import './task_list'; import './task_list';
import './merge_request_tabs'; import './merge_request_tabs';
import initCloseReopenReport from './helpers/issuables_helper'; import IssuablesHelper from './helpers/issuables_helper';
(function() { (function() {
this.MergeRequest = (function() { this.MergeRequest = (function() {
@ -26,7 +26,7 @@ import initCloseReopenReport from './helpers/issuables_helper';
this.initTabs(); this.initTabs();
this.initMRBtnListeners(); this.initMRBtnListeners();
this.initCommitMessageListeners(); this.initCommitMessageListeners();
this.closeReopenReportToggle = initCloseReopenReport(); this.closeReopenReportToggle = IssuablesHelper.initCloseReopenReport();
if ($("a.btn-close").length) { if ($("a.btn-close").length) {
this.taskList = new gl.TaskList({ this.taskList = new gl.TaskList({

13
spec/javascripts/merge_request_spec.js
View file

@ -3,6 +3,7 @@
import '~/merge_request'; import '~/merge_request';
import CloseReopenReportToggle from '~/close_reopen_report_toggle'; import CloseReopenReportToggle from '~/close_reopen_report_toggle';
import IssuablesHelper from '~/helpers/issuables_helper';
(function() { (function() {
describe('MergeRequest', function() { describe('MergeRequest', function() {
@ -31,28 +32,24 @@ import CloseReopenReportToggle from '~/close_reopen_report_toggle';
describe('class constructor', () => { describe('class constructor', () => {
it('calls .initCloseReopenReport', () => { it('calls .initCloseReopenReport', () => {
spyOn(MergeRequest.prototype, 'initCloseReopenReport'); spyOn(IssuablesHelper, 'initCloseReopenReport');
const mergeRequest = new MergeRequest(); new MergeRequest(); // eslint-disable-line no-new
expect(mergeRequest.initCloseReopenReport).toHaveBeenCalled(); expect(IssuablesHelper.initCloseReopenReport).toHaveBeenCalled();
}); });
});
describe('initCloseReopenReport', () => {
it('calls .initDroplab', () => { it('calls .initDroplab', () => {
const container = jasmine.createSpyObj('container', ['querySelector']); const container = jasmine.createSpyObj('container', ['querySelector']);
const dropdownTrigger = {}; const dropdownTrigger = {};
const dropdownList = {}; const dropdownList = {};
const button = {}; const button = {};
const mergeRequest = new MergeRequest();
spyOn(CloseReopenReportToggle.prototype, 'initDroplab'); spyOn(CloseReopenReportToggle.prototype, 'initDroplab');
spyOn(document, 'querySelector').and.returnValue(container); spyOn(document, 'querySelector').and.returnValue(container);
container.querySelector.and.returnValues(dropdownTrigger, dropdownList, button); container.querySelector.and.returnValues(dropdownTrigger, dropdownList, button);
mergeRequest.initCloseReopenReport(); new MergeRequest(); // eslint-disable-line no-new
expect(document.querySelector).toHaveBeenCalledWith('.js-issuable-close-dropdown'); expect(document.querySelector).toHaveBeenCalledWith('.js-issuable-close-dropdown');
expect(container.querySelector).toHaveBeenCalledWith('.js-issuable-close-toggle'); expect(container.querySelector).toHaveBeenCalledWith('.js-issuable-close-toggle');