re-working a lot of specs to clean them up, consolidating mail router…

… specs in to one file

grunt.js

@@ -50,6 +50,7 @@ module.exports = function(grunt) {
         'public/javascripts/vendor/json2.js',
         'public/javascripts/vendor/underscore.js',
         'public/javascripts/vendor/backbone.js',
+        'public/javascripts/vendor/backbone.routefilter.js',
         'public/javascripts/vendor/backbone.marionette.js',
         'public/javascripts/vendor/marionette.wreqr.js',
         'public/javascripts/bbclonemail/bbclonemail.js',

spec/javascripts/helpers/marionetteHelper.js

@@ -4,7 +4,7 @@ function startHistory(){
     // so Backbone.history will exist
     var router = new (Backbone.Router.extend({ 
       routes: { "empty-route": "emptyRoute"}
-    }));
+    }))();
   }
 
   if (!Backbone.History.started){
@@ -13,6 +13,7 @@ function startHistory(){
 }
 
 beforeEach(function(){
+  // clear the regions so they can be used again
   BBCloneMail.main.reset();
   BBCloneMail.nav.reset();
 });

spec/javascripts/inbox.spec.js

@@ -1,14 +1,12 @@
 describe("inbox", function(){
   "use strict";
 
-  var showMailItemHandler, showMailListHandler, getInboxHandler;
+  var showMailListHandler, getInboxHandler;
 
   beforeEach(function(){
-    showMailItemHandler = jasmine.createSpy("show mail item");
     showMailListHandler = jasmine.createSpy("show mail list");
     getInboxHandler = jasmine.createSpy("get inbox");
 
-    BBCloneMail.registerCommand("show:mail:item", showMailItemHandler);
     BBCloneMail.registerCommand("show:mail:list", showMailListHandler);
     BBCloneMail.respondTo("mail:inbox", getInboxHandler);
 
@@ -18,7 +16,6 @@ describe("inbox", function(){
   });
 
   afterEach(function(){
-    BBCloneMail.removeCommand("show:mail:item");
     BBCloneMail.removeCommand("show:mail:list");
     BBCloneMail.removeRequestHandler("mail:inbox");
   });
@@ -45,34 +42,4 @@ describe("inbox", function(){
 
   });
 
-  describe("when routing to an individual email", function(){
-    var router, inbox, email;
-
-    beforeEach(function(){
-      affix("article#main; #email-view-template li");
-
-      BBCloneMail.main.reset();
-      BBCloneMail.main.ensureEl();
-
-      router = BBCloneMail.module("MailRouter");
-      router.start();
-
-      inbox = BBCloneMail.module("MailApp.Inbox");
-      inbox.start();
-
-      window.location.hash = "inbox/mail/1";
-      startHistory();
-    });
-
-    afterEach(function(){
-      inbox.stop();
-      router.stop();
-    });
-
-    it("should show the full email contents", function(){
-      expect(showMailItemHandler).toHaveBeenCalled();
-    });
-
-  });
-
 });

spec/javascripts/mailAppStart.spec.js

@@ -1,49 +1,16 @@
 describe("mail app start", function(){
   "use strict";
 
-  describe("when starting the mail app with an empty route (#)", function(){
-    var router, inbox, handler, getInboxHandler;
-
-    beforeEach(function(){
-      getInboxHandler = jasmine.createSpy();
-      BBCloneMail.respondTo("mail:inbox", getInboxHandler);
-
-      handler = jasmine.createSpy();
-      BBCloneMail.registerCommand("show:mail:list", handler);
-
-      router = BBCloneMail.module("MailRouter");
-      router.start();
-
-      inbox = BBCloneMail.module("MailApp.Inbox");
-      inbox.start();
-
-      startHistory();
-    });
-
-    afterEach(function(){
-      inbox.stop();
-      router.stop();
-      BBCloneMail.removeCommand("show:mail:list");
-      BBCloneMail.removeRequestHandler("mail:inbox");
-    });
-
-    it("should show the inbox", function(){
-      expect(handler.wasCalled).toBe(true);
-    });
-
-  });
-
   describe("when the mail app initializes", function(){
-    var categoryNav, getCategoriesHandler;
+    var categoryNav, getCategoriesHandler, notifyAppStart;
 
     beforeEach(function(){
       affix("#mail-categories-view-template ul.categories li; #navigation");
-      getCategoriesHandler = jasmine.createSpy();
 
       var cat = new Backbone.Model({id: 1, name: "cat"});
       var catCol = new Backbone.Collection([cat]);
+      getCategoriesHandler = jasmine.createSpy();
       getCategoriesHandler.andReturn(catCol);
-
       BBCloneMail.respondTo("mail:categories", getCategoriesHandler);
 
       categoryNav = BBCloneMail.module("MailApp.CategoryNavigation");
@@ -60,5 +27,8 @@ describe("mail app start", function(){
       expect(el.length).toBe(1);
     });
 
+    it("should notify the mail app started", function(){
+    });
+
   });
 });

spec/javascripts/mailRouter.spec.js

@@ -0,0 +1,88 @@
+describe("mail router", function(){
+  "use strict";
+
+  var router, startMail, inbox;
+
+  beforeEach(function(){
+    startHistory();
+
+    startMail = spyOn(BBCloneMail, "startSubApp");
+
+    inbox = BBCloneMail.module("MailApp.Inbox");
+
+    router = BBCloneMail.module("MailRouter");
+    router.start();
+  });
+
+  afterEach(function(){
+    router.stop();
+    delete inbox.controller;
+  });
+
+  function mockControllerMethod(methodName){
+    var spy = jasmine.createSpy(methodName);
+
+    inbox.controller = {};
+    inbox.controller[methodName] = spy;
+
+    return spy;
+  }
+
+  describe("when navigating to the inbox (empty route)", function(){
+    var showInbox;
+
+    beforeEach(function(){
+      showInbox = mockControllerMethod("showInbox");
+
+      Backbone.history.loadUrl("");
+    });
+
+    it("should start the mail app", function(){
+      expect(startMail).toHaveBeenCalledWith("MailApp");
+    });
+
+    it("should show the inbox", function(){
+      expect(showInbox).wasCalled();
+    });
+
+  });
+
+  describe("when routing to an individual email", function(){
+    var showMailById;
+
+    beforeEach(function(){
+      showMailById = mockControllerMethod("showMailById");
+
+      Backbone.history.loadUrl("inbox/mail/1");
+    });
+
+    it("should start the mail app", function(){
+      expect(startMail).toHaveBeenCalledWith("MailApp");
+    });
+
+    it("should show the email by id", function(){
+      expect(showMailById).toHaveBeenCalled();
+    });
+
+  });
+
+  describe("when navigating to a mail category", function(){
+    var showMailByCategory;
+
+    beforeEach(function(){
+      showMailByCategory = mockControllerMethod("showMailByCategory");
+
+      Backbone.history.loadUrl("categories/foo");
+    });
+
+    it("should start the mail app", function(){
+      expect(startMail).toHaveBeenCalledWith("MailApp");
+    });
+
+    it("should show the email by category", function(){
+      expect(showMailByCategory).toHaveBeenCalled();
+    });
+
+  });
+
+});