merge conflict resolution #24 #37

dwyl · Dec 3, 2015 · 364150e · 364150e
2 parents 1a84d2a + dfa64a1
commit 364150e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/lib/handlebars.js b/lib/handlebars.js
@@ -17,3 +17,5 @@ console.log(buildPost("hello you"))
 module.exports = {
  buildPost: buildPost
 }
+
+module.exports = buildPost;
diff --git a/tests/handlebar-test.js b/tests/handlebar-test.js
@@ -0,0 +1,14 @@
+var test = require('tape');
+var buildPost = require('../lib/handlebars.js');
+var fs = require('fs');
+
+
+test("amp compliant html", function(t){
+ var postData = "blah blah";
+ var buildPostResult = buildPost(postData);
+ var actual = (buildPostResult.indexOf("<html amp>") > -1) && (buildPostResult.indexOf("blah blah") > -1);
+ var expected = true;
+
+ t.equal(actual, expected, "WOOO");
+ t.end();
+});