No-Jira Fix Campus (#847)

Validate campus name on page load from browsers autocomplete
CruGlobal · Nov 9, 2023 · 98a8b38 · 98a8b38
1 parent 6b2f1f0
commit 98a8b38
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 1 deletion.
diff --git a/app/scripts/directives/blocks.js b/app/scripts/directives/blocks.js
@@ -251,6 +251,13 @@ angular
               return campusNames.data;
             });
         };
+        if ($scope.answer.value) {
+          $scope.searchCampuses($scope.answer.value).then((data) => {
+            if (!data.length) {
+              $scope.answer.value = '';
+            }
+          });
+        }
       },
     };
   });

diff --git a/app/scripts/services/validateRegistrant.js b/app/scripts/services/validateRegistrant.js
@@ -335,6 +335,12 @@ angular
                 return;
               }
               break;
+            case 'campusQuestion':
+              if (_.isEmpty(answer)) {
+                invalidBlocks.push(block.id);
+                return;
+              }
+              break;
             case 'addressQuestion':
               if (
                 answer.country !== 'US' &&

diff --git a/app/views/blocks/campusQuestion.html b/app/views/blocks/campusQuestion.html
@@ -3,6 +3,7 @@
     type="text"
     ng-model="answer.value"
     placeholder=""
+    name="campus"
     autocomplete="off"
     aria-autocomplete="none"
     class="form-control"

diff --git a/test/spec/directives/block.spec.js b/test/spec/directives/block.spec.js
@@ -159,16 +159,18 @@ describe('Directive: blocks', () => {
   });
 
   describe('campusQuestion', () => {
-    let $compile, $rootScope, $scope;
+    let $compile, $rootScope, $scope, $httpBackend;
     beforeEach(inject((
       _$compile_,
       _$rootScope_,
       _$timeout_,
       $templateCache,
       testData,
+      _$httpBackend_,
     ) => {
       $compile = _$compile_;
       $rootScope = _$rootScope_;
+      $httpBackend = _$httpBackend_;
 
       $scope = $rootScope.$new();
       $templateCache.put('views/blocks/campusQuestion.html', '');
@@ -199,6 +201,21 @@ describe('Directive: blocks', () => {
 
       expect($scope.params.includeInternational).not.toBeDefined();
     });
+
+    it('checks the campus database if a answer is present on page load', () => {
+      $httpBackend
+        .whenGET('campuses/SFSU?includeInternational=true&limit=15')
+        .respond(() => [200, []]);
+
+      $scope.answer = { value: 'SFSU' };
+      $compile('<campus-question></campus-question>')($scope);
+
+      $httpBackend.flush();
+      $httpBackend.verifyNoOutstandingExpectation();
+      $httpBackend.verifyNoOutstandingRequest();
+
+      expect($scope.answer.value).toBe('');
+    });
   });
 
   describe('ethnicityQuestion', () => {

diff --git a/test/spec/services/validateRegistrant.spec.js b/test/spec/services/validateRegistrant.spec.js
@@ -91,6 +91,26 @@ describe('Service: validateRegistrant', function () {
     expect(validateRegistrant.validate(conference, registrant).length).toBe(1);
   });
 
+  it('marks an empty campus name as invalid', function () {
+    const conference = angular.copy(testData.conference);
+    conference.registrationPages[1].blocks[13].required = true;
+
+    const registrant = angular.copy(testData.registration.registrants[0]);
+    registrant.answers[12].value = '';
+
+    expect(validateRegistrant.validate(conference, registrant).length).toBe(1);
+  });
+
+  it('doesnt mark as invalid a campusQuestion field that is filled in', function () {
+    const conference = angular.copy(testData.conference);
+    conference.registrationPages[1].blocks[13].required = true;
+
+    const registrant = angular.copy(testData.registration.registrants[0]);
+    registrant.answers[12].value = 'San Francisco State University';
+
+    expect(validateRegistrant.validate(conference, registrant).length).toBe(0);
+  });
+
   it('empty address fields should not be valid when missing address1, state, zip or city', function () {
     var conference = angular.copy(testData.conference);
     conference.registrationPages[1].blocks[7].required = true;

diff --git a/test/spec/testData.spec.js b/test/spec/testData.spec.js
@@ -396,6 +396,19 @@ angular.module('confRegistrationWebApp').service('testData', function () {
             title: 'Child',
             type: 'checkboxQuestion',
           },
+          {
+            id: '0556295a-3c4d-45b2-a00e-42b1fe188421',
+            pageId: '7b4c19df-7377-4d37-90fb-5b262bb66d1a',
+            title: 'Campus',
+            exportFieldTitle: null,
+            type: 'campusQuestion',
+            required: false,
+            position: 2,
+            content: '',
+            profileType: null,
+            registrantTypes: [],
+            rules: [],
+          },
         ],
       },
     ],
@@ -691,6 +704,14 @@ angular.module('confRegistrationWebApp').service('testData', function () {
             amount: 0.0,
             lastUpdatedTimestamp: '2001-07-10T15:06:05.383Z',
           },
+          {
+            id: '6e52f066-f894-43ac-b9c0-bfbfbfbfdfdf',
+            registrantId: '6bd0f946-b010-4ef5-83f0-51c17449baf3',
+            blockId: '0556295a-3c4d-45b2-a00e-42b1fe188421',
+            value: '',
+            amount: 0.0,
+            lastUpdatedTimestamp: '2001-07-10T15:06:05.383Z',
+          },
         ],
         firstName: 'Test',
         lastName: 'Person',