diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-01-25 03:51:31 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-01-25 03:51:31 +0000 |
| commit | 7b6694e53c2f58820f2867bae69cefe4d2f4ca57 (patch) | |
| tree | 6cac45c04205260044775646b3bd50492d3c4706 /spec/javascripts | |
| parent | d1d90b576ddb6558859f13118915747468f4d48a (diff) | |
| parent | f0b7e5708c8d6f2020f97cf0aa74ba1084f6adf1 (diff) | |
| download | gitlab-ce-7b6694e53c2f58820f2867bae69cefe4d2f4ca57.tar.gz | |
Merge branch 'newline-eslint-rule' into 'master'
Add an eslint rule to flag extra newlines
See merge request !8137
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/abuse_reports_spec.js.es6 | 1 | ||||
| -rw-r--r-- | spec/javascripts/environments/environment_rollback_spec.js.es6 | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/spec/javascripts/abuse_reports_spec.js.es6 b/spec/javascripts/abuse_reports_spec.js.es6 index cf19aa05031..a2d57824585 100644 --- a/spec/javascripts/abuse_reports_spec.js.es6 +++ b/spec/javascripts/abuse_reports_spec.js.es6 @@ -21,7 +21,6 @@ messages = $('.abuse-reports .message'); }); - it('should truncate long messages', () => { const $longMessage = findMessage('LONG MESSAGE'); expect($longMessage.data('original-message')).toEqual(jasmine.anything()); diff --git a/spec/javascripts/environments/environment_rollback_spec.js.es6 b/spec/javascripts/environments/environment_rollback_spec.js.es6 index 21241116e29..95796f23894 100644 --- a/spec/javascripts/environments/environment_rollback_spec.js.es6 +++ b/spec/javascripts/environments/environment_rollback_spec.js.es6 @@ -33,7 +33,6 @@ describe('Rollback Component', () => { expect(component.$el.querySelector('span').textContent).toContain('Re-deploy'); }); - it('Should render Rollback label when isLastDeployment is false', () => { const component = new window.gl.environmentsList.RollbackComponent({ el: document.querySelector('.test-dom-element'), |