Merge pull request #5 from christianbundy/euankdev

Fix searchPosts; write remaining tests

Author: christianbundy

index.js

@@ -134,10 +134,10 @@ var hn = {
 
   // search popular/recent posts
   searchPosts: function (query, cb) {
-    hn.call('search?query=' + query + '&tags=story', cb);
+    hn.call('search', {query: query, tags: 'story'}, cb);
   },
   searchLastPosts: function (query, cb) {
-    hn.call('search_by_date?query=' + query + '&tags=story', cb);
+    hn.call('search_by_date', {query: query, tags: 'story'}, cb);
   },
 
   // search popular/recent stories

test/fixtures/fixtures.json

@@ -12,6 +12,24 @@ var urls = [
     '/api/v1/search_by_date?tags=(story%2Cpoll)',
     '/api/v1/search?tags=story',
     '/api/v1/search_by_date?tags=story',
+    '/api/v1/items/17',
+    '/api/v1/users/pg',
+    '/api/v1/search?tags=comment%2Cauthor_pg',
+    '/api/v1/search_by_date?tags=comment%2Cauthor_pg',
+    '/api/v1/search?tags=poll%2Cauthor_pg',
+    '/api/v1/search_by_date?tags=poll%2Cauthor_pg',
+    '/api/v1/search?tags=story%2Cauthor_pg',
+    '/api/v1/search_by_date?tags=story%2Cauthor_pg',
+    '/api/v1/search?query=apple&tags=comment',
+    '/api/v1/search_by_date?query=apple&tags=comment',
+    '/api/v1/search?query=apple&tags=poll',
+    '/api/v1/search_by_date?query=apple&tags=poll',
+    '/api/v1/search?query=apple&tags=story',
+    '/api/v1/search_by_date?query=apple&tags=story',
+    '/api/v1/search?query=apple&tags=story',
+    '/api/v1/search_by_date?query=apple&tags=story',
+    '/api/v1/search?tags=ask_hn&query=apple&page=2',
+    '/api/v1/search_by_date?tags=ask_hn&query=apple&page=2',
 ];
 
 async.mapSeries(urls, function(item, next) {

test/fixtures/generate_fixtures.js

@@ -7,7 +7,6 @@ var fixtures = JSON.parse(fs.readFileSync(__dirname + "/fixtures/fixtures.json")
 
 var api = nock('https://hn.algolia.com').persist();
 fixtures.forEach(function(f) {
-  console.log(f.url);
   api.get(f.url).reply(200, f.reply);
 });
 
@@ -33,7 +32,7 @@ describe('hn', function(){
       return done("Error");
     }
     expect(data).to.have.property('hits');
-    data.hits.map(function(comment) {
+    data.hits.forEach(function(comment) {
       var intersection = tags.filter(function(n) {
         return comment._tags.indexOf(n) != -1;
       });
@@ -42,6 +41,19 @@ describe('hn', function(){
     done();
   }
 
+  function verifyDataHasAllOfTags(err, data, tags, done) {
+    if(err) {
+      return done("Error");
+    }
+    expect(data).to.have.property('hits');
+    data.hits.forEach(function(item) {
+      tags.forEach(function(tag) {
+        expect(item._tags).to.contain(tag);
+      });
+    });
+    done();
+  }
+
   it('should get comments', function(done) {
     hn.getComments(crazy_curry(['comment'], done, verifyDataHasOneOfTags));
   });
@@ -72,4 +84,79 @@ describe('hn', function(){
   it('should get latest stories', function(done) {
     hn.getLastStories(crazy_curry(['story'], done, verifyDataHasOneOfTags));
   });
+
+  it('should get item', function(done) {
+    hn.getItem(17, function(err, res) {
+      if(err) return done(err);
+      expect(res.id).to.equal(17);
+      expect(res.type).to.equal('comment');
+      done();
+    });
+  });
+
+  it('should get user', function(done) {
+    hn.getUser('pg', function(err, res) {
+      if(err) return done(err);
+      expect(res.username).to.equal('pg');
+      done();
+    });
+  });
+
+  it('should get user comments', function(done) {
+    hn.getUserComments('pg', crazy_curry(['comment','author_pg'], done, verifyDataHasAllOfTags));
+  });
+  it('should get last user comments', function(done) {
+    hn.getLastUserComments('pg', crazy_curry(['comment','author_pg'], done, verifyDataHasAllOfTags));
+  });
+
+  it('should get user polls', function(done) {
+    hn.getUserPolls('pg', crazy_curry(['poll','author_pg'], done, verifyDataHasAllOfTags));
+  });
+  it('should get last user polls', function(done) {
+    hn.getLastUserPolls('pg', crazy_curry(['poll','author_pg'], done, verifyDataHasAllOfTags));
+  });
+
+  it('should get user stories', function(done) {
+    hn.getUserStories('pg', crazy_curry(['story','author_pg'], done, verifyDataHasAllOfTags));
+  });
+  it('should get last user stories', function(done) {
+    hn.getLastUserStories('pg', crazy_curry(['story','author_pg'], done, verifyDataHasAllOfTags));
+  });
+
+  it('should search comments', function(done) {
+    hn.searchComments('apple', crazy_curry(['comment'], done, verifyDataHasAllOfTags));
+  });
+  it('should search last comments', function(done) {
+    hn.searchLastComments('apple', crazy_curry(['comment'], done, verifyDataHasAllOfTags));
+  });
+
+  it('should search polls', function(done) {
+    hn.searchPolls('apple', crazy_curry(['poll'], done, verifyDataHasAllOfTags));
+  });
+  it('should search last polls', function(done) {
+    hn.searchLastPolls('apple', crazy_curry(['poll'], done, verifyDataHasAllOfTags));
+  });
+
+
+  it('should search posts', function(done) {
+    hn.searchPosts('apple', crazy_curry(['story'], done, verifyDataHasAllOfTags));
+  });
+  it('should search last posts', function(done) {
+    hn.searchLastPosts('apple', crazy_curry(['story'], done, verifyDataHasAllOfTags));
+  });
+
+  it('should search posts', function(done) {
+    hn.searchStories('apple', crazy_curry(['story'], done, verifyDataHasAllOfTags));
+  });
+  it('should search last posts', function(done) {
+    hn.searchLastStories('apple', crazy_curry(['story'], done, verifyDataHasAllOfTags));
+  });
+
+  it('should search', function(done) {
+    hn.search({tags: 'ask_hn', query: 'apple', page: 2}, crazy_curry(['ask_hn'], done, verifyDataHasAllOfTags));
+  });
+  it('should search last', function(done) {
+    hn.searchLast({tags: 'ask_hn', query: 'apple', page: 2}, crazy_curry(['ask_hn'], done, verifyDataHasAllOfTags));
+  });
+
 });