Merge pull request #490 from nasa/nem-build-fixes

NEM build fixes

README.md

@@ -99,17 +99,16 @@ Run as `mvn clean install`.
 ### Building Documentation
 
 Open MCT Web's documentation is generated by an
-[npm](https://www.npmjs.com/)-based build:
+[npm](https://www.npmjs.com/)-based build.  It has additional dependencies that
+may not be available on every platform and thus is not covered in the standard
+npm install.  Ensure your system has [libcairo](http://cairographics.org/)
+installed and then run the following commands:
 
-* `npm install` _(only needs to run once)_
+* `npm install`
+* `npm install nomnoml`
 * `npm run docs`
 
-Documentation will be generated in `target/docs`. Note that diagram
-generation is dependent on having [Cairo](http://cairographics.org/download/)
-installed; see
-[node-canvas](https://github.com/Automattic/node-canvas#installation)'s
-documentation for help with installation.
-
+Documentation will be generated in `target/docs`.
 
 # Glossary
 

circle.yml

@@ -2,6 +2,7 @@ deployment:
   production:
     branch: master
     commands:
+      - npm install nomnoml
       - ./build-docs.sh
       - git push git@heroku.com:openmctweb-demo.git $CIRCLE_SHA1:refs/heads/master
   openmctweb-staging-un:

karma.conf.js

@@ -71,7 +71,7 @@ module.exports = function(config) {
         // Specify browsers to run tests in.
         // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
         browsers: [
-            'Chrome'
+            'PhantomJS'
         ],
 
         // Code coverage reporting.

package.json

@@ -7,7 +7,6 @@
     "minimist": "^1.1.1"
   },
   "devDependencies": {
-    "canvas": "^1.2.7",
     "glob": ">= 3.0.0",
     "jasmine-core": "^2.3.0",
     "jsdoc": "^3.3.2",
@@ -18,13 +17,13 @@
     "karma-coverage": "^0.5.3",
     "karma-html-reporter": "^0.2.7",
     "karma-jasmine": "^0.1.5",
-    "karma-phantomjs-launcher": "^0.1.4",
+    "karma-phantomjs-launcher": "^0.2.3",
     "karma-requirejs": "^0.2.2",
     "lodash": "^3.10.1",
     "markdown-toc": "^0.11.7",
     "marked": "^0.3.5",
     "mkdirp": "^0.5.1",
-    "nomnoml": "^0.0.3",
+    "phantomjs": "^1.9.19",
     "requirejs": "^2.1.17",
     "split": "^1.0.0"
   },

test-main.js

@@ -51,5 +51,13 @@ require.config({
     deps: allTestFiles,
 
     // we have to kickoff jasmine, as it is asynchronous
-    callback: window.__karma__.start
+    callback: function () {
+        var args = [].slice.apply(arguments);
+        require(['es6-promise'], function (es6Promise) {
+            if (!window.Promise) {
+                window.Promise = es6Promise.Promise;
+            }
+            window.__karma__.start.apply(window.__karma__, args);
+        });
+    }
 });