Scripts: Fix default use of lint-js file patterns (#16079)

* Scripts: Call hasFileInCliArgs as function * Scripts: Apply default file arguments as spread array * Fix lint issues found
WordPress · Jun 11, 2019 · 51d4434 · 51d4434
1 parent 1f3f794
commit 51d4434
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 16 deletions.
diff --git a/packages/block-editor/src/components/media-upload/test/index.native.js b/packages/block-editor/src/components/media-upload/test/index.native.js
@@ -52,7 +52,7 @@ describe( 'MediaUpload component', () => {
 				);
 			} } />
 		);
-		expect( wrapper.find( 'Picker' ).length ).toEqual( 1 );
+		expect( wrapper.find( 'Picker' ) ).toHaveLength( 1 );
 	} );
 
 	it( 'shows right media capture option for media type', () => {
@@ -68,7 +68,7 @@ describe( 'MediaUpload component', () => {
 						);
 					} } />
 			);
-			expect( wrapper.find( 'Picker' ).props().options.filter( ( item ) => item.label === expectedOption ).length ).toEqual( 1 );
+			expect( wrapper.find( 'Picker' ).props().options.filter( ( item ) => item.label === expectedOption ) ).toHaveLength( 1 );
 		};
 		expectOptionForMediaType( MEDIA_TYPE_IMAGE, OPTION_TAKE_PHOTO );
 		expectOptionForMediaType( MEDIA_TYPE_VIDEO, OPTION_TAKE_VIDEO );

diff --git a/packages/block-editor/src/components/rich-text/test/index.native.js b/packages/block-editor/src/components/rich-text/test/index.native.js
@@ -32,11 +32,11 @@ describe( 'RichText Native', () => {
 
 	describe( 'Adds new line on Enter', () => {
 		let newValue;
-		const wrapper = shallow( <RichText 
+		const wrapper = shallow( <RichText
 			rootTagsToEliminate={ [ 'p' ] }
-			value={ "" }
+			value=""
 			onChange={ ( value ) => {
-				newValue = value
+				newValue = value;
 			} }
 			formatTypes={ [] }
 			onSelectionChange={ jest.fn() }
@@ -45,12 +45,12 @@ describe( 'RichText Native', () => {
 		const event = {
 			nativeEvent: {
 				eventCount: 0,
-			}
+			},
 		};
-		wrapper.instance().onEnter(event);
+		wrapper.instance().onEnter( event );
 
 		it( ' Adds <br> tag to content after pressing Enter key', () => {
-			expect( newValue ).toEqual( "<br>" );
-		});
+			expect( newValue ).toEqual( '<br>' );
+		} );
 	} );
 } );
diff --git a/packages/block-library/src/heading/edit.native.js b/packages/block-library/src/heading/edit.native.js
@@ -18,9 +18,7 @@ import { createBlock } from '@wordpress/blocks';
 
 const HeadingEdit = ( {
 	attributes,
-	isSelected,
 	mergeBlocks,
-	onBlur,
 	onFocus,
 	onReplace,
 	setAttributes,

diff --git a/packages/block-library/src/video/video-player.android.js b/packages/block-library/src/video/video-player.android.js
@@ -19,7 +19,7 @@ const Video = ( props ) => {
 				// We are using built-in player controls becasue manually
 				// calling presentFullscreenPlayer() is not working for android
 				controls={ isSelected }
-				muted={ !isSelected }
+				muted={ ! isSelected }
 			/>
 		</View>
 	);

diff --git a/packages/scripts/scripts/lint-js.js b/packages/scripts/scripts/lint-js.js
@@ -18,7 +18,7 @@ const {
 
 const args = getCliArgs();
 
-const defaultFilesArgs = ! hasFileInCliArgs ? [ '.' ] : [];
+const defaultFilesArgs = hasFileInCliArgs() ? [] : [ '.' ];
 
 // See: https://eslint.org/docs/user-guide/configuring#using-configuration-files-1.
 const hasLintConfig = hasCliArg( '-c' ) ||

diff --git a/packages/scripts/scripts/lint-pkg-json.js b/packages/scripts/scripts/lint-pkg-json.js
@@ -18,7 +18,7 @@ const {
 
 const args = getCliArgs();
 
-const defaultFilesArgs = ! hasFileInCliArgs ? [ '.' ] : [];
+const defaultFilesArgs = hasFileInCliArgs() ? [] : [ '.' ];
 
 // See: https://github.com/tclindner/npm-package-json-lint/wiki/configuration#configuration.
 const hasLintConfig = hasCliArg( '-c' ) ||
@@ -41,7 +41,7 @@ const defaultIgnoreArgs = ! hasIgnoredFiles ?
 
 const result = spawn(
 	resolveBin( 'npm-package-json-lint', { executable: 'npmPkgJsonLint' } ),
-	[ ...defaultConfigArgs, ...defaultIgnoreArgs, ...args, defaultFilesArgs ],
+	[ ...defaultConfigArgs, ...defaultIgnoreArgs, ...args, ...defaultFilesArgs ],
 	{ stdio: 'inherit' }
 );
 

diff --git a/packages/scripts/scripts/lint-style.js b/packages/scripts/scripts/lint-style.js
@@ -18,7 +18,7 @@ const {
 
 const args = getCliArgs();
 
-const defaultFilesArgs = ! hasFileInCliArgs ? [ '**/*.{css,scss}' ] : [];
+const defaultFilesArgs = hasFileInCliArgs() ? [] : [ '**/*.{css,scss}' ];
 
 // See: https://github.com/stylelint/stylelint/blob/master/docs/user-guide/configuration.md#loading-the-configuration-object.
 const hasLintConfig = hasCliArg( '--config' ) ||