Merge pull request #148 from openmcac/ac_select_speakers

Create bulletins with a sermon

Author: achan

app/routes/bulletins/new.js

@@ -13,7 +13,8 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
       name: 'Sunday Worship Service',
       description: publishedAt.format('MMMM Do YYYY, h:mm a'),
       serviceOrder: '',
-      group: group
+      group: group,
+      sermon: this.store.createRecord("sermon")
     });
 
     const filter = { latest_for_group: group.get('id') };

app/templates/bulletin/edit.hbs

@@ -6,7 +6,6 @@
       clearbanner=(action "clearBanner")
       diduploadaudio=(action "didUploadAudio")
       diduploadbanner=(action "didUploadBanner")
-      includesermon=true
       onsave=(action "saveBulletin")
       removeannouncement=(action "removeAnnouncement")
       reorderannouncements=(action "reorderAnnouncements")}}

app/templates/components/bulletin-editor.hbs

@@ -44,20 +44,18 @@
                               rows="10"}}
         </div>
       </div>
-      {{#if this.attrs.includesermon}}
-        <div class="panel panel-default">
-          <fieldset>
-            <div class="panel-heading">
-              <h3 class="panel-title">Sermon</h3>
-            </div>
-            <div class="panel-body">
-              {{sermon-editor sermon=bulletin.sermon
-                  diduploadaudio=(action this.attrs.diduploadaudio)
-                  clearaudio=(action this.attrs.clearaudio)}}
-            </div>
-          </fieldset>
-        </div>
-      {{/if}}
+      <div class="panel panel-default">
+        <fieldset>
+          <div class="panel-heading">
+            <h3 class="panel-title">Sermon</h3>
+          </div>
+          <div class="panel-body">
+            {{sermon-editor sermon=bulletin.sermon
+                diduploadaudio=(action this.attrs.diduploadaudio)
+                clearaudio=(action this.attrs.clearaudio)}}
+          </div>
+        </fieldset>
+      </div>
     </section>
     {{#if this.attrs.appendannouncement}}
       <section class="announcements col-md-6">

mirage/config.js

@@ -1,13 +1,22 @@
+import Mirage from "ember-cli-mirage";
+
 export default function() {
+  this.post("/api/auth/sign_in", function(schema, request) {
+    const user = schema.users.find(1);
+    return new Mirage.Response(
+        200,
+        { "access-token": "adssafsdafsdsfd", "client": "asdfasdfasafs", "uid": "[email protected]" },
+        {"data":{"id":`${user.id}`,"type":"users","links":{"self":`/api/v1/users/${user.id}`},"attributes":{"name":user.name,"email":user.email}}}
+    );
+  });
+
   this.namespace = "/api/v1";
 
   this.delete("/announcements/:id");
-  this.get("/announcements");
   this.get("/announcements/:id");
   this.patch("/announcements/:id");
   this.post("/announcements");
 
-  this.get("/bulletins");
   this.get("/bulletins/:id");
   this.get("/bulletins/:id/sermon");
   this.patch("/bulletins/:id");
@@ -23,6 +32,24 @@ export default function() {
   this.patch("/sermons/:id");
   this.post("/sermons");
 
+  this.get("/bulletins", function(schema, request) {
+    if (schema.bulletins.all().models.length > 0 &&
+        request.queryParams["filter[latest_for_group]"]) {
+      return schema.bulletins.find([1]);
+    }
+
+    return schema.bulletins.all();
+  });
+
+  this.get("/announcements", function(schema, request) {
+    if (schema.announcements.all().models.length > 0 &&
+        request.queryParams["filter[latest_for_group]"]) {
+      return schema.announcements.find([1, 2, 3]);
+    }
+
+    return schema.announcements.all();
+  });
+
   this.get("/posts", function(schema, request) {
     const groupId = request.queryParams["filter[group]"];
 

mirage/scenarios/default.js

@@ -22,4 +22,6 @@ export default function(server) {
   }
 
   server.createList("post", 10, { group: englishService });
+
+  server.create("user", { email: "[email protected]", name: "Test User" });
 }

tests/acceptance/bulletins/new-test.js

@@ -38,12 +38,26 @@ test("it can create a new bulletin", assert => {
     serviceOrder: "New service order"
   };
 
+  const sermon = {
+    name: "My Sermon",
+    notes: "",
+    series: "Super series",
+    speaker: "Mr. Speaker"
+  };
+
   page.
     visit({ groupSlug: group.slug }).
     fillName(bulletin.name).
     fillPublishedAt(bulletin.publishedAt).
-    fillServiceOrder(bulletin.serviceOrder).
-    submit();
+    fillServiceOrder(bulletin.serviceOrder);
+
+  page.sermonEditor.
+    fillName(sermon.name).
+    fillNotes(sermon.notes).
+    fillSeries(sermon.series).
+    fillSpeaker(sermon.speaker);
+
+  page.submit();
 
   andThen(() => {
     const bulletins = server.db.bulletins;
@@ -59,25 +73,14 @@ test("it can create a new bulletin", assert => {
 test("it populates default values", assert => {
   authenticateSession(application, sessionData);
 
-  const group = server.create("group");
-  page.visit({ groupSlug: group.slug });
-
-  andThen(() => {
-    assert.equal(page.name, "Sunday Worship Service");
-    assert.equal(page.serviceOrder, "");
-    equalDate(assert, page.publishedAt, nextService());
-  });
-});
-
-test("it defaults to last week's service order when available", assert => {
-  authenticateSession(application, sessionData);
-
   const group = server.create("group");
   const lastWeekBulletin = server.create("bulletin", { group });
 
   page.visit({ groupSlug: group.slug });
 
   andThen(() => {
+    assert.equal(page.name, "Sunday Worship Service");
+    equalDate(assert, page.publishedAt, nextService());
     assert.equal(page.serviceOrder, lastWeekBulletin.serviceOrder);
   });
 });

tests/pages/new-bulletin.js

@@ -1,16 +1,18 @@
 import PageObject from '../page-object';
+import sermonEditor from "mcac/tests/pages/components/sermon-editor";
 
 const { visitable, fillable, clickable } = PageObject;
 
 export default PageObject.create({
-  visit: visitable("/:groupSlug/bulletins/new"),
   fillName: fillable(selector("name")),
   fillPublishedAt: fillable(`${selector("published-at")} input`),
   fillServiceOrder: fillable(selector("service-order")),
-  submit: clickable('button[type=submit]'),
   name: PageObject.value(selector("name")),
   publishedAt: PageObject.value(`${selector("published-at")} input`),
-  serviceOrder: PageObject.value(selector("service-order"))
+  sermonEditor,
+  serviceOrder: PageObject.value(selector("service-order")),
+  submit: clickable('button[type=submit]'),
+  visit: visitable("/:groupSlug/bulletins/new")
 });
 
 function selector(s) {