Added some more tests - mainly for for the templating

iamphill · Feb 24, 2015 · df89cdb · df89cdb
1 parent fbb4616
commit df89cdb
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 0 deletions.
diff --git a/dist/Tweetsie.js b/dist/Tweetsie.js
@@ -408,6 +408,11 @@ var Tweetsie = (function () {
         var regex = new RegExp(/{{(.*?)}}/g);
         var matches = temp.match(regex);
 
+        if (matches === null) {
+          this.error("No variables entered into the template");
+          return;
+        }
+
         // Loop all tweets
         this.tweets.forEach(function (tweet) {
           var tweethtml = "<div data-tweetsie-id=\"" + tweet.id + "\">" + temp + "</div>";
@@ -489,6 +494,10 @@ var Tweetsie = (function () {
         // Get container
         var container = this.getContainer();
         container.innerHTML = html;
+
+        if (this.opts.callback !== undefined) {
+          this.opts.callback(this.tweets);
+        }
       },
       writable: true,
       configurable: true

diff --git a/lib/Tweetsie.js b/lib/Tweetsie.js
@@ -291,6 +291,11 @@ class Tweetsie {
     let regex = new RegExp(/{{(.*?)}}/g);
     let matches = temp.match(regex);
 
+    if (matches === null) {
+      this.error('No variables entered into the template');
+      return;
+    }
+
     // Loop all tweets
     this.tweets.forEach((tweet) => {
       let tweethtml = `<div data-tweetsie-id="${tweet.id}">${temp}</div>`;
@@ -362,5 +367,9 @@ class Tweetsie {
     // Get container
     let container = this.getContainer();
     container.innerHTML = html;
+
+    if (this.opts.callback !== undefined) {
+      this.opts.callback(this.tweets);
+    }
   }
 }
diff --git a/tests/index.html b/tests/index.html
@@ -8,6 +8,7 @@
 <body>
   <div id="qunit"></div>
   <div id="qunit-fixture"></div>
+  <div id="tweetsie-container"></div>
   <script src="js/qunit.js"></script>
   <script src="../dist/Tweetsie.js"></script>
   <script src="test.js"></script>

diff --git a/tests/test.js b/tests/test.js
@@ -2,6 +2,9 @@
   var widgetid = '570149068425674752';
   var WIDGETID_ERROR_MSG = 'Must pass in a `widgetid`';
   var NOT_FOUND_MSG = 'Twitter responded with: Widget configuration is not found.';
+  var CONTAINER_ID = 'tweetsie-container';
+  var NO_CONTAINER = 'No container passed to Tweetsie';
+  var TEMPLATE_EMPTY_MATCHES = 'No variables entered into the template';
 
   test('Tweetsie creation', function (assert) {
     var done = assert.async();
@@ -78,4 +81,54 @@
       }
     });
   });
+
+  test('Tweet template with empty template', function (assert) {
+    var done = assert.async();
+
+    new Tweetsie({
+      widgetid: widgetid,
+      count: 1,
+      template: '',
+      error: function (msg) {
+        assert.equal(msg, TEMPLATE_EMPTY_MATCHES, 'Template matches found?!');
+        done();
+      }
+    });
+  });
+
+  test('Tweet template without container', function (assert) {
+    var done = assert.async();
+
+    new Tweetsie({
+      widgetid: widgetid,
+      count: 1,
+      template: '{{ body }}',
+      error: function (msg) {
+        assert.equal(msg, NO_CONTAINER, 'Somehow found a container?');
+        done();
+      }
+    });
+  });
+
+  test('Tweet template with container', function (assert) {
+    var done = assert.async();
+    var i = 0;
+
+    new Tweetsie({
+      container: 'tweetsie-container',
+      widgetid: widgetid,
+      count: 1,
+      template: '<p>{{ body }}</p>',
+      callback: function (tweets) {
+        if (i === 0) {
+          setTimeout(function () {
+            var el = document.getElementById(CONTAINER_ID);
+            assert.equal(el.getElementsByTagName('p').length, 1, 'Template didn\'t render right!');
+            done();
+          }, 200);
+        }
+        i++;
+      }
+    });
+  });
 })();