Add E2E tests for event creation

Author: ArayB

cypress/fixtures/events.json

@@ -0,0 +1,73 @@
+{
+  "results": [
+    {
+      "id": "b2a60543-6356-4ab5-b766-d66b96187b14",
+      "name": "asdasdfas",
+      "country": {
+        "countryName": "United Kingdom",
+        "continent": "EU",
+        "alpha2": "GB",
+        "alpha3": "GBR",
+        "countryNumber": 826
+      },
+      "city": {
+        "nameWithHierarchy": "Sheffield"
+      },
+      "address": "108 The Moor, Sheffield, S1 4PD",
+      "createdAt": "2019-06-10T10:46:58.549Z",
+      "createdBy": null,
+      "type": "one-off",
+      "description": "<div><!--block-->Please bring:<br><br></div><ul><li><!--block-->A laptop. Borrow one from somebody if needs be.</li><li><!--block--><strong>A parent! (Very important). If you are 12 or under, your parent must stay with you during the session.</strong></li></ul>",
+      "dojoId": "4f2ebdec-ce05-4a85-840c-f59fb0a19ca7",
+      "position": null,
+      "public": true,
+      "status": "published",
+      "recurringType": null,
+      "dates": [
+        {
+          "startTime": "2019-07-12T10:00:00.000Z",
+          "endTime": "2019-07-12T12:00:00.000Z"
+        }
+      ],
+      "ticketApproval": false,
+      "notifyOnApplicant": false,
+      "eventbriteId": null,
+      "eventbriteUrl": null,
+      "useDojoAddress": false,
+      "startTime": "2019-07-12T10:00:00.000Z",
+      "endTime": "2019-07-12T12:00:00.000Z",
+      "sessions": [
+        {
+          "id": "59f9ec57-15a0-4ad0-9de4-e1f341270943",
+          "name": "Dojo",
+          "description": "Dojo Session",
+          "eventId": "b2a60543-6356-4ab5-b766-d66b96187b14",
+          "status": "active",
+          "tickets": [
+            {
+              "id": "b54f281a-beb4-43f5-aac0-bc670f0f2cd2",
+              "sessionId": "59f9ec57-15a0-4ad0-9de4-e1f341270943",
+              "name": "Youth",
+              "type": "ninja",
+              "quantity": 5,
+              "deleted": 0,
+              "totalApplications": 0,
+              "approvedApplications": 0
+            },
+            {
+              "id": "a83806d5-3a77-4617-9f08-b1becbb0279f",
+              "sessionId": "59f9ec57-15a0-4ad0-9de4-e1f341270943",
+              "name": "Mentor",
+              "type": "mentor",
+              "quantity": 6,
+              "deleted": 0,
+              "totalApplications": 0,
+              "approvedApplications": 0
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "total": 7
+}

cypress/integration/events/event-form_spec.js

@@ -4,16 +4,38 @@ describe('Event form', () => {
   beforeEach(() => {
     cy.server();
     cy.route('/api/2.0/users/instance', 'fx:parentLoggedIn');
-    cy.route('/api/2.0/dojos/d1', 'fx:dojo').as('dojo');
+    cy.route('/api/2.0/dojos/b850b40e-1e10-4e3a-8a46-d076c94946c6', 'fx:dojo').as('dojo');
+    cy.route('/api/3.0/dojos/b850b40e-1e10-4e3a-8a46-d076c94946c6/events?pageSize=1&page=1&orderBy=startTime&direction=desc&related=sessions.tickets', 'fx:events').as('events')
   });
 
   it('should display the form', () => {
-    cy.visit('/dashboard/dojos/d1/events/new');
+    cy.visit('/dashboard/dojos/b850b40e-1e10-4e3a-8a46-d076c94946c6/events/new');
+    cy.wait('@events');
     cy.wait('@dojo');
     cy.get(page.header).should('be.visible');
     cy.get(page.submitButton).should('be.visible');
-    cy.get(page.submitButton).invoke('text').should('contain', 'Publish and email members');
+    cy.get(page.submitButton).invoke('text').should('contain', 'Publish');
     cy.get(page.youthTickets).should('be.visible');
     cy.get(page.mentorTickets).should('be.visible');
   });
+
+  it('forwards to dojo page on publish', () => {
+    cy.route('POST', '/api/3.0/events', 'fx:events');
+    cy.visit('/dashboard/dojos/b850b40e-1e10-4e3a-8a46-d076c94946c6/events/new');
+    cy.wait('@events');
+    cy.wait('@dojo');
+    cy.get('[data-cy=title]').type('New event');
+    cy.get(page.submitButton).click();
+    cy.url().should('include', '/dojos/ie/dublin/cd-rom');
+  });
+
+  it('displays error message if form incomplete', () => {
+    cy.route('POST', '/api/3.0/events', 'fx:events');
+    cy.visit('/dashboard/dojos/b850b40e-1e10-4e3a-8a46-d076c94946c6/events/new');
+    cy.wait('@events');
+    cy.wait('@dojo');
+    cy.get(page.submitButton).click();
+    cy.get('[data-cy=title-error]').should('be.visible');
+    cy.get('[data-cy=title-error]').invoke('text').should('eq', 'Title is required');
+  });
 });

src/events/cd-event-form.vue

@@ -11,8 +11,8 @@
               <h3 class="text-danger">{{ $t('There was an error processing this request. Please try again or contact support') }}</h3>
             </div>
             <h4 class="cd-event__section-title">{{ $t('Event Title') }}</h4>
-            <p class="text-danger" v-show="errors.has('name:required')">{{ $t('Title is required') }}</p>
-            <input type="text" name="name" v-model="name" class="form-control" data-vv-name="name" v-validate="'required'" data-vv-validate-on="blur" :placeholder="$t('e.g. October Dojo')">
+            <p class="text-danger" data-cy="title-error" v-show="errors.has('name:required')">{{ $t('Title is required') }}</p>
+            <input type="text" data-cy="title" name="name" v-model="name" class="form-control" data-vv-name="name" v-validate="'required'" data-vv-validate-on="blur" :placeholder="$t('e.g. October Dojo')">
 
             <div class="cd-event-form__location">
               <!-- is the text relevant when it's been modified? -->
@@ -341,7 +341,7 @@
             related: 'sessions.tickets',
           },
         });
-
+//
       this.latestEvent = latestEvent.body.results[0];
       this.dojo = (await DojosService.getDojoById(dojoId)).body;
       this.populateForm();