Test fixes and an actual test for firing pre/post events.

CHANGELOG.md

@@ -1,7 +1,7 @@
 ## Changelog
 
 ### 2.3.2 (Next)
-
+* [#43](https://github.com/alexa-js/alexa-app-server/pull/43): Test fixes and an actual test for firing pre/post events. - [@dblock](https://github.com/dblock).
 * [#36](https://github.com/alexa-js/alexa-app-server/pull/36): Added option to specify host address to bind servers to - [@tejashah88](https://github.com/tejashah88).
 * [#35](https://github.com/alexa-js/alexa-app-server/pull/35): Error occurs when `verify` and `debug` are both set to true - [@tejashah88](https://github.com/tejashah88).
 * [#34](https://github.com/alexa-js/alexa-app-server/pull/34): Added tests for fail cases and schemas/utterances - [@tejashah88](https://github.com/tejashah88).

test/test-examples-server-app-loading-fail-checks.js

@@ -23,20 +23,6 @@ describe("Alexa App Server with Examples & App loading fail checking", function(
  .get('/')
  .expect(200).then(function(response) {
  expect(response.text).to.contain("alexa-app-server is running");
- }
- );
- });
-
- it("should throw an error when 'debug' and 'verify' are enabled", function() {
- var fn = function() {
- testServer = alexaAppServer.start({
- port: 3000,
- server_root: 'invalid_examples',
- debug: true,
- verify: true
  });
- };
-
- expect(fn).to.throw(Error);
  });
-});
+});

test/test-examples-server-debug-verify.js

@@ -0,0 +1,22 @@
+/*jshint expr: true*/
+"use strict";
+var chai = require("chai");
+var expect = chai.expect;
+chai.config.includeStack = true;
+var request = require("supertest-as-promised");
+var alexaAppServer = require("../index");
+
+describe("Alexa App Server with Examples & App loading fail checking", function() {
+ it("throws an error when 'debug' and 'verify' are enabled", function() {
+ var fn = function() {
+ alexaAppServer.start({
+ port: 3000,
+ server_root: 'invalid_examples',
+ debug: true,
+ verify: true
+ });
+ };
+
+ expect(fn).to.throw(Error);
+ });
+});

test/test-examples-server-pre-post-functions.js

@@ -9,17 +9,27 @@ var alexaAppServer = require("../index");
 
 describe("Alexa App Server with Examples & Pre/Post functions", function() {
  var testServer;
+ var fired;
 
  var sampleLaunchReq = JSON.parse(fs.readFileSync("test/sample-launch-req.json", 'utf8'));
 
  before(function() {
+ fired = {};
  testServer = alexaAppServer.start({
  port: 3000,
  server_root: 'examples',
- pre: function(appServer) { console.log("pre function fired!"); },
- post: function(appServer) { console.log("post function fired!"); },
- preRequest: function(json,request,response) { console.log("preRequest function fired!"); },
- postRequest : function(json,request,response) { console.log("postRequest function fired!"); }
+ pre: function(appServer) {
+ fired.pre = true;
+ },
+ post: function(appServer) {
+ fired.post = true;
+ },
+ preRequest: function(json, request, response) {
+ fired.preRequest = true;
+ },
+ postRequest: function(json, request, response) {
+ fired.postRequest = true;
+ }
  });
  });
 
@@ -28,15 +38,26 @@ describe("Alexa App Server with Examples & Pre/Post functions", function() {
  });
 
  it("mounts hello world app (GET)", function() {
- return request(testServer.express)
- .get('/alexa/helloworld')
- .expect(200);
+ return request(testServer.express)
+ .get('/alexa/helloworld')
+ .expect(200).then(function(response) {
+ expect(fired.pre).to.equal(true);
+ expect(fired.post).to.equal(true);
+ // only called for actual Alexa requests
+ expect(fired.preRequest).to.equal(undefined);
+ expect(fired.postRequest).to.equal(undefined);
+ });
  });
 
  it("mounts hello world app (POST)", function() {
- return request(testServer.express)
- .post('/alexa/helloworld')
- .send(sampleLaunchReq)
- .expect(200);
+ return request(testServer.express)
+ .post('/alexa/helloworld')
+ .send(sampleLaunchReq)
+ .expect(200).then(function(response) {
+ expect(fired.pre).to.equal(true);
+ expect(fired.post).to.equal(true);
+ expect(fired.preRequest).to.equal(true);
+ expect(fired.postRequest).to.equal(true);
+ });
  });
-});
+});