GPII-1230: Merge branch 'master' of github.com:GPII/universal into GPII-1230-2

Author: kaspermarkus

.gitignore

@@ -15,6 +15,5 @@ Vagrantfile.local
 report.tap
 coverage
 .nyc_output
-instrumented
 reports
 .idea/

.nycrc

@@ -0,0 +1,120 @@
+{
+  "include": [
+     "**/*.js",
+     "gpii/node_modules/**/*.js"
+  ],
+  "exclude": [
+    "!**/gpii/node_modules/accessRequester/index.js",
+    "!**/gpii/node_modules/accessRequester/src/accessRequester.js",
+    "!**/gpii/node_modules/canopyMatchMaker/index.js",
+    "!**/gpii/node_modules/canopyMatchMaker/src/CanopyMatchMaker.js",
+    "!**/gpii/node_modules/canopyMatchMaker/src/CanopyMatchMakerUtilities.js",
+    "!**/gpii/node_modules/contextManager/index.js",
+    "!**/gpii/node_modules/contextManager/src/ContextManager.js",
+    "!**/gpii/node_modules/contextManager/src/ContextManagerUtilities.js",
+    "!**/gpii/node_modules/deviceReporter/index.js",
+    "!**/gpii/node_modules/deviceReporter/src/DeviceReporter.js",
+    "!**/gpii/node_modules/deviceReporter/src/DeviceReporterUtilities.js",
+    "!**/gpii/node_modules/eventLog/index.js",
+    "!**/gpii/node_modules/eventLog/src/eventLog.js",
+    "!**/gpii/node_modules/eventLog/src/installID.js",
+    "!**/gpii/node_modules/eventLog/src/metrics.js",
+    "!**/gpii/node_modules/flatMatchMaker/index.js",
+    "!**/gpii/node_modules/flatMatchMaker/src/FlatMatchMaker.js",
+    "!**/gpii/node_modules/flowManager/index.js",
+    "!**/gpii/node_modules/flowManager/src/BrowserChannel.js",
+    "!**/gpii/node_modules/flowManager/src/CloudBasedFlowManager.js",
+    "!**/gpii/node_modules/flowManager/src/FlowManager.js",
+    "!**/gpii/node_modules/flowManager/src/FlowManagerRequests.js",
+    "!**/gpii/node_modules/flowManager/src/GetUserToken.js",
+    "!**/gpii/node_modules/flowManager/src/PCPChannel.js",
+    "!**/gpii/node_modules/flowManager/src/SolutionsRegistryDataSource.js",
+    "!**/gpii/node_modules/flowManager/src/UntrustedFlowManager.js",
+    "!**/gpii/node_modules/flowManager/src/UntrustedSettingsDataSource.js",
+    "!**/gpii/node_modules/flowManager/src/UntrustedSettingsGetHandler.js",
+    "!**/gpii/node_modules/flowManager/src/UntrustedSettingsPutHandler.js",
+    "!**/gpii/node_modules/flowManager/src/UserLogonStateChange.js",
+    "!**/gpii/node_modules/flowManager/src/UserSave.js",
+    "!**/gpii/node_modules/gpii-oauth2/gpii-oauth2-authz-server/index.js",
+    "!**/gpii/node_modules/gpii-oauth2/gpii-oauth2-authz-server/src/AuthGrantFinder.js",
+    "!**/gpii/node_modules/gpii-oauth2/gpii-oauth2-authz-server/src/AuthServer.js",
+    "!**/gpii/node_modules/gpii-oauth2/gpii-oauth2-authz-server/src/AuthorizationService.js",
+    "!**/gpii/node_modules/gpii-oauth2/gpii-oauth2-authz-server/src/ClientService.js",
+    "!**/gpii/node_modules/gpii-oauth2/gpii-oauth2-authz-server/src/CodeGenerator.js",
+    "!**/gpii/node_modules/gpii-oauth2/gpii-oauth2-datastore/index.js",
+    "!**/gpii/node_modules/gpii-oauth2/gpii-oauth2-datastore/src/DataSource-pouchDB.js",
+    "!**/gpii/node_modules/gpii-oauth2/gpii-oauth2-datastore/src/DataStore.js",
+    "!**/gpii/node_modules/gpii-oauth2/gpii-oauth2-datastore/src/DbDataStore.js",
+    "!**/gpii/node_modules/gpii-oauth2/gpii-oauth2-datastore/src/DbDataStoreUtils.js",
+    "!**/gpii/node_modules/gpii-oauth2/gpii-oauth2-utilities/index.js",
+    "!**/gpii/node_modules/gpii-oauth2/gpii-oauth2-utilities/src/OAuth2Const.js",
+    "!**/gpii/node_modules/gpii-oauth2/gpii-oauth2-utilities/src/OAuth2Express.js",
+    "!**/gpii/node_modules/gpii-oauth2/gpii-oauth2-utilities/src/OAuth2Utilities.js",
+    "!**/gpii/node_modules/gpii-oauth2/index.js",
+    "!**/gpii/node_modules/journal/index.js",
+    "!**/gpii/node_modules/journal/src/Journal.js",
+    "!**/gpii/node_modules/journal/src/JournalIdParser.js",
+    "!**/gpii/node_modules/journal/src/SettingsDir.js",
+    "!**/gpii/node_modules/lifecycleActions/index.js",
+    "!**/gpii/node_modules/lifecycleActions/src/LifecycleActions.js",
+    "!**/gpii/node_modules/lifecycleManager/index.js",
+    "!**/gpii/node_modules/lifecycleManager/src/DynamicComponentIndexer.js",
+    "!**/gpii/node_modules/lifecycleManager/src/LifecycleManager.js",
+    "!**/gpii/node_modules/lifecycleManager/src/LifecycleManagerSession.js",
+    "!**/gpii/node_modules/lifecycleManager/src/Resolvers.js",
+    "!**/gpii/node_modules/matchMakerFramework/index.js",
+    "!**/gpii/node_modules/matchMakerFramework/src/MatchMakerFramework.js",
+    "!**/gpii/node_modules/matchMakerFramework/src/MatchMakerUtilities.js",
+    "!**/gpii/node_modules/ontologyHandler/index.js",
+    "!**/gpii/node_modules/ontologyHandler/src/ontologyHandler.js",
+    "!**/gpii/node_modules/ontologyHandler/src/ontologyHandlerUtilities.js",
+    "!**/gpii/node_modules/pouchManager/index.js",
+    "!**/gpii/node_modules/pouchManager/src/pouchManager.js",
+    "!**/gpii/node_modules/preferencesServer/index.js",
+    "!**/gpii/node_modules/preferencesServer/src/preferencesGetHandler.js",
+    "!**/gpii/node_modules/preferencesServer/src/preferencesPostHandler.js",
+    "!**/gpii/node_modules/preferencesServer/src/preferencesPutHandler.js",
+    "!**/gpii/node_modules/preferencesServer/src/preferencesServer.js",
+    "!**/gpii/node_modules/processReporter/index.js",
+    "!**/gpii/node_modules/processReporter/src/ProcessReporter.js",
+    "!**/gpii/node_modules/processReporter/src/processesBridge.js",
+    "!**/gpii/node_modules/rawPreferencesServer/index.js",
+    "!**/gpii/node_modules/rawPreferencesServer/src/rawPreferencesServer.js",
+    "!**/gpii/node_modules/settingsHandlers/index.js",
+    "!**/gpii/node_modules/settingsHandlers/src/INISettingsHandler.js",
+    "!**/gpii/node_modules/settingsHandlers/src/JSONSettingsHandler.js",
+    "!**/gpii/node_modules/settingsHandlers/src/NoSettingsHandler.js",
+    "!**/gpii/node_modules/settingsHandlers/src/WebSocketsSettingsHandler.js",
+    "!**/gpii/node_modules/settingsHandlers/src/XMLSettingsHandler.js",
+    "!**/gpii/node_modules/settingsHandlers/src/settingsHandlerUtilities.js",
+    "!**/gpii/node_modules/singleInstance/index.js",
+    "!**/gpii/node_modules/singleInstance/src/singleInstance.js",
+    "!**/gpii/node_modules/transformer/index.js",
+    "!**/gpii/node_modules/transformer/src/js/Transformer.js",
+	"!**/gpii/node_modules/testing/index.js",
+	"!**/gpii/node_modules/testing/src/PouchTestCaseHolder.js",
+	"!**/gpii/node_modules/testing/src/Acceptance.js",
+	"!**/gpii/node_modules/testing/src/CloudBasedOAuth2TestsUtils.js",
+	"!**/gpii/node_modules/testing/src/BrowserIncludes.js",
+	"!**/gpii/node_modules/testing/src/NockUtils.js",
+	"!**/gpii/node_modules/testing/src/Testing.js",
+	"!**/gpii/node_modules/testing/src/CloudBased.js",
+	"!**/gpii/node_modules/testing/src/Mocks.js",
+	"!**/gpii/node_modules/testing/src/Integration.js",
+    "testData",
+    "tests",
+    "reports",
+    "coverage",
+    "instrumented",
+    ".nyc_output",
+    "**/browserify/**",
+    "scripts",
+    "examples",
+    "gpii.js",
+    "Gruntfile.js"
+  ],
+  "reporter": "none",
+  "report-dir": "reports",
+  "temp-directory": "coverage",
+  "clean": false
+}

