update tests

test/unit/controller/search.js

@@ -1,6 +1,6 @@
 var setup = require('../../../controller/search'),
     mockBackend = require('../mock/backend'),
-    mockQuery = require('../mock/query');
+    mockQuery = require('../mock/search_query');
 var proxyquire =  require('proxyquire').noCallThru();
 
 module.exports.tests = {};
@@ -47,7 +47,8 @@ module.exports.tests.functional_success = function(test, common) {
   }];
 
   var expectedMeta = {
-    scores: [10, 20]
+    scores: [10, 20],
+    query_type: 'mock'
   };
 
   var expectedData = [
@@ -89,7 +90,7 @@ module.exports.tests.functional_success = function(test, common) {
         searchType: 'dfs_query_then_fetch'
       }, 'correct backend command');
     });
-    var controller = setup(fakeDefaultConfig, backend, mockQuery());
+    var controller = setup(fakeDefaultConfig, backend, mockQuery);
     var res = {
       status: function (code) {
         t.equal(code, 200, 'status set');
@@ -125,7 +126,7 @@ module.exports.tests.functional_success = function(test, common) {
         searchType: 'dfs_query_then_fetch'
       }, 'correct backend command');
     });
-    var controller = setup(fakeCustomizedConfig, backend, mockQuery());
+    var controller = setup(fakeCustomizedConfig, backend, mockQuery);
     var res = {
       status: function (code) {
         t.equal(code, 200, 'status set');
@@ -147,7 +148,7 @@ module.exports.tests.functional_failure = function(test, common) {
     var backend = mockBackend( 'client/search/fail/1', function( cmd ){
       t.deepEqual(cmd, { body: { a: 'b' }, index: 'pelias', searchType: 'dfs_query_then_fetch' }, 'correct backend command');
     });
-    var controller = setup( fakeDefaultConfig, backend, mockQuery() );
+    var controller = setup( fakeDefaultConfig, backend, mockQuery );
     var req = { clean: { a: 'b' }, errors: [], warnings: [] };
     var next = function(){
       t.equal(req.errors[0],'a backend error occurred');
@@ -162,7 +163,7 @@ module.exports.tests.timeout = function(test, common) {
     var backend = mockBackend( 'client/search/timeout/1', function( cmd ){
       t.deepEqual(cmd, { body: { a: 'b' }, index: 'pelias', searchType: 'dfs_query_then_fetch' }, 'correct backend command');
     });
-    var controller = setup( fakeDefaultConfig, backend, mockQuery() );
+    var controller = setup( fakeDefaultConfig, backend, mockQuery );
     var req = { clean: { a: 'b' }, errors: [], warnings: [] };
     var next = function(){
       t.equal(req.errors[0],'Request Timeout after 5000ms');
@@ -177,7 +178,7 @@ module.exports.tests.existing_results = function(test, common) {
     var backend = function() {
       throw new Error('backend should not have been called');
     };
-    var controller = setup( fakeDefaultConfig, backend, mockQuery() );
+    var controller = setup( fakeDefaultConfig, backend, mockQuery );
 
     var req = { };
     // the existence of `data` means that there are already results so
@@ -197,8 +198,9 @@ module.exports.tests.existing_results = function(test, common) {
 module.exports.tests.undefined_query = function(test, common) {
   test('query returning undefined should not call service', function(t) {
     // a function that returns undefined
-    var query = function() {
+    var query = {
-      return;
+      query: function () { return; },
+      query_type: 'empty'
     };
 
     var search_service_was_called = false;

test/unit/run.js

@@ -26,6 +26,7 @@ var tests = [
   require('./helper/sizeCalculator'),
   require('./middleware/access_log'),
   require('./middleware/confidenceScore'),
+  require('./middleware/confidenceScoreFallback'),
   require('./middleware/confidenceScoreReverse'),
   require('./middleware/distance'),
   require('./middleware/localNamingConventions'),