Merge branch '51712-new-line-between-declarations' into 'master'

1. enable jasmine/new-line-between-declarations

See merge request gitlab-org/gitlab-ce!22230

Author: mikegreiling

spec/javascripts/.eslintrc.yml

@@ -37,7 +37,6 @@ rules:
       - 'fixtures/blob'
   # Temporarily disabled to facilitate an upgrade to eslint-plugin-jasmine
   jasmine/new-line-before-expect: off
-  jasmine/new-line-between-declarations: off
   jasmine/no-promise-without-done-fail: off
   jasmine/prefer-jasmine-matcher: off
   jasmine/prefer-toHaveBeenCalledWith: off

spec/javascripts/awards_handler_spec.js

@@ -55,6 +55,7 @@ import '~/lib/utils/common_utils';
         });
       };
     });
+
     afterEach(function() {
       // restore original url root value
       gon.relative_url_root = urlRoot;
@@ -64,6 +65,7 @@ import '~/lib/utils/common_utils';
 
       awardsHandler.destroy();
     });
+
     describe('::showEmojiMenu', function() {
       it('should show emoji menu when Add emoji button clicked', function(done) {
         $('.js-add-award')
@@ -78,13 +80,15 @@ import '~/lib/utils/common_utils';
           return expect($('.js-awards-block.current').length).toBe(1);
         });
       });
+
       it('should also show emoji menu for the smiley icon in notes', function(done) {
         $('.js-add-award.note-action-button').click();
         return lazyAssert(done, function() {
           var $emojiMenu = $('.emoji-menu');
           return expect($emojiMenu.length).toBe(1);
         });
       });
+
       it('should remove emoji menu when body is clicked', function(done) {
         $('.js-add-award')
           .eq(0)
@@ -98,6 +102,7 @@ import '~/lib/utils/common_utils';
           return expect($('.js-awards-block.current').length).toBe(0);
         });
       });
+
       it('should not remove emoji menu when search is clicked', function(done) {
         $('.js-add-award')
           .eq(0)
@@ -123,6 +128,7 @@ import '~/lib/utils/common_utils';
         expect($emojiButton.next('.js-counter').text()).toBe('1');
         return expect($votesBlock.hasClass('hidden')).toBe(false);
       });
+
       it('should remove the emoji when we click again', function() {
         var $emojiButton, $votesBlock;
         $votesBlock = $('.js-awards-block').eq(0);
@@ -142,6 +148,7 @@ import '~/lib/utils/common_utils';
         return expect($emojiButton.next('.js-counter').text()).toBe('4');
       });
     });
+
     describe('::userAuthored', function() {
       it('should update tooltip to user authored title', function() {
         var $thumbsUpEmoji, $votesBlock;
@@ -153,6 +160,7 @@ import '~/lib/utils/common_utils';
           'You cannot vote on your own issue, MR and note',
         );
       });
+
       it('should restore tooltip back to initial vote list', function() {
         var $thumbsUpEmoji, $votesBlock;
         jasmine.clock().install();
@@ -165,13 +173,15 @@ import '~/lib/utils/common_utils';
         return expect($thumbsUpEmoji.data('originalTitle')).toBe('sam');
       });
     });
+
     describe('::getAwardUrl', function() {
       return it('returns the url for request', function() {
         return expect(awardsHandler.getAwardUrl()).toBe(
           'http://test.host/snippets/1/toggle_award_emoji',
         );
       });
     });
+
     describe('::addAward and ::checkMutuality', function() {
       return it('should handle :+1: and :-1: mutuality', function() {
         var $thumbsDownEmoji, $thumbsUpEmoji, $votesBlock, awardUrl;
@@ -189,6 +199,7 @@ import '~/lib/utils/common_utils';
         return expect($thumbsDownEmoji.hasClass('active')).toBe(true);
       });
     });
+
     describe('::removeEmoji', function() {
       return it('should remove emoji', function() {
         var $votesBlock, awardUrl;
@@ -200,6 +211,7 @@ import '~/lib/utils/common_utils';
         return expect($votesBlock.find('[data-name=fire]').length).toBe(0);
       });
     });
+
     describe('::addYouToUserList', function() {
       it('should prepend "You" to the award tooltip', function() {
         var $thumbsUpEmoji, $votesBlock, awardUrl;
@@ -222,6 +234,7 @@ import '~/lib/utils/common_utils';
         return expect($thumbsUpEmoji.data('originalTitle')).toBe('You and sam');
       });
     });
+
     describe('::removeYouToUserList', function() {
       it('removes "You" from the front of the tooltip', function() {
         var $thumbsUpEmoji, $votesBlock, awardUrl;
@@ -246,6 +259,7 @@ import '~/lib/utils/common_utils';
         return expect($thumbsUpEmoji.data('originalTitle')).toBe('sam');
       });
     });
+
     describe('::searchEmojis', () => {
       it('should filter the emoji', function(done) {
         return openAndWaitForEmojiMenu()
@@ -263,6 +277,7 @@ import '~/lib/utils/common_utils';
             done.fail(`Failed to open and build emoji menu: ${err.message}`);
           });
       });
