CPS-479: Fix Add Activity Form URL

ang/civicase/activity/directives/add-activity-menu.directive.js

@@ -95,6 +95,7 @@
      * @returns {string} url
      */
     $scope.newActivityUrl = function (actType) {
+      var caseClientId = _.first($scope.case.client).contact_id;
       var caseType = CaseType.getById($scope.case.case_type_id);
       var caseQueryParams = JSON.stringify(getCaseQueryParams({
         caseId: $scope.case.id,
@@ -107,7 +108,8 @@
       };
       var options = {
         action: 'add',
-        civicase_reload: caseQueryParams
+        civicase_reload: caseQueryParams,
+        cid: caseClientId
       };
       var activityForm = ActivityForms.getActivityFormService(newActivity, options);
 

ang/test/civicase/activity/directives/add-activity-menu.directive.spec.js

@@ -3,11 +3,20 @@
 (function (_) {
   describe('AddActivityMenu', function () {
     describe('Add Activity Menu Controller', function () {
-      var $controller, $rootScope, $scope, CaseType;
+      var $controller, $rootScope, $scope, ActivityForms, activityForm, CaseType,
+        mockCase;
 
-      beforeEach(module('civicase', 'civicase.data'));
+      beforeEach(module('civicase', 'civicase.data', ($provide) => {
+        ActivityForms = jasmine.createSpyObj('ActivityForms', ['getActivityFormService']);
+        activityForm = jasmine.createSpyObj('activityForm', ['getActivityFormUrl']);
 
-      beforeEach(inject(function (_$controller_, _$rootScope_, _CaseType_, _ActivityType_) {
+        ActivityForms.getActivityFormService.and.returnValue(activityForm);
+        activityForm.getActivityFormUrl.and.returnValue('/activity-form-url');
+
+        $provide.value('ActivityForms', ActivityForms);
+      }));
+
+      beforeEach(inject(function (_$controller_, _$rootScope_, _CaseType_) {
         $controller = _$controller_;
         $rootScope = _$rootScope_;
         CaseType = _CaseType_;
@@ -21,7 +30,7 @@
           activityTypeWithMaxInstance = activityTypes.find(function (activity) {
             return activity.max_instances;
           });
-          var mockCase = {
+          mockCase = {
             case_type_id: 1
           };
 
@@ -37,6 +46,64 @@
         });
       });
 
+      describe('new activity URL', () => {
+        beforeEach(() => {
+          mockCase = {
+            id: _.uniqueId(),
+            case_type_id: '1',
+            client: [{ contact_id: _.uniqueId() }]
+          };
+
+          initController(mockCase);
+        });
+
+        describe('when getting the form URL for a particular activity type', () => {
+          let returnedUrl, activityType;
+
+          beforeEach(() => {
+            activityType = {
+              id: _.uniqueId(),
+              name: 'sample-activity-type'
+            };
+            returnedUrl = $scope.newActivityUrl(activityType);
+          });
+
+          it('requests the appropriate activity form service', () => {
+            expect(ActivityForms.getActivityFormService).toHaveBeenCalledWith(
+              {
+                activity_type_id: activityType.id,
+                case_id: $scope.case.id,
+                type: activityType.name
+              },
+              {
+                action: 'add',
+                civicase_reload: jasmine.any(String),
+                cid: _.first(mockCase.client).contact_id
+              }
+            );
+          });
+
+          it('requests the activity type form URL', () => {
+            expect(activityForm.getActivityFormUrl).toHaveBeenCalledWith(
+              {
+                activity_type_id: activityType.id,
+                case_id: $scope.case.id,
+                type: activityType.name
+              },
+              {
+                action: 'add',
+                civicase_reload: jasmine.any(String),
+                cid: _.first(mockCase.client).contact_id
+              }
+            );
+          });
+
+          it('returns the URL for the acitivity type form', () => {
+            expect(returnedUrl).toBe('/activity-form-url');
+          });
+        });
+      });
+
       /**
        * Initializes the add activity menu controller.
        *