Merge branch 'enhancement/event-form' of github.com:ArayB/cp-zen-frontend into enhancement/event-form

Author: ArayB

test/unit/specs/dojos/manage-request-to-join.spec.js

@@ -165,12 +165,16 @@ describe('Manage request to join component', () => {
         err.status = 400;
         DojosService.membership.accept.rejects(err);
         vm.membershipRequest = {};
+<<<<<<< HEAD
 <<<<<<< HEAD
         vm.onError = sandbox.stub();
         vm.loadConflictingUser = sandbox.stub().resolves();
 =======
         vm.onError = sinon.stub();
 >>>>>>> Add unit tests for event form
+=======
+        vm.onError = sinon.stub();
+>>>>>>> fff3af7f33812ddbc1922f3173da485aa86cc325
         vm.status = 'accept';
         await vm.actOnMembershipRequest();
         expect(DojosService.membership.accept).to.have.been.calledOnce;