Merge in master

ucfopen · Sep 21, 2023 · e8e6c05 · e8e6c05
2 parents 6bcdff2 + 53e9687
commit e8e6c05
Show file tree

Hide file tree

Showing 15 changed files with 3,861 additions and 2,762 deletions.
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -0,0 +1,35 @@
+name: Widget Release Build
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+     - 'v[0-9]+.[0-9]+.[0-9]+'
+     - 'v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+'
+     - 'v[0-9]+.[0-9]+.[0-9]+-alpha[0-9]+'
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [12.x]
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Test and build with node ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+
+    - run: yarn install --frozen-lockfile
+    - run: yarn build
+
+    - name: Upload Release .wigt
+      uses: svenstaro/upload-release-action@v2
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: build/_output/*
+        tag: ${{ github.ref }}
+        overwrite: false
+        file_glob: true
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,21 @@
+name: Run Tests
+on: [push, pull_request]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [12.3.1]
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Run tests with Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm install -g yarn
+    - run: yarn install
+    - run: yarn test-ci
+    - run: yarn build
diff --git a/.travis.yml b/.travis.yml
diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
 		"cleanName": "secret-spreadsheet"
 	},
 	"dependencies": {
-		"materia-widget-development-kit": "../../MWDK4"
+		"materia-widget-development-kit": "^2.5.2"
 	},
 	"devDependencies": {
 		"@babel/preset-react": "^7.0.0",
@@ -23,7 +23,8 @@
 		"build": "mwdk-build-prod",
 		"build-dev": "mwdk-build-dev",
 		"test": "jest",
-		"test-ci": "TZ='America/New_York' CI=true jest --ci --useStderr --coverage --coverageReporters text-summary cobertura"
+		"test-ci": "TZ='America/New_York' CI=true jest --ci --useStderr --coverage --coverageReporters text-summary cobertura",
+		"test-dev": "TZ='America/New_York' jest --verbose --watchAll --coverage --coverageReporters lcov"
 	},
 	"jest": {
 		"coverageReporters": [
@@ -42,5 +43,5 @@
 	"author": "University of Central Florida, Center for Distributed Learning",
 	"description": "Spreadsheet is a Materia Widget that has students fill in the blanks of a spreadsheet.",
 	"license": "AGPL-3.0",
-	"version": "1.0.0"
+	"version": "1.0.1"
 }
diff --git a/src/__snapshots__/player.test.js.snap b/src/__snapshots__/player.test.js.snap
@@ -225,7 +225,7 @@ exports[`Player Render with no question 1`] = `
     >
       <div>
         <h2
-          aria-label="Secret Spreadsheet widget instructions. Cells of this spreadsheet have been intentionally hidden. Navigate the spreadsheet and input the hidden data until all cells have been filled. Capitalization and punctuation must be precise to match correctly. Navigate the table using your screen reader's dedicated key bindings, or use the tab key to move between blank cells."
+          aria-label="Secret Spreadsheet widget instructions. Cells of this spreadsheet have been intentionally hidden. Navigate the spreadsheet and input the hidden data until all cells have been filled. Capitalization and punctuation must be precise to match correctly. Navigate the table cells individually using your screen reader's dedicated key bindings, or use the Tab key to move between blank cells."
           tabIndex="0"
         >
           Secret Spreadsheet - How it works:
@@ -261,6 +261,7 @@ exports[`Player Render with no question 1`] = `
     </div>
     <p
       className="instructions"
+      inert="true"
     >
       Input the 
       <span>
@@ -295,6 +296,7 @@ exports[`Player Render with no question 1`] = `
                   id="cell1"
                 >
                   <input
+                    aria-label="This cell is currently blank, please provide a value."
                     autoComplete="off"
                     className="unanswered"
                     id="1-input"
@@ -314,6 +316,7 @@ exports[`Player Render with no question 1`] = `
                   id="cell2"
                 >
                   <input
+                    aria-label="This cell is currently blank, please provide a value."
                     autoComplete="off"
                     className="unanswered"
                     id="2-input"
@@ -345,6 +348,7 @@ exports[`Player Render with no question 1`] = `
          missing cells
       </p>
       <input
+        aria-label="Submit answers."
         className="filled"
         type="submit"
         value="Submit"
@@ -367,7 +371,7 @@ exports[`Player Render with question and body 1`] = `
     >
       <div>
         <h2
-          aria-label="Secret Spreadsheet widget instructions. Cells of this spreadsheet have been intentionally hidden. Navigate the spreadsheet and input the hidden data until all cells have been filled. Capitalization and punctuation must be precise to match correctly. Navigate the table using your screen reader's dedicated key bindings, or use the tab key to move between blank cells."
+          aria-label="Secret Spreadsheet widget instructions. Cells of this spreadsheet have been intentionally hidden. Navigate the spreadsheet and input the hidden data until all cells have been filled. Capitalization and punctuation must be precise to match correctly. Navigate the table cells individually using your screen reader's dedicated key bindings, or use the Tab key to move between blank cells."
           tabIndex="0"
         >
           Secret Spreadsheet - How it works:
@@ -403,6 +407,7 @@ exports[`Player Render with question and body 1`] = `
     </div>
     <p
       className="instructions"
+      inert="true"
     >
       Input the 
       <span>
@@ -437,6 +442,7 @@ exports[`Player Render with question and body 1`] = `
                   id="cell1"
                 >
                   <input
+                    aria-label="This cell is currently blank, please provide a value."
                     autoComplete="off"
                     className="unanswered"
                     id="1-input"
@@ -456,6 +462,7 @@ exports[`Player Render with question and body 1`] = `
                   id="cell2"
                 >
                   <input
+                    aria-label="This cell is currently blank, please provide a value."
                     autoComplete="off"
                     className="unanswered"
                     id="2-input"
@@ -496,6 +503,7 @@ exports[`Player Render with question and body 1`] = `
         View Question
       </p>
       <input
+        aria-label="Submit answers."
         className="filled"
         type="submit"
         value="Submit"
@@ -518,7 +526,7 @@ exports[`Player Render with question and no body 1`] = `
     >
       <div>
         <h2
-          aria-label="Secret Spreadsheet widget instructions. Cells of this spreadsheet have been intentionally hidden. Navigate the spreadsheet and input the hidden data until all cells have been filled. Capitalization and punctuation must be precise to match correctly. Navigate the table using your screen reader's dedicated key bindings, or use the tab key to move between blank cells."
+          aria-label="Secret Spreadsheet widget instructions. Cells of this spreadsheet have been intentionally hidden. Navigate the spreadsheet and input the hidden data until all cells have been filled. Capitalization and punctuation must be precise to match correctly. Navigate the table cells individually using your screen reader's dedicated key bindings, or use the Tab key to move between blank cells."
           tabIndex="0"
         >
           Secret Spreadsheet - How it works:
@@ -554,6 +562,7 @@ exports[`Player Render with question and no body 1`] = `
     </div>
     <p
       className="instructions"
+      inert="true"
     >
       Input the 
       <span>
@@ -588,6 +597,7 @@ exports[`Player Render with question and no body 1`] = `
                   id="cell1"
                 >
                   <input
+                    aria-label="This cell is currently blank, please provide a value."
                     autoComplete="off"
                     className="unanswered"
                     id="1-input"
@@ -607,6 +617,7 @@ exports[`Player Render with question and no body 1`] = `
                   id="cell2"
                 >
                   <input
+                    aria-label="This cell is currently blank, please provide a value."
                     autoComplete="off"
                     className="unanswered"
                     id="2-input"
@@ -647,6 +658,7 @@ exports[`Player Render with question and no body 1`] = `
         View Question
       </p>
       <input
+        aria-label="Submit answers."
         className="filled"
         type="submit"
         value="Submit"
@@ -669,7 +681,7 @@ exports[`Player Render without randomization 1`] = `
     >
       <div>
         <h2
-          aria-label="Secret Spreadsheet widget instructions. Cells of this spreadsheet have been intentionally hidden. Navigate the spreadsheet and input the hidden data until all cells have been filled. Capitalization and punctuation must be precise to match correctly. Navigate the table using your screen reader's dedicated key bindings, or use the tab key to move between blank cells."
+          aria-label="Secret Spreadsheet widget instructions. Cells of this spreadsheet have been intentionally hidden. Navigate the spreadsheet and input the hidden data until all cells have been filled. Capitalization and punctuation must be precise to match correctly. Navigate the table cells individually using your screen reader's dedicated key bindings, or use the Tab key to move between blank cells."
           tabIndex="0"
         >
           Secret Spreadsheet - How it works:
@@ -705,6 +717,7 @@ exports[`Player Render without randomization 1`] = `
     </div>
     <p
       className="instructions"
+      inert="true"
     >
       Input the 
       <span>
@@ -739,6 +752,7 @@ exports[`Player Render without randomization 1`] = `
                   id="cell1"
                 >
                   <input
+                    aria-label="This cell is currently blank, please provide a value."
                     autoComplete="off"
                     className="unanswered"
                     id="1-input"
@@ -758,6 +772,7 @@ exports[`Player Render without randomization 1`] = `
                   id="cell2"
                 >
                   <input
+                    aria-label="This cell is currently blank, please provide a value."
                     autoComplete="off"
                     className="unanswered"
                     id="2-input"
@@ -798,6 +813,7 @@ exports[`Player Render without randomization 1`] = `
         View Question
       </p>
       <input
+        aria-label="Submit answers."
         className="filled"
         type="submit"
         value="Submit"

diff --git a/src/components/player/__snapshots__/cell.test.js.snap b/src/components/player/__snapshots__/cell.test.js.snap
@@ -6,6 +6,7 @@ exports[`Cell component Rendered with user input center aligned 1`] = `
   id={1}
 >
   <input
+    aria-label="This cell is currently blank, please provide a value."
     autoComplete="off"
     className="unanswered"
     onBlur={[MockFunction]}
@@ -23,6 +24,7 @@ exports[`Cell component Rendered with user input left aligned 1`] = `
   id={1}
 >
   <input
+    aria-label="This cell is currently blank, please provide a value."
     autoComplete="off"
     className="unanswered"
     onBlur={[MockFunction]}

diff --git a/src/components/player/__snapshots__/popup.test.js.snap b/src/components/player/__snapshots__/popup.test.js.snap
@@ -6,7 +6,7 @@ exports[`Popup component Is rendered 1`] = `
 >
   <div>
     <h2
-      aria-label="Secret Spreadsheet widget instructions. Cells of this spreadsheet have been intentionally hidden. Navigate the spreadsheet and input the hidden data until all cells have been filled. Capitalization and punctuation must be precise to match correctly. Navigate the table using your screen reader's dedicated key bindings, or use the tab key to move between blank cells."
+      aria-label="Secret Spreadsheet widget instructions. Cells of this spreadsheet have been intentionally hidden. Navigate the spreadsheet and input the hidden data until all cells have been filled. Capitalization and punctuation must be precise to match correctly. Navigate the table cells individually using your screen reader's dedicated key bindings, or use the Tab key to move between blank cells."
       tabIndex="0"
     >
       Secret Spreadsheet - How it works: