Merge pull request #65 from OperationSpark/auto-grading-FSD

Auto grading fsd

.github/workflows/ci.yml

@@ -7,6 +7,6 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: "14"
+          node-version: "16"
       - run: npm ci
       - run: npm test

.github/workflows/npm-publish.yml

@@ -12,10 +12,10 @@ jobs:
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@v3
         with:
-          node-version: "14"
+          node-version: "16"
           registry-url: "https://registry.npmjs.org"
       - run: npm ci
-      - run: npm publish --dry-run
+      - run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
 # https://javascript.plainenglish.io/publish-update-npm-packages-with-github-actions-e4d786ffd62a

.gitignore

@@ -41,3 +41,6 @@ files.json
 project-lock.json
 test/files/environment/projects
 .secrets
+
+user
+auth

controller/github.js

@@ -265,7 +265,8 @@ function grabLocalLogin() {
   if (!git) {
     throw new Error(`There is no file at ${userFilePath}.`);
   }
-  return git.login;
+  // Failover to `login` for backward-compatibility
+  return git.username || git.login;
 }
 
 module.exports.grabLocalLogin = grabLocalLogin;

controller/reporter.js

@@ -26,8 +26,8 @@ function report(testDir) {
 
     const runner = mocha.run(() => {
       process.stdout.write = stdoutWriteCopy;
+      res(runner.testResults);
     });
-    res(runner.testResults);
   });
 }
 

controller/submit.js

@@ -75,7 +75,8 @@ function createGist({ project, stats }) {
     type: 'PROJECT',
     tests: stats.tests,
     passes: stats.passes,
-    failures: stats.failures
+    failures: stats.failures,
+    grade: Math.round(100 * (stats.passes / stats.tests))
   };
 
   let content = {
@@ -91,6 +92,7 @@ function createGist({ project, stats }) {
   content = JSON.stringify(content);
   return new Promise(function (res, rej) {
     console.log(clc.yellow('Creating gist. . .'));
+
     const cmd = createGistHelper(
       github.grabLocalLogin(),
       github.grabLocalAuthToken(),

controller/test.js

@@ -170,15 +170,8 @@ function displayResults({ testResults }) {
     //part divided by the whole 3/4 = 75%
     //use math.round to round to the nearest whole percent
     let grade = Math.round(100 * (testResults.stats.passes / testResults.stats.tests))
-    if(grade > 75) {
-      console.log(
-        clc.yellow(`You have passed ${grade}% of the test.`)
-      )
-    } else {
-      console.log(
-        clc.red(`You have passed ${grade}% of the test.`)
-      )
-    }
+    const clcMethod = grade > 75 ? clc.yellow : clc.red;
+    console.log(clcMethod(`You have passed ${grade}% of the test.`));
 
     return { pass: false, grade: grade };
   }