Don't render Context as div (#81)

* Add `includeOwnBody` property to Context.
* Exclude src test from running on Node 6.

Author: strausr

.travis.yml

@@ -13,3 +13,7 @@ env:
   - TEST_SUBJECT=src
   - TEST_SUBJECT=lib
   - TEST_SUBJECT=dist
+matrix:
+  exclude:
+  - node_js: 6
+    env: TEST_SUBJECT=src

src/components/CloudinaryContext/CloudinaryContext.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import CloudinaryComponent from '../CloudinaryComponent';
 import { Util } from 'cloudinary-core';
 
@@ -40,7 +41,9 @@ class CloudinaryContext extends CloudinaryComponent {
         allowedProps[currentProp] = this.props[currentProp];
         return allowedProps;
       }, {});
-    return <div {...nonCloudinaryProps}>{this.props.children}</div>;
+    const {includeOwnBody, ...props} = nonCloudinaryProps;
+
+  return includeOwnBody ? this.props.children : <div {...props}>{this.props.children}</div>;  
   }
 }
 
@@ -53,8 +56,8 @@ CloudinaryContext.CLOUDINARY_PROPS = CloudinaryComponent.VALID_OPTIONS.reduce(
   {}
 );
 
-CloudinaryContext.propTypes = CloudinaryComponent.propTypes;
-CloudinaryContext.defaultProps = {};
+CloudinaryContext.propTypes = {...CloudinaryComponent.propTypes, includeOwnBody: PropTypes.bool};
+CloudinaryContext.defaultProps = {includeOwnBody: false };
 CloudinaryContext.childContextTypes = CloudinaryComponent.contextTypes;
 
 export default CloudinaryContext;

test/ContextTest.js

@@ -19,6 +19,25 @@ describe('CloudinaryContext', () => {
     expect(img.instance().state.url).to.equal("http://res.cloudinary.com/demo/image/upload/sample");
   });
 
+   it("should render without div", function() {
+    let tag = mount(
+      <CloudinaryContext className="root" cloudName="demo" includeOwnBody={true}>
+        <Image publicId="sample" />
+      </CloudinaryContext>
+    );
+
+    expect(tag.html().startsWith("<div")).to.equal(false);
+  });
+  it("should render with div", function() {
+    let tag = mount(
+      <CloudinaryContext className="root" cloudName="demo" includeOwnBody={false}>
+        <Image publicId="sample" />
+      </CloudinaryContext>
+    );
+
+    expect(tag.html().startsWith("<div")).to.equal(true);
+  }); 
+
   it("should pass properties to children with snake case", function() {
       let tag = mount(
           <CloudinaryContext className="root" cloudName="demo" fetch_format="auto" >