+
       it('should clear the search when searching for nothing', function(done) {
         return openAndWaitForEmojiMenu()
           .then(() => {
@@ -305,6 +320,7 @@ import '~/lib/utils/common_utils';
             done.fail(`Failed to open and build emoji menu: ${err.message}`);
           });
       });
+
       it('should remove already selected emoji', function(done) {
         return openEmojiMenuAndAddEmoji()
           .then(() => {

spec/javascripts/behaviors/quick_submit_spec.js

@@ -58,12 +58,14 @@ describe('Quick Submit behavior', function () {
 
     expect(submitButton).toBeDisabled();
   });
+
   it('disables button of type submit', () => {
     const submitButton = $('.js-quick-submit input[type=submit]');
     this.textarea.trigger(keydownEvent());
 
     expect(submitButton).toBeDisabled();
   });
+
   it('only clicks one submit', () => {
     const existingSubmit = $('.js-quick-submit input[type=submit]');
     // Add an extra submit button

spec/javascripts/bootstrap_jquery_spec.js

@@ -9,6 +9,7 @@ import '~/commons/bootstrap';
       beforeEach(function() {
         return setFixtures('<input type="text" />');
       });
+
       it('adds the disabled attribute', function() {
         var $input;
         $input = $('input').first();
@@ -26,6 +27,7 @@ import '~/commons/bootstrap';
       beforeEach(function() {
         return setFixtures('<input type="text" disabled="disabled" class="disabled" />');
       });
+
       it('removes the disabled attribute', function() {
         var $input;
         $input = $('input').first();

spec/javascripts/emoji_spec.js

@@ -140,6 +140,7 @@ describe('gl_emoji', () => {
         },
       );
     });
+
     it('bomb emoji with sprite fallback', () => {
       const emojiKey = 'bomb';
       const markup = glEmojiTag(emojiFixtureMap[emojiKey].name, {
@@ -195,24 +196,31 @@ describe('gl_emoji', () => {
     it('should gracefully handle empty string', () => {
       expect(isFlagEmoji('')).toBeFalsy();
     });
+
     it('should detect flag_ac', () => {
       expect(isFlagEmoji('🇦🇨')).toBeTruthy();
     });
+
     it('should detect flag_us', () => {
       expect(isFlagEmoji('🇺🇸')).toBeTruthy();
     });
+
     it('should detect flag_zw', () => {
       expect(isFlagEmoji('🇿🇼')).toBeTruthy();
     });
+
     it('should not detect flags', () => {
       expect(isFlagEmoji('🎏')).toBeFalsy();
     });
+
     it('should not detect triangular_flag_on_post', () => {
       expect(isFlagEmoji('🚩')).toBeFalsy();
     });
+
     it('should not detect single letter', () => {
       expect(isFlagEmoji('🇦')).toBeFalsy();
     });
+
     it('should not detect >2 letters', () => {
       expect(isFlagEmoji('🇦🇧🇨')).toBeFalsy();
     });
@@ -222,15 +230,19 @@ describe('gl_emoji', () => {
     it('should gracefully handle empty string', () => {
       expect(isRainbowFlagEmoji('')).toBeFalsy();
     });
+
     it('should detect rainbow_flag', () => {
       expect(isRainbowFlagEmoji('🏳🌈')).toBeTruthy();
     });
+
     it('should not detect flag_white on its\' own', () => {
       expect(isRainbowFlagEmoji('🏳')).toBeFalsy();
     });
+
     it('should not detect rainbow on its\' own', () => {
       expect(isRainbowFlagEmoji('🌈')).toBeFalsy();
     });
+
     it('should not detect flag_white with something else', () => {
       expect(isRainbowFlagEmoji('🏳🔵')).toBeFalsy();
     });
@@ -240,15 +252,19 @@ describe('gl_emoji', () => {
     it('should gracefully handle empty string', () => {
       expect(isKeycapEmoji('')).toBeFalsy();
     });
+
     it('should detect one(keycap)', () => {
       expect(isKeycapEmoji('1️⃣')).toBeTruthy();
     });
+
     it('should detect nine(keycap)', () => {
       expect(isKeycapEmoji('9️⃣')).toBeTruthy();
     });
+
     it('should not detect ten(keycap)', () => {
       expect(isKeycapEmoji('🔟')).toBeFalsy();
     });
+
     it('should not detect hash(keycap)', () => {
       expect(isKeycapEmoji('#⃣')).toBeFalsy();
     });
@@ -258,24 +274,31 @@ describe('gl_emoji', () => {
     it('should gracefully handle empty string', () => {
       expect(isSkinToneComboEmoji('')).toBeFalsy();
     });
+
     it('should detect hand_splayed_tone5', () => {
       expect(isSkinToneComboEmoji('🖐🏿')).toBeTruthy();
     });
+
     it('should not detect hand_splayed', () => {
       expect(isSkinToneComboEmoji('🖐')).toBeFalsy();
     });
+
     it('should detect lifter_tone1', () => {
       expect(isSkinToneComboEmoji('🏋🏻')).toBeTruthy();
     });
+
     it('should not detect lifter', () => {
       expect(isSkinToneComboEmoji('🏋')).toBeFalsy();
     });
+
     it('should detect rowboat_tone4', () => {
       expect(isSkinToneComboEmoji('🚣🏾')).toBeTruthy();
     });
+
     it('should not detect rowboat', () => {
       expect(isSkinToneComboEmoji('🚣')).toBeFalsy();
     });
+
     it('should not detect individual tone emoji', () => {
       expect(isSkinToneComboEmoji('🏻')).toBeFalsy();
     });
@@ -285,9 +308,11 @@ describe('gl_emoji', () => {
     it('should gracefully handle empty string', () => {
       expect(isHorceRacingSkinToneComboEmoji('')).toBeFalsy();
     });
+
     it('should detect horse_racing_tone2', () => {
       expect(isHorceRacingSkinToneComboEmoji('🏇🏼')).toBeTruthy();
     });
+
     it('should not detect horse_racing', () => {
       expect(isHorceRacingSkinToneComboEmoji('🏇')).toBeFalsy();
     });
@@ -297,36 +322,47 @@ describe('gl_emoji', () => {
     it('should gracefully handle empty string', () => {
       expect(isPersonZwjEmoji('')).toBeFalsy();
     });
+
     it('should detect couple_mm', () => {
       expect(isPersonZwjEmoji('👨‍❤️‍👨')).toBeTruthy();
     });
+
     it('should not detect couple_with_heart', () => {
       expect(isPersonZwjEmoji('💑')).toBeFalsy();
     });
+
     it('should not detect couplekiss', () => {
       expect(isPersonZwjEmoji('💏')).toBeFalsy();
     });
+
     it('should detect family_mmb', () => {
       expect(isPersonZwjEmoji('👨‍👨‍👦')).toBeTruthy();
     });
+
     it('should detect family_mwgb', () => {
       expect(isPersonZwjEmoji('👨‍👩‍👧‍👦')).toBeTruthy();
     });
+
     it('should not detect family', () => {
       expect(isPersonZwjEmoji('👪')).toBeFalsy();
     });
+
     it('should detect kiss_ww', () => {
       expect(isPersonZwjEmoji('👩‍❤️‍💋‍👩')).toBeTruthy();
     });
+
     it('should not detect girl', () => {
       expect(isPersonZwjEmoji('👧')).toBeFalsy();
     });
+
     it('should not detect girl_tone5', () => {
       expect(isPersonZwjEmoji('👧🏿')).toBeFalsy();
     });
+
     it('should not detect man', () => {
       expect(isPersonZwjEmoji('👨')).toBeFalsy();
     });
+
     it('should not detect woman', () => {
       expect(isPersonZwjEmoji('👩')).toBeFalsy();
     });
@@ -341,6 +377,7 @@ describe('gl_emoji', () => {
       );
       expect(isSupported).toBeTruthy();
     });
+
     it('should gracefully handle empty string without unicode support', () => {
       const isSupported = isEmojiUnicodeSupported(
         {},
@@ -349,6 +386,7 @@ describe('gl_emoji', () => {
       );
       expect(isSupported).toBeFalsy();
     });
+
     it('bomb(6.0) with 6.0 support', () => {
       const emojiKey = 'bomb';
       const unicodeSupportMap = Object.assign({}, emptySupportMap, {

spec/javascripts/graphs/stat_graph_contributors_util_spec.js

@@ -205,10 +205,12 @@ describe("ContributorsStatGraphUtil", function () {
     it("returns true if date_range is null", function () {
       expect(ContributorsStatGraphUtil.in_range(date, null)).toEqual(true);
     });
+
     it("returns true if date is in range", function () {
       var date_range = [new Date("2013-01-01"), new Date("2013-12-12")];
       expect(ContributorsStatGraphUtil.in_range(date, date_range)).toEqual(true);
     });
+
     it("returns false if date is not in range", function () {
       var date_range = [new Date("1999-12-01"), new Date("2000-12-01")];
       expect(ContributorsStatGraphUtil.in_range(date, date_range)).toEqual(false);

spec/javascripts/jobs/components/job_log_controllers_spec.js

@@ -25,6 +25,7 @@ describe('Job log controllers', () => {
       beforeEach(() => {
         vm = mountComponent(Component, props);
       });
+
       it('renders size information', () => {
         expect(vm.$el.querySelector('.js-truncated-info').textContent).toContain('499.95 KiB');
       });

spec/javascripts/lib/utils/common_utils_spec.js

@@ -9,6 +9,7 @@ describe('common_utils', () => {
     it('returns an anchor tag with url', () => {
       expect(commonUtils.parseUrl('/some/absolute/url').pathname).toContain('some/absolute/url');
     });
+
     it('url is escaped', () => {
       // IE11 will return a relative pathname while other browsers will return a full pathname.
       // parseUrl uses an anchor element for parsing an url. With relative urls, the anchor