From 331b6de91afbb6941927f94e2eea183ef23b97c6 Mon Sep 17 00:00:00 2001
From: Swaroop SM <swaroop@cybrilla.com>
Date: Tue, 1 Mar 2016 23:44:01 +0530
Subject: [PATCH] Warn if the included mixin is undefined

---
 src/isomorphic/classic/class/ReactClass.js    | 15 ++++
 .../class/__tests__/ReactClassMixin-test.js   | 88 +++++++++++++++++++
 2 files changed, 103 insertions(+)

diff --git a/src/isomorphic/classic/class/ReactClass.js b/src/isomorphic/classic/class/ReactClass.js
index 223e58bf63187..50c48bec68a62 100644
--- a/src/isomorphic/classic/class/ReactClass.js
+++ b/src/isomorphic/classic/class/ReactClass.js
@@ -437,6 +437,21 @@ function validateMethodOverride(isAlreadyDefined, name) {
  */
 function mixSpecIntoComponent(Constructor, spec) {
   if (!spec) {
+    if (__DEV__) {
+      var typeofSpec = typeof spec;
+      var isMixinValid = typeofSpec === 'object' && spec !== null;
+
+      warning(
+        isMixinValid,
+        '%s: You\'re attempting to include a mixin that is either null ' +
+        'or not an object. Check the mixins included by the component, ' +
+        'as well as any mixins they include themselves. ' +
+        'Expected object but got %s.',
+        Constructor.displayName || 'ReactClass',
+        spec === null ? null : typeofSpec
+      );
+    }
+
     return;
   }
 
diff --git a/src/isomorphic/classic/class/__tests__/ReactClassMixin-test.js b/src/isomorphic/classic/class/__tests__/ReactClassMixin-test.js
index a65c68ff071bb..964526ea12c25 100644
--- a/src/isomorphic/classic/class/__tests__/ReactClassMixin-test.js
+++ b/src/isomorphic/classic/class/__tests__/ReactClassMixin-test.js
@@ -310,6 +310,94 @@ describe('ReactClass-mixin', function() {
     );
   });
 
+  it('should warn if the mixin is undefined', function() {
+    spyOn(console, 'error');
+
+    React.createClass({
+      mixins: [undefined],
+
+      render: function() {
+        return <span />;
+      },
+    });
+
+    expect(console.error.argsForCall.length).toBe(1);
+    expect(console.error.argsForCall[0][0]).toBe(
+      'Warning: ReactClass: You\'re attempting to include a mixin that is ' +
+      'either null or not an object. Check the mixins included by the ' +
+      'component, as well as any mixins they include themselves. ' +
+      'Expected object but got undefined.'
+    );
+  });
+
+  it('should warn if the mixin is null', function() {
+    spyOn(console, 'error');
+
+    React.createClass({
+      mixins: [null],
+
+      render: function() {
+        return <span />;
+      },
+    });
+
+    expect(console.error.argsForCall.length).toBe(1);
+    expect(console.error.argsForCall[0][0]).toBe(
+      'Warning: ReactClass: You\'re attempting to include a mixin that is ' +
+      'either null or not an object. Check the mixins included by the ' +
+      'component, as well as any mixins they include themselves. ' +
+      'Expected object but got null.'
+    );
+  });
+
+  it('should warn if an undefined mixin is included in another mixin', function() {
+    spyOn(console, 'error');
+
+    var mixinA = {
+      mixins: [undefined],
+    };
+
+    React.createClass({
+      mixins: [mixinA],
+
+      render: function() {
+        return <span />;
+      },
+    });
+
+    expect(console.error.argsForCall.length).toBe(1);
+    expect(console.error.argsForCall[0][0]).toBe(
+      'Warning: ReactClass: You\'re attempting to include a mixin that is ' +
+      'either null or not an object. Check the mixins included by the ' +
+      'component, as well as any mixins they include themselves. ' +
+      'Expected object but got undefined.'
+    );
+  });
+
+  it('should warn if a null mixin is included in another mixin', function() {
+    spyOn(console, 'error');
+
+    var mixinA = {
+      mixins: [null],
+    };
+
+    React.createClass({
+      mixins: [mixinA],
+
+      render: function() {
+        return <span />;
+      },
+    });
+
+    expect(console.error.argsForCall.length).toBe(1);
+    expect(console.error.argsForCall[0][0]).toBe(
+      'Warning: ReactClass: You\'re attempting to include a mixin that is ' +
+      'either null or not an object. Check the mixins included by the ' +
+      'component, as well as any mixins they include themselves. ' +
+      'Expected object but got null.'
+    );
+  });
+
   it('should throw if the mixin is a React component', function() {
     expect(function() {
       React.createClass({