Add tests for {...} & Props in addition to Props & {...}

Author: jseminck

tests/lib/rules/no-unused-prop-types.js

@@ -888,6 +888,23 @@ ruleTester.run('no-unused-prop-types', rule, {
         }
       `,
       parser: 'babel-eslint'
+    }, {
+      code: `
+        type PropsB = { foo: string };
+        type PropsC = { bar: string };
+        type Props = {
+          zap: string 
+        } & PropsB;
+
+        class Bar extends React.Component {
+          props: Props & PropsC;
+          
+          render() {
+            return <div>{this.props.foo} - {this.props.bar} - {this.props.zap}</div>
+          }
+        }
+      `,
+      parser: 'babel-eslint'
     }, {
       code: [
         'import type Props from "fake";',
@@ -2831,6 +2848,26 @@ ruleTester.run('no-unused-prop-types', rule, {
         {message: '\'zap\' PropType is defined but prop is never used'}
       ],
       parser: 'babel-eslint'
+    }, {
+      code: `
+        type PropsB = { foo: string };
+        type PropsC = { bar: string };
+        type Props = {
+          zap: string 
+        } & PropsB;
+
+        class Bar extends React.Component {
+          props: Props & PropsC;
+          
+          render() {
+            return <div>{this.props.foo} - {this.props.bar}</div>
+          }
+        }
+      `,
+      errors: [
+        {message: '\'zap\' PropType is defined but prop is never used'}
+      ],
+      parser: 'babel-eslint'
     }, {
       code: [
         'class Hello extends React.Component {',

tests/lib/rules/prop-types.js

@@ -1733,6 +1733,23 @@ ruleTester.run('prop-types', rule, {
         }
       `,
       parser: 'babel-eslint'
+    }, {
+      code: `
+        type PropsA = { bar: string };
+        type PropsB = { zap: string };
+        type Props =  {
+          baz: string 
+        } & PropsA;
+
+        class Bar extends React.Component {
+          props: Props & PropsB;
+          
+          render() {
+            return <div>{this.props.bar} - {this.props.zap} - {this.props.baz}</div>
+          }
+        }
+      `,
+      parser: 'babel-eslint'
     }, {
       code: `
         type Props = { foo: string }
@@ -3463,6 +3480,26 @@ ruleTester.run('prop-types', rule, {
         message: '\'fooBar\' is missing in props validation'
       }],
       parser: 'babel-eslint'
+    }, {
+      code: `
+        type PropsB = { bar: string };
+        type PropsC = { zap: string };
+        type Props = {
+          baz: string 
+        } & PropsB;
+
+        class Bar extends React.Component {
+          props: Props & PropsC;
+          
+          render() {
+            return <div>{this.props.bar} - {this.props.baz} - {this.props.fooBar}</div>
+          }
+        }
+      `,
+      errors: [{
+        message: '\'fooBar\' is missing in props validation'
+      }],
+      parser: 'babel-eslint'
     }
   ]
 });