From 8c7eab92cd0009f55cb999bbade43e0f969c137e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 23 Oct 2019 03:06:01 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/frontend/wikis_spec.js | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) (limited to 'spec/frontend/wikis_spec.js') diff --git a/spec/frontend/wikis_spec.js b/spec/frontend/wikis_spec.js index b2475488d97..a2b68bf866e 100644 --- a/spec/frontend/wikis_spec.js +++ b/spec/frontend/wikis_spec.js @@ -3,27 +3,27 @@ import { setHTMLFixture } from './helpers/fixtures'; describe('Wikis', () => { describe('setting the commit message when the title changes', () => { - const editFormHtmlFixture = args => `
- - -
`; - let wikis; let titleInput; let messageInput; + const CREATE = true; + const UPDATE = false; - describe('when the wiki page is being created', () => { - const formHtmlFixture = editFormHtmlFixture({ newPage: true }); + const editFormHtmlFixture = newPage => + `
+ + +
`; - beforeEach(() => { - setHTMLFixture(formHtmlFixture); + const init = newPage => { + setHTMLFixture(editFormHtmlFixture(newPage)); + titleInput = document.getElementById('wiki_page_title'); + messageInput = document.getElementById('wiki_page_message'); + wikis = new Wikis(); + }; - titleInput = document.getElementById('wiki_title'); - messageInput = document.getElementById('wiki_message'); - wikis = new Wikis(); - }); + describe('when the wiki page is being created', () => { + beforeEach(() => init(CREATE)); it('binds an event listener to the title input', () => { wikis.handleWikiTitleChange = jest.fn(); @@ -51,15 +51,7 @@ describe('Wikis', () => { }); describe('when the wiki page is being updated', () => { - const formHtmlFixture = editFormHtmlFixture({ newPage: false }); - - beforeEach(() => { - setHTMLFixture(formHtmlFixture); - - titleInput = document.getElementById('wiki_title'); - messageInput = document.getElementById('wiki_message'); - wikis = new Wikis(); - }); + beforeEach(() => init(UPDATE)); it('sets the commit message when title changes, prefixing with "Update"', () => { titleInput.value = 'My title'; -- cgit v1.2.1