Merge 780ef66 into 00b528d

jamestalmage · Dec 18, 2018 · 41d12fa · 41d12fa
2 parents 00b528d + 780ef66
commit 41d12fa
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 0 deletions.
diff --git a/advanced-usage.md b/advanced-usage.md
@@ -17,6 +17,20 @@
 
 ```
 
+##### colSpan works with headers too:
+    ┌───────────┬────────┐
+    │ foobar    │ bazbar │
+    ├─────┬─────┼────────┤
+    │ foo │ bar │ baz    │
+    └─────┴─────┴────────┘
+```javascript
+      var table = new Table({
+        style: {border:[], head: []},
+        head:[{content: 'foobar', colSpan: 2}, {content: 'bazbar'}]
+      });
+
+      table.push(['foo', 'bar', 'baz']);
+```
 
 ##### use colSpan to span columns - (colSpan below normal cell)
     ┌───────┬───────┐

diff --git a/test/table-test.js b/test/table-test.js
@@ -69,6 +69,64 @@ describe('@api Table ',function(){
 
     expect(table.toString()).to.equal(expected.join("\n"));
   });
+
+  it('will render head with text', function() {
+      var table = new Table({
+          style: {border:[], head: []},
+          head:['foobar', 'barbar', 'bazbar'],
+      });
+
+      table.push(['foo', 'bar', 'baz']);
+
+      var expected = [
+           '┌────────┬────────┬────────┐'
+          ,'│ foobar │ barbar │ bazbar │'
+          ,'├────────┼────────┼────────┤'
+          ,'│ foo    │ bar    │ baz    │'
+          ,'└────────┴────────┴────────┘'
+      ];
+
+      expect(table.toString()).to.equal(expected.join('\n'));
+  });
+
+  it('will render head with Cells', function() {
+      var table = new Table({
+          style: {border:[], head: []},
+          head:[{content: 'foobar'}, {content: 'barbar'}, {content: 'bazbar'}],
+      });
+
+      table.push(['foo', 'bar', 'baz']);
+
+      var expected = [
+           '┌────────┬────────┬────────┐'
+          ,'│ foobar │ barbar │ bazbar │'
+          ,'├────────┼────────┼────────┤'
+          ,'│ foo    │ bar    │ baz    │'
+          ,'└────────┴────────┴────────┘'
+      ];
+
+      expect(table.toString()).to.equal(expected.join('\n'));
+  });
+
+  it('will render colSpan in head correctly', function() {
+      var table = new Table({
+          style: {border:[], head: []},
+          head:[{content: 'foobar', colSpan: 2}, {content: 'bazbar'}],
+      });
+
+      table.push(['foo', 'bar', 'baz']);
+
+
+      var expected = [
+           '┌───────────┬────────┐'
+          ,'│ foobar    │ bazbar │'
+          ,'├─────┬─────┼────────┤'
+          ,'│ foo │ bar │ baz    │'
+          ,'└─────┴─────┴────────┘'
+      ];
+
+      expect(table.toString()).to.equal(expected.join('\n'));
+  });
 });