Commit 7a3e6053 authored by Mike Greiling's avatar Mike Greiling

Resolve eslint violations

parent 024c31fe
...@@ -13,8 +13,8 @@ describe('Linked Tabs', () => { ...@@ -13,8 +13,8 @@ describe('Linked Tabs', () => {
}); });
it('should activate the tab correspondent to the given action', () => { it('should activate the tab correspondent to the given action', () => {
const linkedTabs = new LinkedTabs({ // eslint-disable-next-line no-new
// eslint-disable-line new LinkedTabs({
action: 'tab1', action: 'tab1',
defaultAction: 'tab1', defaultAction: 'tab1',
parentEl: '.linked-tabs', parentEl: '.linked-tabs',
...@@ -24,8 +24,8 @@ describe('Linked Tabs', () => { ...@@ -24,8 +24,8 @@ describe('Linked Tabs', () => {
}); });
it('should active the default tab action when the action is show', () => { it('should active the default tab action when the action is show', () => {
const linkedTabs = new LinkedTabs({ // eslint-disable-next-line no-new
// eslint-disable-line new LinkedTabs({
action: 'show', action: 'show',
defaultAction: 'tab1', defaultAction: 'tab1',
parentEl: '.linked-tabs', parentEl: '.linked-tabs',
......
...@@ -23,6 +23,7 @@ describe('NativeFormVariableList', () => { ...@@ -23,6 +23,7 @@ describe('NativeFormVariableList', () => {
expect($row.find('.js-ci-variable-input-key').attr('name')).toBe( expect($row.find('.js-ci-variable-input-key').attr('name')).toBe(
'schedule[variables_attributes][][key]', 'schedule[variables_attributes][][key]',
); );
expect($row.find('.js-ci-variable-input-value').attr('name')).toBe( expect($row.find('.js-ci-variable-input-value').attr('name')).toBe(
'schedule[variables_attributes][][secret_value]', 'schedule[variables_attributes][][secret_value]',
); );
......
...@@ -239,6 +239,7 @@ describe('Application Row', () => { ...@@ -239,6 +239,7 @@ describe('Application Row', () => {
expect(generalErrorMessage.textContent.trim()).toEqual( expect(generalErrorMessage.textContent.trim()).toEqual(
`Something went wrong while installing ${DEFAULT_APPLICATION_STATE.title}`, `Something went wrong while installing ${DEFAULT_APPLICATION_STATE.title}`,
); );
expect(statusErrorMessage.textContent.trim()).toEqual(statusReason); expect(statusErrorMessage.textContent.trim()).toEqual(statusReason);
}); });
...@@ -260,6 +261,7 @@ describe('Application Row', () => { ...@@ -260,6 +261,7 @@ describe('Application Row', () => {
expect(generalErrorMessage.textContent.trim()).toEqual( expect(generalErrorMessage.textContent.trim()).toEqual(
`Something went wrong while installing ${DEFAULT_APPLICATION_STATE.title}`, `Something went wrong while installing ${DEFAULT_APPLICATION_STATE.title}`,
); );
expect(requestErrorMessage.textContent.trim()).toEqual(requestReason); expect(requestErrorMessage.textContent.trim()).toEqual(requestReason);
}); });
}); });
......
...@@ -43,6 +43,7 @@ describe('Actions Component', () => { ...@@ -43,6 +43,7 @@ describe('Actions Component', () => {
expect( expect(
component.$el.querySelector('.dropdown-new').getAttribute('data-original-title'), component.$el.querySelector('.dropdown-new').getAttribute('data-original-title'),
).toEqual('Deploy to...'); ).toEqual('Deploy to...');
expect(component.$el.querySelector('.dropdown-new').getAttribute('aria-label')).toEqual( expect(component.$el.querySelector('.dropdown-new').getAttribute('aria-label')).toEqual(
'Deploy to...', 'Deploy to...',
); );
......
...@@ -138,6 +138,7 @@ describe('Filtered Search Visual Tokens', () => { ...@@ -138,6 +138,7 @@ describe('Filtered Search Visual Tokens', () => {
expect(subject.getEndpointWithQueryParams(endpoint, singleQueryParams)).toBe( expect(subject.getEndpointWithQueryParams(endpoint, singleQueryParams)).toBe(
`${endpoint}?foo=true`, `${endpoint}?foo=true`,
); );
expect(subject.getEndpointWithQueryParams(endpoint, multipleQueryParams)).toBe( expect(subject.getEndpointWithQueryParams(endpoint, multipleQueryParams)).toBe(
`${endpoint}?foo=true&bar=true`, `${endpoint}?foo=true&bar=true`,
); );
......
...@@ -90,9 +90,11 @@ describe('ReplacedImageDiff', () => { ...@@ -90,9 +90,11 @@ describe('ReplacedImageDiff', () => {
expect(imageFrameEls[viewTypes.TWO_UP]).toEqual( expect(imageFrameEls[viewTypes.TWO_UP]).toEqual(
element.querySelector('.two-up .js-image-frame'), element.querySelector('.two-up .js-image-frame'),
); );
expect(imageFrameEls[viewTypes.SWIPE]).toEqual( expect(imageFrameEls[viewTypes.SWIPE]).toEqual(
element.querySelector('.swipe .js-image-frame'), element.querySelector('.swipe .js-image-frame'),
); );
expect(imageFrameEls[viewTypes.ONION_SKIN]).toEqual( expect(imageFrameEls[viewTypes.ONION_SKIN]).toEqual(
element.querySelector('.onion-skin .js-image-frame'), element.querySelector('.onion-skin .js-image-frame'),
); );
...@@ -105,9 +107,11 @@ describe('ReplacedImageDiff', () => { ...@@ -105,9 +107,11 @@ describe('ReplacedImageDiff', () => {
expect(viewModesEls[viewTypes.TWO_UP]).toEqual( expect(viewModesEls[viewTypes.TWO_UP]).toEqual(
element.querySelector('.view-modes-menu .two-up'), element.querySelector('.view-modes-menu .two-up'),
); );
expect(viewModesEls[viewTypes.SWIPE]).toEqual( expect(viewModesEls[viewTypes.SWIPE]).toEqual(
element.querySelector('.view-modes-menu .swipe'), element.querySelector('.view-modes-menu .swipe'),
); );
expect(viewModesEls[viewTypes.ONION_SKIN]).toEqual( expect(viewModesEls[viewTypes.ONION_SKIN]).toEqual(
element.querySelector('.view-modes-menu .onion-skin'), element.querySelector('.view-modes-menu .onion-skin'),
); );
......
...@@ -164,6 +164,7 @@ describe('IntegrationSettingsForm', () => { ...@@ -164,6 +164,7 @@ describe('IntegrationSettingsForm', () => {
.text() .text()
.trim(), .trim(),
).toEqual('Test failed. some error'); ).toEqual('Test failed. some error');
expect($flashContainer.find('.flash-action')).toBeDefined(); expect($flashContainer.find('.flash-action')).toBeDefined();
expect( expect(
$flashContainer $flashContainer
...@@ -197,6 +198,7 @@ describe('IntegrationSettingsForm', () => { ...@@ -197,6 +198,7 @@ describe('IntegrationSettingsForm', () => {
.text() .text()
.trim(), .trim(),
).toEqual('Validations failed. some error'); ).toEqual('Validations failed. some error');
expect($flashContainer.find('.flash-action')).toBeDefined(); expect($flashContainer.find('.flash-action')).toBeDefined();
expect( expect(
$flashContainer $flashContainer
......
...@@ -74,6 +74,7 @@ describe('Issuable output', () => { ...@@ -74,6 +74,7 @@ describe('Issuable output', () => {
expect(vm.$el.querySelector('.js-task-list-field').value).toContain( expect(vm.$el.querySelector('.js-task-list-field').value).toContain(
'this is a description', 'this is a description',
); );
expect(formatText(editedText.innerText)).toMatch(/Edited[\s\S]+?by Some User/); expect(formatText(editedText.innerText)).toMatch(/Edited[\s\S]+?by Some User/);
expect(editedText.querySelector('.author-link').href).toMatch(/\/some_user$/); expect(editedText.querySelector('.author-link').href).toMatch(/\/some_user$/);
expect(editedText.querySelector('time')).toBeTruthy(); expect(editedText.querySelector('time')).toBeTruthy();
...@@ -91,6 +92,7 @@ describe('Issuable output', () => { ...@@ -91,6 +92,7 @@ describe('Issuable output', () => {
expect(formatText(vm.$el.querySelector('.edited-text').innerText)).toMatch( expect(formatText(vm.$el.querySelector('.edited-text').innerText)).toMatch(
/Edited[\s\S]+?by Other User/, /Edited[\s\S]+?by Other User/,
); );
expect(editedText.querySelector('.author-link').href).toMatch(/\/other_user$/); expect(editedText.querySelector('.author-link').href).toMatch(/\/other_user$/);
expect(editedText.querySelector('time')).toBeTruthy(); expect(editedText.querySelector('time')).toBeTruthy();
}) })
...@@ -294,8 +296,9 @@ describe('Issuable output', () => { ...@@ -294,8 +296,9 @@ describe('Issuable output', () => {
it('opens recaptcha modal if update rejected as spam', done => { it('opens recaptcha modal if update rejected as spam', done => {
function mockScriptSrc() { function mockScriptSrc() {
const recaptchaChild = vm.$children.find( const recaptchaChild = vm.$children.find(
// eslint-disable-next-line no-underscore-dangle
child => child.$options._componentTag === 'recaptcha-modal', child => child.$options._componentTag === 'recaptcha-modal',
); // eslint-disable-line no-underscore-dangle );
recaptchaChild.scriptSrc = '//scriptsrc'; recaptchaChild.scriptSrc = '//scriptsrc';
} }
......
...@@ -54,8 +54,9 @@ describe('Description component', () => { ...@@ -54,8 +54,9 @@ describe('Description component', () => {
it('opens recaptcha dialog if update rejected as spam', done => { it('opens recaptcha dialog if update rejected as spam', done => {
let modal; let modal;
const recaptchaChild = vm.$children.find( const recaptchaChild = vm.$children.find(
// eslint-disable-next-line no-underscore-dangle
child => child.$options._componentTag === 'recaptcha-modal', child => child.$options._componentTag === 'recaptcha-modal',
); // eslint-disable-line no-underscore-dangle );
recaptchaChild.scriptSrc = '//scriptsrc'; recaptchaChild.scriptSrc = '//scriptsrc';
......
...@@ -51,10 +51,12 @@ describe('Trigger block', () => { ...@@ -51,10 +51,12 @@ describe('Trigger block', () => {
expect(vm.$el.querySelector('.js-build-variables').textContent).toContain( expect(vm.$el.querySelector('.js-build-variables').textContent).toContain(
'UPLOAD_TO_GCS', 'UPLOAD_TO_GCS',
); );
expect(vm.$el.querySelector('.js-build-variables').textContent).toContain('false'); expect(vm.$el.querySelector('.js-build-variables').textContent).toContain('false');
expect(vm.$el.querySelector('.js-build-variables').textContent).toContain( expect(vm.$el.querySelector('.js-build-variables').textContent).toContain(
'UPLOAD_TO_S3', 'UPLOAD_TO_S3',
); );
expect(vm.$el.querySelector('.js-build-variables').textContent).toContain('true'); expect(vm.$el.querySelector('.js-build-variables').textContent).toContain('true');
}) })
.then(done) .then(done)
......
...@@ -59,9 +59,11 @@ describe('EmptyState', () => { ...@@ -59,9 +59,11 @@ describe('EmptyState', () => {
expect(getTextFromNode(component, '.state-title')).toEqual( expect(getTextFromNode(component, '.state-title')).toEqual(
component.states.gettingStarted.title, component.states.gettingStarted.title,
); );
expect(getTextFromNode(component, '.state-description')).toEqual( expect(getTextFromNode(component, '.state-description')).toEqual(
component.states.gettingStarted.description, component.states.gettingStarted.description,
); );
expect(getTextFromNode(component, '.btn-success')).toEqual( expect(getTextFromNode(component, '.btn-success')).toEqual(
component.states.gettingStarted.buttonText, component.states.gettingStarted.buttonText,
); );
...@@ -77,6 +79,7 @@ describe('EmptyState', () => { ...@@ -77,6 +79,7 @@ describe('EmptyState', () => {
expect(getTextFromNode(component, '.state-description')).toEqual( expect(getTextFromNode(component, '.state-description')).toEqual(
component.states.loading.description, component.states.loading.description,
); );
expect(getTextFromNode(component, '.btn-success')).toEqual(component.states.loading.buttonText); expect(getTextFromNode(component, '.btn-success')).toEqual(component.states.loading.buttonText);
}); });
...@@ -89,6 +92,7 @@ describe('EmptyState', () => { ...@@ -89,6 +92,7 @@ describe('EmptyState', () => {
expect(getTextFromNode(component, '.state-title')).toEqual( expect(getTextFromNode(component, '.state-title')).toEqual(
component.states.unableToConnect.title, component.states.unableToConnect.title,
); );
expect(component.$el.querySelector('.state-description a')).toBeDefined(); expect(component.$el.querySelector('.state-description a')).toBeDefined();
expect(getTextFromNode(component, '.btn-success')).toEqual( expect(getTextFromNode(component, '.btn-success')).toEqual(
component.states.unableToConnect.buttonText, component.states.unableToConnect.buttonText,
......
/* eslint-disable one-var, no-var, no-return-assign */
import $ from 'jquery'; import $ from 'jquery';
import NewBranchForm from '~/new_branch_form'; import NewBranchForm from '~/new_branch_form';
describe('Branch', function() { describe('Branch', function() {
describe('create a new branch', function() { describe('create a new branch', function() {
var expectToHaveError, fillNameWith;
preloadFixtures('branches/new_branch.html.raw'); preloadFixtures('branches/new_branch.html.raw');
fillNameWith = function(value) {
return $('.js-branch-name') function fillNameWith(value) {
$('.js-branch-name')
.val(value) .val(value)
.trigger('blur'); .trigger('blur');
}; }
expectToHaveError = function(error) {
function expectToHaveError(error) {
expect($('.js-branch-name-error span').text()).toEqual(error); expect($('.js-branch-name-error span').text()).toEqual(error);
}; }
beforeEach(function() { beforeEach(function() {
loadFixtures('branches/new_branch.html.raw'); loadFixtures('branches/new_branch.html.raw');
$('form').on('submit', function(e) { $('form').on('submit', function(e) {
return e.preventDefault(); return e.preventDefault();
}); });
return (this.form = new NewBranchForm($('.js-create-branch-form'), [])); this.form = new NewBranchForm($('.js-create-branch-form'), []);
}); });
it("can't start with a dot", function() { it("can't start with a dot", function() {
fillNameWith('.foo'); fillNameWith('.foo');
return expectToHaveError("can't start with '.'"); expectToHaveError("can't start with '.'");
}); });
it("can't start with a slash", function() { it("can't start with a slash", function() {
fillNameWith('/foo'); fillNameWith('/foo');
return expectToHaveError("can't start with '/'"); expectToHaveError("can't start with '/'");
}); });
it("can't have two consecutive dots", function() { it("can't have two consecutive dots", function() {
fillNameWith('foo..bar'); fillNameWith('foo..bar');
return expectToHaveError("can't contain '..'"); expectToHaveError("can't contain '..'");
}); });
it("can't have spaces anywhere", function() { it("can't have spaces anywhere", function() {
...@@ -44,7 +44,7 @@ describe('Branch', function() { ...@@ -44,7 +44,7 @@ describe('Branch', function() {
fillNameWith('foo bar'); fillNameWith('foo bar');
expectToHaveError("can't contain spaces"); expectToHaveError("can't contain spaces");
fillNameWith('foo '); fillNameWith('foo ');
return expectToHaveError("can't contain spaces"); expectToHaveError("can't contain spaces");
}); });
it("can't have ~ anywhere", function() { it("can't have ~ anywhere", function() {
...@@ -53,7 +53,7 @@ describe('Branch', function() { ...@@ -53,7 +53,7 @@ describe('Branch', function() {
fillNameWith('foo~bar'); fillNameWith('foo~bar');
expectToHaveError("can't contain '~'"); expectToHaveError("can't contain '~'");
fillNameWith('foo~'); fillNameWith('foo~');
return expectToHaveError("can't contain '~'"); expectToHaveError("can't contain '~'");
}); });
it("can't have tilde anwhere", function() { it("can't have tilde anwhere", function() {
...@@ -62,7 +62,7 @@ describe('Branch', function() { ...@@ -62,7 +62,7 @@ describe('Branch', function() {
fillNameWith('foo~bar'); fillNameWith('foo~bar');
expectToHaveError("can't contain '~'"); expectToHaveError("can't contain '~'");
fillNameWith('foo~'); fillNameWith('foo~');
return expectToHaveError("can't contain '~'"); expectToHaveError("can't contain '~'");
}); });
it("can't have caret anywhere", function() { it("can't have caret anywhere", function() {
...@@ -71,7 +71,7 @@ describe('Branch', function() { ...@@ -71,7 +71,7 @@ describe('Branch', function() {
fillNameWith('foo^bar'); fillNameWith('foo^bar');
expectToHaveError("can't contain '^'"); expectToHaveError("can't contain '^'");
fillNameWith('foo^'); fillNameWith('foo^');
return expectToHaveError("can't contain '^'"); expectToHaveError("can't contain '^'");
}); });
it("can't have : anywhere", function() { it("can't have : anywhere", function() {
...@@ -80,7 +80,7 @@ describe('Branch', function() { ...@@ -80,7 +80,7 @@ describe('Branch', function() {
fillNameWith('foo:bar'); fillNameWith('foo:bar');
expectToHaveError("can't contain ':'"); expectToHaveError("can't contain ':'");
fillNameWith(':foo'); fillNameWith(':foo');
return expectToHaveError("can't contain ':'"); expectToHaveError("can't contain ':'");
}); });
it("can't have question mark anywhere", function() { it("can't have question mark anywhere", function() {
...@@ -89,7 +89,7 @@ describe('Branch', function() { ...@@ -89,7 +89,7 @@ describe('Branch', function() {
fillNameWith('foo?bar'); fillNameWith('foo?bar');
expectToHaveError("can't contain '?'"); expectToHaveError("can't contain '?'");
fillNameWith('foo?'); fillNameWith('foo?');
return expectToHaveError("can't contain '?'"); expectToHaveError("can't contain '?'");
}); });
it("can't have asterisk anywhere", function() { it("can't have asterisk anywhere", function() {
...@@ -98,7 +98,7 @@ describe('Branch', function() { ...@@ -98,7 +98,7 @@ describe('Branch', function() {
fillNameWith('foo*bar'); fillNameWith('foo*bar');
expectToHaveError("can't contain '*'"); expectToHaveError("can't contain '*'");
fillNameWith('foo*'); fillNameWith('foo*');
return expectToHaveError("can't contain '*'"); expectToHaveError("can't contain '*'");
}); });
it("can't have open bracket anywhere", function() { it("can't have open bracket anywhere", function() {
...@@ -107,7 +107,7 @@ describe('Branch', function() { ...@@ -107,7 +107,7 @@ describe('Branch', function() {
fillNameWith('foo[bar'); fillNameWith('foo[bar');
expectToHaveError("can't contain '['"); expectToHaveError("can't contain '['");
fillNameWith('foo['); fillNameWith('foo[');
return expectToHaveError("can't contain '['"); expectToHaveError("can't contain '['");
}); });
it("can't have a backslash anywhere", function() { it("can't have a backslash anywhere", function() {
...@@ -116,7 +116,7 @@ describe('Branch', function() { ...@@ -116,7 +116,7 @@ describe('Branch', function() {
fillNameWith('foo\\bar'); fillNameWith('foo\\bar');
expectToHaveError("can't contain '\\'"); expectToHaveError("can't contain '\\'");
fillNameWith('foo\\'); fillNameWith('foo\\');
return expectToHaveError("can't contain '\\'"); expectToHaveError("can't contain '\\'");
}); });
it("can't contain a sequence @{ anywhere", function() { it("can't contain a sequence @{ anywhere", function() {
...@@ -125,44 +125,42 @@ describe('Branch', function() { ...@@ -125,44 +125,42 @@ describe('Branch', function() {
fillNameWith('foo@{bar'); fillNameWith('foo@{bar');
expectToHaveError("can't contain '@{'"); expectToHaveError("can't contain '@{'");
fillNameWith('foo@{'); fillNameWith('foo@{');
return expectToHaveError("can't contain '@{'"); expectToHaveError("can't contain '@{'");
}); });
it("can't have consecutive slashes", function() { it("can't have consecutive slashes", function() {
fillNameWith('foo//bar'); fillNameWith('foo//bar');
return expectToHaveError("can't contain consecutive slashes"); expectToHaveError("can't contain consecutive slashes");
}); });
it("can't end with a slash", function() { it("can't end with a slash", function() {
fillNameWith('foo/'); fillNameWith('foo/');
return expectToHaveError("can't end in '/'"); expectToHaveError("can't end in '/'");
}); });
it("can't end with a dot", function() { it("can't end with a dot", function() {
fillNameWith('foo.'); fillNameWith('foo.');
return expectToHaveError("can't end in '.'"); expectToHaveError("can't end in '.'");
}); });
it("can't end with .lock", function() { it("can't end with .lock", function() {
fillNameWith('foo.lock'); fillNameWith('foo.lock');
return expectToHaveError("can't end in '.lock'"); expectToHaveError("can't end in '.lock'");
}); });
it("can't be the single character @", function() { it("can't be the single character @", function() {
fillNameWith('@'); fillNameWith('@');
return expectToHaveError("can't be '@'"); expectToHaveError("can't be '@'");
}); });
it('concatenates all error messages', function() { it('concatenates all error messages', function() {
fillNameWith('/foo bar?~.'); fillNameWith('/foo bar?~.');
return expectToHaveError( expectToHaveError("can't start with '/', can't contain spaces, '?', '~', can't end in '.'");
"can't start with '/', can't contain spaces, '?', '~', can't end in '.'",
);
}); });
it("doesn't duplicate error messages", function() { it("doesn't duplicate error messages", function() {
fillNameWith('?foo?bar?zoo?'); fillNameWith('?foo?bar?zoo?');
return expectToHaveError("can't contain '?'"); expectToHaveError("can't contain '?'");
}); });
it('removes the error message when is a valid name', function() { it('removes the error message when is a valid name', function() {
......
...@@ -50,7 +50,7 @@ export default { ...@@ -50,7 +50,7 @@ export default {
output: '<a>foo</a>', output: '<a>foo</a>',
}, },
'protocol-based JS injection: invalid URL char': { 'protocol-based JS injection: invalid URL char': {
input: '<img src=javascript:alert("XSS")>', // eslint-disable-line no-useless-escape input: '<img src=javascript:alert("XSS")>',
output: '<img>', output: '<img>',
}, },
'protocol-based JS injection: Unicode': { 'protocol-based JS injection: Unicode': {
......
...@@ -16,6 +16,7 @@ describe('OAuthRememberMe', () => { ...@@ -16,6 +16,7 @@ describe('OAuthRememberMe', () => {
expect($('#oauth-container .oauth-login.twitter').attr('href')).toBe( expect($('#oauth-container .oauth-login.twitter').attr('href')).toBe(
'http://example.com/?remember_me=1', 'http://example.com/?remember_me=1',
); );
expect($('#oauth-container .oauth-login.github').attr('href')).toBe( expect($('#oauth-container .oauth-login.github').attr('href')).toBe(
'http://example.com/?remember_me=1', 'http://example.com/?remember_me=1',
); );
......
...@@ -50,6 +50,7 @@ describe('Pipelines Empty State', () => { ...@@ -50,6 +50,7 @@ describe('Pipelines Empty State', () => {
expect(component.$el.querySelector('.js-get-started-pipelines').getAttribute('href')).toEqual( expect(component.$el.querySelector('.js-get-started-pipelines').getAttribute('href')).toEqual(
'foo', 'foo',
); );
expect(component.$el.querySelector('.js-get-started-pipelines').textContent).toContain( expect(component.$el.querySelector('.js-get-started-pipelines').textContent).toContain(
'Get started with Pipelines', 'Get started with Pipelines',
); );
......
...@@ -171,6 +171,7 @@ describe('Pipelines', () => { ...@@ -171,6 +171,7 @@ describe('Pipelines', () => {
expect(vm.$el.querySelector('.js-empty-state h4').textContent.trim()).toEqual( expect(vm.$el.querySelector('.js-empty-state h4').textContent.trim()).toEqual(
'Build with confidence', 'Build with confidence',
); );
expect(vm.$el.querySelector('.js-get-started-pipelines').getAttribute('href')).toEqual( expect(vm.$el.querySelector('.js-get-started-pipelines').getAttribute('href')).toEqual(
paths.helpPagePath, paths.helpPagePath,
); );
...@@ -207,6 +208,7 @@ describe('Pipelines', () => { ...@@ -207,6 +208,7 @@ describe('Pipelines', () => {
expect(vm.$el.querySelector('.js-run-pipeline').getAttribute('href')).toEqual( expect(vm.$el.querySelector('.js-run-pipeline').getAttribute('href')).toEqual(
paths.newPipelinePath, paths.newPipelinePath,
); );
expect(vm.$el.querySelector('.js-ci-lint').getAttribute('href')).toEqual(paths.ciLintPath); expect(vm.$el.querySelector('.js-ci-lint').getAttribute('href')).toEqual(paths.ciLintPath);
expect(vm.$el.querySelector('.js-clear-cache').textContent.trim()).toEqual( expect(vm.$el.querySelector('.js-clear-cache').textContent.trim()).toEqual(
'Clear Runner Caches', 'Clear Runner Caches',
...@@ -324,6 +326,7 @@ describe('Pipelines', () => { ...@@ -324,6 +326,7 @@ describe('Pipelines', () => {
expect(vm.$el.querySelector('.js-empty-state').textContent.trim()).toEqual( expect(vm.$el.querySelector('.js-empty-state').textContent.trim()).toEqual(
'This project is not currently set up to run pipelines.', 'This project is not currently set up to run pipelines.',
); );
expect(vm.$el.querySelector('.js-get-started-pipelines')).toBeNull(); expect(vm.$el.querySelector('.js-get-started-pipelines')).toBeNull();
}); });
......
...@@ -41,12 +41,15 @@ describe('Pipelines Table', () => { ...@@ -41,12 +41,15 @@ describe('Pipelines Table', () => {
expect( expect(
component.$el.querySelector('.table-section.js-pipeline-status').textContent.trim(), component.$el.querySelector('.table-section.js-pipeline-status').textContent.trim(),
).toEqual('Status'); ).toEqual('Status');
expect( expect(
component.$el.querySelector('.table-section.js-pipeline-info').textContent.trim(), component.$el.querySelector('.table-section.js-pipeline-info').textContent.trim(),
).toEqual('Pipeline'); ).toEqual('Pipeline');
expect( expect(
component.$el.querySelector('.table-section.js-pipeline-commit').textContent.trim(), component.$el.querySelector('.table-section.js-pipeline-commit').textContent.trim(),
).toEqual('Commit'); ).toEqual('Commit');
expect( expect(
component.$el.querySelector('.table-section.js-pipeline-stages').textContent.trim(), component.$el.querySelector('.table-section.js-pipeline-stages').textContent.trim(),
).toEqual('Stages'); ).toEqual('Stages');
......
...@@ -13,7 +13,7 @@ describe('Pipelines', () => { ...@@ -13,7 +13,7 @@ describe('Pipelines', () => {
it('should create a `Pipelines` instance without options', () => { it('should create a `Pipelines` instance without options', () => {
expect(() => { expect(() => {
new Pipelines(); new Pipelines(); // eslint-disable-line no-new
}).not.toThrow(); //eslint-disable-line }).not.toThrow();
}); });
}); });
...@@ -88,6 +88,7 @@ describe('PrometheusMetrics', () => { ...@@ -88,6 +88,7 @@ describe('PrometheusMetrics', () => {
expect(prometheusMetrics.$monitoredMetricsCount.text()).toEqual( expect(prometheusMetrics.$monitoredMetricsCount.text()).toEqual(
'3 exporters with 12 metrics were found', '3 exporters with 12 metrics were found',
); );
expect($metricsListLi.length).toEqual(metrics.length); expect($metricsListLi.length).toEqual(metrics.length);
expect( expect(
$metricsListLi $metricsListLi
......
...@@ -36,6 +36,7 @@ describe('Grouped Test Reports Modal', () => { ...@@ -36,6 +36,7 @@ describe('Grouped Test Reports Modal', () => {
expect(vm.$el.querySelector('.js-modal-link').getAttribute('href')).toEqual( expect(vm.$el.querySelector('.js-modal-link').getAttribute('href')).toEqual(
modalDataStructure.class.value, modalDataStructure.class.value,
); );
expect(trimText(vm.$el.querySelector('.js-modal-link').textContent)).toEqual( expect(trimText(vm.$el.querySelector('.js-modal-link').textContent)).toEqual(
modalDataStructure.class.value, modalDataStructure.class.value,
); );
......
...@@ -63,6 +63,7 @@ describe('SigninTabsMemoizer', () => { ...@@ -63,6 +63,7 @@ describe('SigninTabsMemoizer', () => {
['ul.new-session-tabs a[href="#bogus"]'], ['ul.new-session-tabs a[href="#bogus"]'],
['ul.new-session-tabs a'], ['ul.new-session-tabs a'],
]); ]);
expect(fakeTab.click).toHaveBeenCalled(); expect(fakeTab.click).toHaveBeenCalled();
}); });
......
...@@ -27,6 +27,7 @@ describe('ToggleButtons', () => { ...@@ -27,6 +27,7 @@ describe('ToggleButtons', () => {
expect( expect(
wrapper.querySelector('.js-project-feature-toggle').classList.contains('is-checked'), wrapper.querySelector('.js-project-feature-toggle').classList.contains('is-checked'),
).toEqual(true); ).toEqual(true);
expect(wrapper.querySelector('.js-project-feature-toggle-input').value).toEqual('true'); expect(wrapper.querySelector('.js-project-feature-toggle-input').value).toEqual('true');
}); });
...@@ -53,6 +54,7 @@ describe('ToggleButtons', () => { ...@@ -53,6 +54,7 @@ describe('ToggleButtons', () => {
expect( expect(
wrapper.querySelector('.js-project-feature-toggle').classList.contains('is-checked'), wrapper.querySelector('.js-project-feature-toggle').classList.contains('is-checked'),
).toEqual(false); ).toEqual(false);
expect(wrapper.querySelector('.js-project-feature-toggle-input').value).toEqual('false'); expect(wrapper.querySelector('.js-project-feature-toggle-input').value).toEqual('false');
}); });
......
...@@ -152,6 +152,7 @@ describe('Deployment component', () => { ...@@ -152,6 +152,7 @@ describe('Deployment component', () => {
expect(el.querySelector('.js-deploy-meta').getAttribute('href')).toEqual( expect(el.querySelector('.js-deploy-meta').getAttribute('href')).toEqual(
deploymentMockData.url, deploymentMockData.url,
); );
expect(el.querySelector('.js-deploy-meta').innerText).toContain(deploymentMockData.name); expect(el.querySelector('.js-deploy-meta').innerText).toContain(deploymentMockData.name);
}); });
...@@ -159,6 +160,7 @@ describe('Deployment component', () => { ...@@ -159,6 +160,7 @@ describe('Deployment component', () => {
expect(el.querySelector('.js-deploy-url').getAttribute('href')).toEqual( expect(el.querySelector('.js-deploy-url').getAttribute('href')).toEqual(
deploymentMockData.external_url, deploymentMockData.external_url,
); );
expect(el.querySelector('.js-deploy-url').innerText).toContain('View app'); expect(el.querySelector('.js-deploy-url').innerText).toContain('View app');
}); });
......
...@@ -38,6 +38,7 @@ describe('MrWidgetAuthorTime', () => { ...@@ -38,6 +38,7 @@ describe('MrWidgetAuthorTime', () => {
expect(vm.$el.querySelector('time').getAttribute('data-original-title')).toEqual( expect(vm.$el.querySelector('time').getAttribute('data-original-title')).toEqual(
'2017-03-23T23:02:00.807Z', '2017-03-23T23:02:00.807Z',
); );
expect(vm.$el.querySelector('time').textContent.trim()).toEqual('12 hours ago'); expect(vm.$el.querySelector('time').textContent.trim()).toEqual('12 hours ago');
}); });
}); });
...@@ -304,9 +304,11 @@ describe('MRWidgetHeader', () => { ...@@ -304,9 +304,11 @@ describe('MRWidgetHeader', () => {
expect(vm.$el.querySelector('.diverged-commits-count').textContent).toEqual( expect(vm.$el.querySelector('.diverged-commits-count').textContent).toEqual(
'The source branch is 12 commits behind the target branch', 'The source branch is 12 commits behind the target branch',
); );
expect(vm.$el.querySelector('.diverged-commits-count a').textContent).toEqual( expect(vm.$el.querySelector('.diverged-commits-count a').textContent).toEqual(
'12 commits behind', '12 commits behind',
); );
expect(vm.$el.querySelector('.diverged-commits-count a')).toHaveAttr( expect(vm.$el.querySelector('.diverged-commits-count a')).toHaveAttr(
'href', 'href',
vm.mr.targetBranchPath, vm.mr.targetBranchPath,
......
...@@ -36,6 +36,7 @@ describe('MRWidgetMergeHelp', () => { ...@@ -36,6 +36,7 @@ describe('MRWidgetMergeHelp', () => {
expect(vm.$el.querySelector('.js-open-modal-help').getAttribute('data-target')).toEqual( expect(vm.$el.querySelector('.js-open-modal-help').getAttribute('data-target')).toEqual(
'#modal_merge_info', '#modal_merge_info',
); );
expect(vm.$el.querySelector('.js-open-modal-help').getAttribute('data-toggle')).toEqual( expect(vm.$el.querySelector('.js-open-modal-help').getAttribute('data-toggle')).toEqual(
'modal', 'modal',
); );
...@@ -60,6 +61,7 @@ describe('MRWidgetMergeHelp', () => { ...@@ -60,6 +61,7 @@ describe('MRWidgetMergeHelp', () => {
expect(vm.$el.querySelector('.js-open-modal-help').getAttribute('data-target')).toEqual( expect(vm.$el.querySelector('.js-open-modal-help').getAttribute('data-target')).toEqual(
'#modal_merge_info', '#modal_merge_info',
); );
expect(vm.$el.querySelector('.js-open-modal-help').getAttribute('data-toggle')).toEqual( expect(vm.$el.querySelector('.js-open-modal-help').getAttribute('data-toggle')).toEqual(
'modal', 'modal',
); );
......
...@@ -125,10 +125,12 @@ describe('MRWidgetMergeWhenPipelineSucceeds', () => { ...@@ -125,10 +125,12 @@ describe('MRWidgetMergeWhenPipelineSucceeds', () => {
expect(vm.$el.querySelector('.js-cancel-auto-merge').innerText).toContain( expect(vm.$el.querySelector('.js-cancel-auto-merge').innerText).toContain(
'Cancel automatic merge', 'Cancel automatic merge',
); );
expect(vm.$el.querySelector('.js-cancel-auto-merge').getAttribute('disabled')).toBeFalsy(); expect(vm.$el.querySelector('.js-cancel-auto-merge').getAttribute('disabled')).toBeFalsy();
expect(vm.$el.querySelector('.js-remove-source-branch').innerText).toContain( expect(vm.$el.querySelector('.js-remove-source-branch').innerText).toContain(
'Remove source branch', 'Remove source branch',
); );
expect(vm.$el.querySelector('.js-remove-source-branch').getAttribute('disabled')).toBeFalsy(); expect(vm.$el.querySelector('.js-remove-source-branch').getAttribute('disabled')).toBeFalsy();
}); });
......
...@@ -18,6 +18,7 @@ describe('NothingToMerge', () => { ...@@ -18,6 +18,7 @@ describe('NothingToMerge', () => {
expect(vm.$el.innerText).toContain( expect(vm.$el.innerText).toContain(
"Currently there are no changes in this merge request's source branch", "Currently there are no changes in this merge request's source branch",
); );
expect(vm.$el.innerText).toContain('Please push new commits or use a different branch.'); expect(vm.$el.innerText).toContain('Please push new commits or use a different branch.');
}); });
......
...@@ -23,6 +23,7 @@ describe('UnresolvedDiscussions', () => { ...@@ -23,6 +23,7 @@ describe('UnresolvedDiscussions', () => {
expect(vm.$el.innerText).toContain( expect(vm.$el.innerText).toContain(
'There are unresolved discussions. Please resolve these discussions', 'There are unresolved discussions. Please resolve these discussions',
); );
expect(vm.$el.innerText).toContain('Create an issue to resolve them later'); expect(vm.$el.innerText).toContain('Create an issue to resolve them later');
expect(vm.$el.querySelector('.js-create-issue').getAttribute('href')).toEqual(gl.TEST_HOST); expect(vm.$el.querySelector('.js-create-issue').getAttribute('href')).toEqual(gl.TEST_HOST);
}); });
...@@ -37,6 +38,7 @@ describe('UnresolvedDiscussions', () => { ...@@ -37,6 +38,7 @@ describe('UnresolvedDiscussions', () => {
expect(vm.$el.innerText).toContain( expect(vm.$el.innerText).toContain(
'There are unresolved discussions. Please resolve these discussions', 'There are unresolved discussions. Please resolve these discussions',
); );
expect(vm.$el.querySelector('.js-create-issue')).toEqual(null); expect(vm.$el.querySelector('.js-create-issue')).toEqual(null);
}); });
}); });
......
...@@ -74,6 +74,7 @@ describe('Panel Resizer component', () => { ...@@ -74,6 +74,7 @@ describe('Panel Resizer component', () => {
['update:size', 100], ['update:size', 100],
['resize-end', 100], ['resize-end', 100],
]); ]);
expect(vm.size).toBe(100); expect(vm.size).toBe(100);
}); });
}); });
...@@ -92,6 +92,7 @@ describe('DropdownCreateLabelComponent', () => { ...@@ -92,6 +92,7 @@ describe('DropdownCreateLabelComponent', () => {
expect( expect(
vm.$el.querySelector('.dropdown-label-color-preview.js-dropdown-label-color-preview'), vm.$el.querySelector('.dropdown-label-color-preview.js-dropdown-label-color-preview'),
).not.toBe(null); ).not.toBe(null);
expect(vm.$el.querySelector('input#new_label_color.default-dropdown-input')).not.toBe(null); expect(vm.$el.querySelector('input#new_label_color.default-dropdown-input')).not.toBe(null);
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment