Merge branch 'master' into master

Author: bnmnetp

.github/workflows/python-package.yml

@@ -0,0 +1,39 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Python package
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.7', '3.8']
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2.1.2
+    - name: Setup npm and build runestone.js  
+      run: |
+            npm install
+            npm run build
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install flake8 pytest
+        pip install .
+        if [ -f requirements-dev.txt ]; then pip install -r requirements-dev.txt; fi
+    - name: Test with pytest
+      run: |
+        pytest

runestone/common/js/runestonebase.js

@@ -180,6 +180,7 @@ export default class RunestoneBase {
                 }
             } else {
                 this.loadData({});
+                this.csresolver("not taken");
             }
         } else {
             this.checkLocalStorage(); // just go right to local storage

runestone/parsons/js/parsons.js

@@ -90,6 +90,7 @@ export default class Parsons extends RunestoneBase {
             this.checkServer("parsons");
         } else {
             this.checkLocalStorage();
+            this.checkServerComplete = Promise.resolve("no server");
         }
         this.caption = "Parsons";
         this.addCaption("runestone");
@@ -661,7 +662,8 @@ export default class Parsons extends RunestoneBase {
                 this.blocksFromHash(answerHash),
                 options
             );
-            this.grader.grade();
+            this.grade = this.grader.grade();
+            this.correct = this.grade;
         }
         // Start the interface
         if (this.needsReinitialization !== true) {
@@ -753,7 +755,7 @@ export default class Parsons extends RunestoneBase {
             event.adaptive = adaptiveHash;
             act = act + "|" + adaptiveHash;
         }
-        if (this.answer == "correct") {
+        if (this.grade == "correct") {
             act = "correct|" + act;
             event.correct = "T";
         } else {
@@ -1283,6 +1285,7 @@ export default class Parsons extends RunestoneBase {
             this.grade = this.grader.grade();
             if (this.grade == "correct") {
                 this.hasSolved = true;
+                this.correct = true;
                 localStorage.setItem(this.adaptiveId + "Solved", true);
                 this.recentAttempts = this.checkCount;
                 this.checkCount = 0;
@@ -2062,6 +2065,7 @@ export default class Parsons extends RunestoneBase {
     async disableInteraction() {
         // Disable blocks
         await this.checkServerComplete;
+        console.log("disabling blocks");
         if (this.blocks !== undefined) {
             for (var i = 0; i < this.blocks.length; i++) {
                 var block = this.blocks[i];

runestone/timed/js/timed.js

@@ -103,7 +103,6 @@ export default class Timed extends RunestoneBase {
         // If a user has not taken this exam then we want to make sure
         // that if a question has been seen by the student before we do
         // not populate previous answers.
-        let response = Promise.resolve();
         let sendInfo = {
             div_id: this.divid,
             course_name: eBookConfig.course,
@@ -118,24 +117,27 @@ export default class Timed extends RunestoneBase {
                     body: JSON.stringify(sendInfo),
                 }
             );
-            response = await fetch(request);
+            let response = await fetch(request);
             let data = await response.json();
             this.taken = data.tookAssessment;
             this.assessmentTaken = this.taken;
             if (!this.taken) {
                 localStorage.clear();
             }
+            console.log("done with check status");
+            return response;
         } else {
             this.taken = false;
             this.assessmentTaken = false;
+            return Promise.resolve();
         }
-        return response;
     }
 
     /*===============================
     === Generating new Timed HTML ===
     ===============================*/
     renderTimedAssess() {
+        console.log("rendering timed ");
         // create renderedQuestionArray returns a promise
         //
         this.createRenderedQuestionArray();
@@ -153,7 +155,8 @@ export default class Timed extends RunestoneBase {
         // Replace intermediate HTML with rendered HTML
         $(this.origElem).replaceWith(this.assessDiv);
         // check if already taken and if so show results
-        this.tookTimedExam(); // rename to renderPossibleResults
+        this.styleExamElements(); // rename to renderPossibleResults
+        this.checkServer("timedExam");
     }
 
     renderContainer() {
@@ -234,7 +237,9 @@ export default class Timed extends RunestoneBase {
             }.bind(this),
             false
         );
-        this.controlDiv.appendChild(this.startBtn);
+        if (!this.taken) {
+            this.controlDiv.appendChild(this.startBtn);
+        }
         if (!this.nopause) {
             this.controlDiv.appendChild(this.pauseBtn);
         }
@@ -734,7 +739,8 @@ export default class Timed extends RunestoneBase {
             );
         }
     }
-    tookTimedExam() {
+
+    styleExamElements() {
         // Checks if this exam has been taken before
         $(this.timerContainer).css({
             width: "50%",
@@ -758,7 +764,6 @@ export default class Timed extends RunestoneBase {
             "background-color": "black",
             color: "white",
         });
-        this.checkServer("timedExam");
     }
 
     finishAssessment() {
@@ -821,6 +826,7 @@ export default class Timed extends RunestoneBase {
             let currentQuestion = this.renderedQuestionArray[i];
             // set the state to forreview so we know that feedback may be appropriate
             currentQuestion.state = "forreview";
+            currentQuestion.question.disableInteraction();
         }
 
         if (!this.showFeedback) {

runestone/unittest_base.py

@@ -221,7 +221,7 @@ def setUp(self):
         self.driver.implicitly_wait(5)
         # For cases where an implicit wait does not help.  For example waiting for text to appear
         # after running an activecode.  We create an explicit wait object.
-        self.wait = WebDriverWait(self.driver, 5)
+        self.wait = WebDriverWait(self.driver, 10)
 
     def tearDown(self):
         # Clear as much as possible, to present an almost-fresh instance of a browser for the next test. (Shutting down then starting up a browswer is very slow.)