Merge pull request react-bootstrap#438 from aforty/patch-1

Col Push/Pull/Offset value zero support

Author: mtscout6

src/Col.jsx

@@ -46,19 +46,19 @@ var Col = React.createClass({
 
       prop = size + 'Offset';
       classPart = size + '-offset-';
-      if (this.props[prop]) {
+      if (this.props[prop] >= 0) {
         classes['col-' + classPart + this.props[prop]] = true;
       }
 
       prop = size + 'Push';
       classPart = size + '-push-';
-      if (this.props[prop]) {
+      if (this.props[prop] >= 0) {
         classes['col-' + classPart + this.props[prop]] = true;
       }
 
       prop = size + 'Pull';
       classPart = size + '-pull-';
-      if (this.props[prop]) {
+      if (this.props[prop] >= 0) {
         classes['col-' + classPart + this.props[prop]] = true;
       }
     }, this);
@@ -71,4 +71,4 @@ var Col = React.createClass({
   }
 });
 
-module.exports = Col;
+module.exports = Col;

test/ColSpec.jsx

@@ -0,0 +1,43 @@
+/*global describe, it, assert */
+
+var React          = require('react');
+var ReactTestUtils = require('react/lib/ReactTestUtils');
+var Col            = require('../lib/Col');
+
+describe('Col', function () {
+  it('Should set Offset of zero', function () {
+    var instance = ReactTestUtils.renderIntoDocument(
+      <Col xsOffset={0} smOffset={0} mdOffset={0} lgOffset={0} />
+    );
+
+    var instanceClassName = instance.getDOMNode().className;
+    assert.ok(instanceClassName.match(/\bcol-xs-offset-0\b/));
+    assert.ok(instanceClassName.match(/\bcol-sm-offset-0\b/));
+    assert.ok(instanceClassName.match(/\bcol-md-offset-0\b/));
+    assert.ok(instanceClassName.match(/\bcol-lg-offset-0\b/));
+  });
+
+  it('Should set Pull of zero', function () {
+    var instance = ReactTestUtils.renderIntoDocument(
+      <Col xsPull={0} smPull={0} mdPull={0} lgPull={0} />
+    );
+
+    var instanceClassName = instance.getDOMNode().className;
+    assert.ok(instanceClassName.match(/\bcol-xs-pull-0\b/));
+    assert.ok(instanceClassName.match(/\bcol-sm-pull-0\b/));
+    assert.ok(instanceClassName.match(/\bcol-md-pull-0\b/));
+    assert.ok(instanceClassName.match(/\bcol-lg-pull-0\b/));
+  });
+
+  it('Should set Push of zero', function () {
+    var instance = ReactTestUtils.renderIntoDocument(
+      <Col xsPush={0} smPush={0} mdPush={0} lgPush={0} />
+    );
+
+    var instanceClassName = instance.getDOMNode().className;
+    assert.ok(instanceClassName.match(/\bcol-xs-push-0\b/));
+    assert.ok(instanceClassName.match(/\bcol-sm-push-0\b/));
+    assert.ok(instanceClassName.match(/\bcol-md-push-0\b/));
+    assert.ok(instanceClassName.match(/\bcol-lg-push-0\b/));
+  });
+});