Merge branch 'beta'

.eslintignore

@@ -5,3 +5,4 @@ test-files/
 web-client/public/lib/
 web-client/public/js/jquery-1.11.0.min.js
 web-client/public/js/imagesloaded.pkgd.min.js
+web-client/public/js/grnsight.min.js

.eslintrc.yml

@@ -3,7 +3,14 @@ env:
   node: true
   jquery: true
   mocha: true
+  es6: true
 extends: 'eslint:recommended'
+parserOptions:
+  ecmaVersion: 6
+  sourceType: module
+  ecmaFeatures:
+    jsx: true
+    modules: true
 rules:
   indent:
     - error

.gitignore

@@ -10,6 +10,7 @@ lib-cov
 ~$*.xls
 
 documents/developer_documents/testing_script_generator/GRNsightTestingDocument.pdf
+web-client/public/js/grnsight.min.js
 
 pids
 logs
@@ -22,7 +23,6 @@ node_modules
 *.pem
 *.p12
 
-.bundle
 _gh_pages
 
 coverage/

documents/developer_documents/testing_script_generator/testing-script-generator.js

@@ -53,7 +53,7 @@ var addChildren = function (arrayOfNodes, optionKeys, test) {
             optionKeys.forEach(function(option) {
                 var instruction = test.title + " - " + option;
                 var result = test.text + " " + test.options[option];
-                result = test.conditional ? test.conditional + ", " + result : result;
+                result = test.conditional ? result + ", " + test.conditional : result;
                 var newNode = new Node();
                 // The null option is equivalent to disabling the test.
                 if (option !== "NULL") {
@@ -91,12 +91,10 @@ grnsightOptions.forEach(function(test) {
     var unweightedGraphLoadedAvailability = test.availability['UnWeightedGraphLoaded'] ? "YES": "NO";
     var availability = `| ${noGraphLoadedAvailability} | ${weightedGraphLoadedAvailability} | ${unweightedGraphLoadedAvailability} | `
     optionKeys.forEach(function(option) {
-        if (option !== "NULL") {
-            var result = test.text + " " + test.options[option];
-            result = test.conditional ? result + " " +  test.conditional : result;
-            testDescription += entry + option +  " | " + result + "|\n";
-            availabilityDescription += `| ${test.title} - ${option} ${availability}\n`
-        }
+        var result = test.text + " " + test.options[option];
+        result = test.conditional ? result + ", " +  test.conditional : result;
+        testDescription += entry + option +  " | " + result + "|\n";
+        availabilityDescription += `| ${test.title} - ${option} ${availability}\n`
     });
 });