Skip to content

Commit

Permalink
Merge branch 'master' into keblysh/feat/mobile-responsive
Browse files Browse the repository at this point in the history
  • Loading branch information
vladislavkeblysh authored Sep 4, 2024
2 parents b422c87 + c5d9bfb commit 376eb32
Show file tree
Hide file tree
Showing 24 changed files with 9,327 additions and 13,330 deletions.
13 changes: 10 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,20 @@ on:
jobs:
tests:
runs-on: ubuntu-20.04
strategy:
matrix:
node: [18.15, 20]
continue-on-error: ${{ matrix.node == 20 }}
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Nodejs Env
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
- name: Setup Nodejs
uses: actions/setup-node@v3
uses: actions/setup-node@v4
# Because of node 18 bug (https://github.com/nodejs/node/issues/47563), Pinning node version 18.15 until the next release of node
with:
node-version: 18.15
node-version: ${{ matrix.node }}

- name: Install dependencies
run: npm ci
Expand All @@ -38,7 +42,10 @@ jobs:
run: npm run build

- name: Run Coverage
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
fail_ci_if_error: true

- name: Send failure notification
if: ${{ failure() }}
Expand Down
2 changes: 1 addition & 1 deletion catalog-info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ metadata:
title: "Stage Site"
icon: "Web"
spec:
owner: ~
owner: "group:openedx-unmaintained"
type: 'website'
lifecycle: 'production'
22,360 changes: 9,161 additions & 13,199 deletions package-lock.json

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
},
"dependencies": {
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
"@edx/frontend-component-header": "5.0.2",
"@edx/frontend-platform": "7.1.0",
"@edx/frontend-component-header": "5.3.0",
"@edx/frontend-platform": "8.0.0",
"@edx/openedx-atlas": "^0.6.0",
"@fortawesome/fontawesome-svg-core": "^1.2.36",
"@fortawesome/free-brands-svg-icons": "^5.15.4",
Expand Down Expand Up @@ -73,16 +73,17 @@
},
"devDependencies": {
"@edx/browserslist-config": "^1.2.0",
"@edx/react-unit-test-utils": "2.0.0",
"@edx/react-unit-test-utils": "3.0.0",
"@edx/reactifex": "^2.1.1",
"@openedx/frontend-build": "13.0.28",
"@openedx/frontend-build": "14.0.3",
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "12.1.5",
"axios-mock-adapter": "^1.20.0",
"fetch-mock": "^9.11.0",
"husky": "^7.0.0",
"identity-obj-proxy": "^3.0.0",
"jest": "29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-expect-message": "^1.0.2",
"react-dev-utils": "^12.0.1",
"react-test-renderer": "^17.0.2",
Expand Down
2 changes: 1 addition & 1 deletion src/__snapshots__/index.test.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ exports[`app registry subscribe: APP_INIT_ERROR. snapshot: displays an ErrorPag
exports[`app registry subscribe: APP_READY. links App to root element 1`] = `
<AppProvider
store={
Object {
{
"dispatch": [Function],
"getState": [Function],
"replaceReducer": [Function],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`Error Banner component snapshot 1`] = `
<Alert
actions={
Array [
[
<Button
onClick={[MockFunction action1.onClick]}
variant="outline-primary"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ exports[`PDF Renderer Component snapshots first page, prev is disabled 1`] = `
<div
className="page-wrapper"
style={
Object {
{
"height": 200,
}
}
Expand Down Expand Up @@ -80,7 +80,7 @@ exports[`PDF Renderer Component snapshots on last page, next is disabled 1`] = `
<div
className="page-wrapper"
style={
Object {
{
"height": 200,
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`FileRenderer component snapshot is not loading, with error 1`] = `
<FileCard
file={
Object {
{
"downloadUrl": "file download url",
"name": "filename.txt",
}
Expand All @@ -19,7 +19,7 @@ exports[`FileRenderer component snapshot is not loading, with error 1`] = `
exports[`FileRenderer component snapshot isLoading, no Error 1`] = `
<FileCard
file={
Object {
{
"downloadUrl": "file download url",
"name": "filename.txt",
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ exports[`Review Crition Container snapshot 1`] = `
description="criterion option point value display"
id="ora-grading.RadioCriterion.optionPoints"
values={
Object {
{
"points": 1,
}
}
Expand Down Expand Up @@ -54,7 +54,7 @@ exports[`Review Crition Container snapshot 1`] = `
description="criterion option point value display"
id="ora-grading.RadioCriterion.optionPoints"
values={
Object {
{
"points": 2,
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/containers/ListView/__snapshots__/ListError.test.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`ListError component component render tests snapshot 1`] = `
<Alert
actions={
Array [
[
<Button
onClick={[MockFunction]}
>
Expand All @@ -30,7 +30,7 @@ exports[`ListError component component render tests snapshot 1`] = `
description="Initialization failure alert message line 2"
id="ora-grading.ListView.loadErrorMessage1"
values={
Object {
{
"backToResponses": <Hyperlink
destination="api/openResponse/test-course-id"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ exports[`SelectedBulkAction component snapshots 1`] = `
description="Button text to load selected responses for review/grading"
id="ora-grading.ListView.viewSelectedResponses"
values={
Object {
{
"value": 2,
}
}
Expand Down
Loading

0 comments on commit 376eb32

Please sign in to comment.