README.md

@@ -109,7 +109,7 @@ You can also run (and debug) the tests manually from the root of the repository
 
 `node node_modules/testem/testem.js --file tests/testem.js` 
 
-The required test fixtures and testem will start, and Testem will provide a URL you can open in a browser.
+The required test fixtures and Testem will start, and Testem will provide a URL you can open in a browser.
 
 If you would like to debug individual tests or view the test summary in a browser without using Testem, you can:
 
@@ -137,7 +137,7 @@ command can then be used to provision a new VM.
 
 Within the VM, the application will be installed in the directory specified by the `nodejs_app_install_dir` variable,
 which is defined in `provisioning/vagrant-vars.yml` configuration file in this repository. By default the installation
- directory is set to `/home/vagrant/sync/node_modules/universal`.
+ directory is set to `/home/vagrant/sync/universal`.
 
 Following the provisioning phase, tests can be run in the VM directly from the host system, without the need to log
 into the VM or interact with its console.
@@ -186,16 +186,27 @@ The tests are run using the following command:
 
 #### Coverage Reporting
 
-The preferred way to consistentely generate a code coverage report is to use Vagrant as described above.  When you 
-start a VM using `vagrant up` and run `npm run test:vagrant`, the full test suite will run in the VM,  and a coverage 
-report will be saved to the `reports` directory.  You can also run the `npm test` command on your local machine, but 
-you will need to ensure that browsers receive focus when they are launched (see above).
+The preferred way to consistently generate a code coverage report is to use Vagrant as described above.  When you 
+start a VM using `vagrant up` and run `npm run test:vagrant`, the full test suite will run in the VM, and at then end of
+the run:
+ 
+1. A summary of the report will be displayed to the console.
+2. A coverage report will be saved to the `reports` directory (open the `index.html` file in that directory in a browser to see the full details).  
+
+The report displays the code coverage for:
+                                                  
+1. Code reached from the tests run directly in Node.
+2. Code reached within a browser when running the tests in Testem.
+3. Server fixtures exercised by browser requests when running the Testem tests.
+
+A code coverage report will also be generated when you run the `npm test` command on your local machine, but you will
+need to ensure that browsers receive focus when they are launched (see above).
 
 The `npm test` command has [two additional associated scripts](https://docs.npmjs.com/misc/scripts).  The `pretest`
 script runs before the command defined for the `test` script.  The `posttest` script runs after.  In our case
 we use a `pretest` script to clean up previous coverage data before we run the tests, and a `posttest` script to 
-compile the actual report.  You should not need to run the `pretest` scripts manually before running either the node or
-browser tests, or to run the `posttest` scripts afterward.
+compile the actual report.  Both the `pretest` and `posttest` steps must run in order to generate the report.  If you
+only care about the test results, you should not need to run either of these scripts.
 
 Docker Containers
 -----------------

Vagrantfile

@@ -25,7 +25,7 @@ ram = ENV["VM_RAM"] || 2048
 
 Vagrant.configure(2) do |config|
 
-  config.vm.box = "inclusivedesign/fedora26"
+  config.vm.box = "inclusivedesign/fedora27"
 
   # Your working directory will be synced to /home/vagrant/sync in the VM.
   config.vm.synced_folder ".", "#{app_directory}"