Fix broken tests

mchapman · mchapman · commit af5129fb92e6 · 2021-06-12T16:47:35.000Z
diff --git a/src/client/js/controllers/search-ctrl.ts b/src/client/js/controllers/search-ctrl.ts
@@ -6,7 +6,6 @@ module fng.controllers {
   export function SearchCtrl($scope, $http, $location, routingService) {
 
     var lastSearchSent;
-
     var _isNotMobile;
 
     _isNotMobile = (function () {
@@ -89,7 +88,7 @@ module fng.controllers {
 
     $scope.$watch('searchTarget', function (newValue) {
       if (newValue && newValue.length > 0) {
-        lastSearchSent = new Date().valueOf();
+        lastSearchSent = $scope.testTime || new Date().valueOf();
         $http.get('/api/search?q=' + newValue + '&sentAt=' + lastSearchSent).then(function (response) {
           let data: any = response.data;
           // Check that we haven't fired off a subsequent request, in which
diff --git a/test/unit/searchSpec.js b/test/unit/searchSpec.js
@@ -18,6 +18,7 @@ describe('search', function () {
     scope = $rootScope;
     $compile(elm)(scope);
     scope.$digest();
+    scope.testTime = new Date().valueOf();
   }));
 
   describe('form generation', function () {
@@ -38,7 +39,7 @@ describe('search', function () {
   describe('results list', function () {
 
     it('displays one result when there is one', function () {
-      $httpBackend.whenGET('/api/search?q=hello').respond({results: [
+      $httpBackend.whenGET(`/api/search?q=hello&sentAt=${scope.testTime}`).respond({results: [
         {id: '1', resource: 'resource', resourceText: 'Resource', text: 'Hello 1'}
       ]});
       scope.searchTarget = 'hello';
@@ -49,7 +50,7 @@ describe('search', function () {
     });
 
     it('displays two results when there are two', function () {
-      $httpBackend.whenGET('/api/search?q=hello').respond({results: [
+      $httpBackend.whenGET(`/api/search?q=hello&sentAt=${scope.testTime}`).respond({results: [
         {id: '1', resource: 'resource', resourceText: 'Resource', text: 'Hello 1'},
         {id: '2', resource: 'resource', resourceText: 'Resource', text: 'Hello 2'}
       ]});
@@ -63,7 +64,7 @@ describe('search', function () {
     });
 
     it('should have an error class in the search box when the string is not found', function () {
-      $httpBackend.whenGET('/api/search?q=hello').respond({results: []});
+      $httpBackend.whenGET(`/api/search?q=hello&sentAt=${scope.testTime}`).respond({results: []});
       scope.searchTarget = 'hello';
       scope.$digest();
       $httpBackend.flush();
@@ -77,7 +78,7 @@ describe('search', function () {
     });
 
     it('formats results', function () {
-      $httpBackend.whenGET('/api/search?q=hello').respond({'results': [
+      $httpBackend.whenGET(`/api/search?q=hello&sentAt=${scope.testTime}`).respond({results: [
         {'resource': 'f_nested_schema', 'resourceText': 'Exams', 'id': '51c583d5b5c51226db418f15', 'text': 'Brown, John', 'searchImportance': 99},
         {'resource': 'f_nested_schema', 'resourceText': 'Exams', 'id': '51c583d5b5c51226db418f17', 'text': 'Brown, Jenny', 'searchImportance': 99}
       ], 'moreCount': 0});
@@ -93,7 +94,7 @@ describe('search', function () {
     });
 
     it('should focus on the first result returned', function () {
-      $httpBackend.whenGET('/api/search?q=hello').respond({'results': [
+      $httpBackend.whenGET(`/api/search?q=hello&sentAt=${scope.testTime}`).respond({results: [
         {'resource': 'f_nested_schema', 'resourceText': 'Exams', 'id': '51c583d5b5c51226db418f15', 'text': 'Brown, John', 'searchImportance': 99},
         {'resource': 'f_nested_schema', 'resourceText': 'Exams', 'id': '51c583d5b5c51226db418f17', 'text': 'Brown, Jenny', 'searchImportance': 99}
       ], 'moreCount': 0});
@@ -165,7 +166,7 @@ describe('search', function () {
     });
 
     it('should clear the target and the reults when Esc is pressed', function () {
-      $httpBackend.whenGET('/api/search?q=hello').respond({'results': [
+      $httpBackend.whenGET(`/api/search?q=hello&sentAt=${scope.testTime}`).respond({results: [
         {'resource': 'f_nested_schema', 'resourceText': 'Exams', 'id': '51c583d5b5c51226db418f15', 'text': 'Brown, John', 'searchImportance': 99},
         {'resource': 'f_nested_schema', 'resourceText': 'Exams', 'id': '51c583d5b5c51226db418f17', 'text': 'Brown, Jenny', 'searchImportance': 99}
       ], 'moreCount': 0});
@@ -179,5 +180,4 @@ describe('search', function () {
 
   });
 
-
 });
