Merge branch 'winh-lint-console-tests' into 'master'
Enable no-console ESLint rule for tests See merge request gitlab-org/gitlab-ce!20812
This commit is contained in:
		
						commit
						93c7b6c51a
					
				|  | @ -30,7 +30,6 @@ rules: | ||||||
|   jasmine/no-spec-dupes: |   jasmine/no-spec-dupes: | ||||||
|     - warn |     - warn | ||||||
|     - branch |     - branch | ||||||
|   no-console: off |  | ||||||
|   prefer-arrow-callback: off |   prefer-arrow-callback: off | ||||||
|   import/no-unresolved: |   import/no-unresolved: | ||||||
|     - error |     - error | ||||||
|  |  | ||||||
|  | @ -162,7 +162,6 @@ describe('getTimeframeWindowFrom', () => { | ||||||
|     const timeframe = datetimeUtility.getTimeframeWindowFrom(startDate, 5); |     const timeframe = datetimeUtility.getTimeframeWindowFrom(startDate, 5); | ||||||
|     expect(timeframe.length).toBe(5); |     expect(timeframe.length).toBe(5); | ||||||
|     timeframe.forEach((timeframeItem, index) => { |     timeframe.forEach((timeframeItem, index) => { | ||||||
|       console.log(timeframeItem); |  | ||||||
|       expect(timeframeItem.getFullYear() === mockTimeframe[index].getFullYear()).toBe(true); |       expect(timeframeItem.getFullYear() === mockTimeframe[index].getFullYear()).toBe(true); | ||||||
|       expect(timeframeItem.getMonth() === mockTimeframe[index].getMonth()).toBe(true); |       expect(timeframeItem.getMonth() === mockTimeframe[index].getMonth()).toBe(true); | ||||||
|       expect(timeframeItem.getDate() === mockTimeframe[index].getDate()).toBeTruthy(); |       expect(timeframeItem.getDate() === mockTimeframe[index].getDate()).toBeTruthy(); | ||||||
|  |  | ||||||
|  | @ -30,7 +30,7 @@ describe('Page component', () => { | ||||||
|         done(); |         done(); | ||||||
|       }) |       }) | ||||||
|       .catch((error) => { |       .catch((error) => { | ||||||
|         console.error(error); |         done.fail(error); | ||||||
|       }); |       }); | ||||||
|   }); |   }); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,4 +1,6 @@ | ||||||
| /* eslint-disable jasmine/no-global-setup, jasmine/no-unsafe-spy, no-underscore-dangle */ | /* eslint-disable | ||||||
|  |   jasmine/no-global-setup, jasmine/no-unsafe-spy, no-underscore-dangle, no-console | ||||||
|  | */ | ||||||
| 
 | 
 | ||||||
| import $ from 'jquery'; | import $ from 'jquery'; | ||||||
| import 'vendor/jasmine-jquery'; | import 'vendor/jasmine-jquery'; | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue