Skip to content

Commit

Permalink
Merge pull request #626 from SlateFoundation/develop
Browse files Browse the repository at this point in the history
Release: v3.4.8
  • Loading branch information
themightychris authored Dec 7, 2021
2 parents be486f2 + 0132cf1 commit c4ef36e
Show file tree
Hide file tree
Showing 6 changed files with 496 additions and 8 deletions.
20 changes: 17 additions & 3 deletions .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,25 +87,39 @@ jobs:
GIT_DIR: ${{ github.workspace }}/.git
GIT_WORK_TREE: ${{ github.workspace }}
with:
browser: chrome
env: STUDIO_CONTAINER=,STUDIO_SSH=
working-directory: ${{ github.workspace }}.cypress-workspace

- name: Open access to crash log
if: always()
run: |
sudo chmod ugo+rX /hab/svc/php-runtime/{var,var/logs} || true
sudo chmod ugo+r /hab/svc/php-runtime/var/logs/crash.log || true
- name: Upload crash log
uses: actions/upload-artifact@v2
if: always()
with:
name: crash-log
path: /hab/svc/php-runtime/var/logs/crash.log

- name: Upload supervisor log
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v2
if: always()
with:
name: supervisor-log
path: /hab/sup/default/sup.log

- name: Upload Cypress screenshots
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v2
if: failure()
with:
name: cypress-screenshots
path: ${{ github.workspace }}.cypress-workspace/cypress/screenshots

- name: Upload Cypress videos
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v2
if: always()
with:
name: cypress-videos
Expand Down
2 changes: 1 addition & 1 deletion .holo/sources/slate.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[holosource]
url = "https://github.com/SlateFoundation/slate"
ref = "refs/tags/v2.16.8"
ref = "refs/tags/v2.16.12"
3 changes: 2 additions & 1 deletion cypress.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"env": {
"STUDIO_CONTAINER": "slate-cbl-studio",
"TEST_USER": "teacher"
}
},
"redirectionLimit":35
}
255 changes: 255 additions & 0 deletions cypress/fixtures/precise-rounding.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,255 @@
{
"student": {
"ELA": {
"1": {
"baseline": "10",
"test_doc_growth": "-0.7",
"growth": "-1.5",
"progress": "33",
"performanceLevel": "9.3"
},

"2": {
"baseline": "10",
"growth": "1",
"test_doc_growth": "0.8",
"progress": "27",
"performanceLevel": "10.8"
},

"6": {
"baseline": "9.5",
"test_doc_growth": "0.5",
"growth": "1.5",
"progress": "67",
"performanceLevel": "10"
}
}
},
"student2": {
"ELA": {
"2": {
"baseline": "9",
"test_doc_growth": null,
"growth": "0",
"progress": "0",
"performanceLevel": null
},

"3": {
"baseline": "9",
"growth": "0",
"progress": "33",
"performanceLevel": "9"
}
}
},
"student3": {
"SCI": {
"1": {
"baseline": "9.1",
"test_doc_growth": "0.3",
"growth": "0.4",
"progress": "38",
"performanceLevel": "9.4"
},
"2": {
"baseline": "9.3",
"growth": "-1.3",
"progress": "25",
"performanceLevel": "8"
},
"3": {
"baseline": "9.7",
"test_doc_growth": "-2.7",
"growth": "0",
"progress": "33",
"performanceLevel": "7"
},
"4": {
"competency": "4",
"baseline": "9.7",
"growth": "0.3",
"progress": "67",
"performanceLevel": "10"
}
},
"HOS": {
"4": {
"test_doc_baseline": null,
"baseline": "9",
"test_doc_growth": "0.3",
"growth": "0",
"progress": "100",
"test_doc_progress": "0",
"performanceLevel": "9.3",
"test_doc_performanceLevel": null
}
}
},
"student4": {
"ELA": {
"1": {
"test_doc_baseline": "6",
"baseline": null,
"growth": "0",
"progress": "33",
"performanceLevel": "6"
},

"2": {
"baseline": null,
"test_doc_growth": null,
"growth": "0",
"progress": "40",
"performanceLevel": "6"
},

"3": {
"test_doc_baseline": "6",
"baseline": null,
"growth": "1",
"progress": "100",
"performanceLevel": "7"
},

"4": {
"test_doc_baseline": "6",
"baseline": null,
"test_doc_growth": "0.7",
"growth": "1",
"progress": "100",
"performanceLevel": "6.7"
},

"5": {
"test_doc_baseline": "6",
"baseline": null,
"growth": "1",
"progress": "83",
"performanceLevel": "7"
},
"6": {
"baseline": null,
"test_doc_growth": null,
"growth": "0",
"progress": "33",
"performanceLevel": "7"
},
"7": {
"test_doc_baseline": "6",
"baseline": null,
"test_doc_growth": "0.4",
"growth": "0",
"progress": "63",
"performanceLevel": "6.4"
}
},
"SCI": {
"1": {
"test_doc_baseline": "6.9",
"baseline": null,
"test_doc_growth": "-0.3",
"growth": "0",
"progress": "38",
"performanceLevel": "6.6"
},
"3": {
"baseline": null,
"test_doc_growth": null,
"growth": "0",
"progress": "0",
"performanceLevel": null
}
},
"NGE": {
"1": {
"baseline": null,
"test_doc_growth": null,
"growth": "-1.3",
"progress": "35",
"performanceLevel": "9.4"
}
},
"HOS": {
"1": {
"test_doc_baseline": "8.3",
"baseline": null,
"test_doc_growth": "0.8",
"growth": "0",
"progress": "45",
"performanceLevel": "9.1"
}
},
"HW": {
"1": {
"test_doc_baseline": "8",
"baseline": null,
"growth": "0",
"progress": "33",
"performanceLevel": "8"
},
"2": {
"baseline": null,
"test_doc_growth": null,
"growth": "0",
"progress": "42",
"performanceLevel": "8.4"
},
"3": {
"test_doc_baseline": "8",
"baseline": null,
"test_doc_growth": "1.2",
"growth": "2.5",
"progress": "56",
"performanceLevel": "9.2"
}
}
},
"student5": {
"ELA": {
"1": {
"baseline": "5",
"growth": "1.5",
"progress": "33",
"performanceLevel": "6.5"
},
"2": {
"baseline": "5",
"growth": "2",
"progress": "40",
"performanceLevel": "7"
},
"3": {
"baseline": "5",
"growth": "3.2",
"progress": "100",
"performanceLevel": "8.2"
},
"4": {
"baseline": "5",
"growth": "2.5",
"progress": "100",
"performanceLevel": "7.5"
},
"5": {
"baseline": "5",
"growth": "2",
"progress": "83",
"performanceLevel": "7"
},
"6": {
"baseline": "5",
"growth": "3",
"progress": "33",
"performanceLevel": "8"
},
"7": {
"baseline": "5",
"growth": "1.3",
"progress": "63",
"performanceLevel": "6.2"
}
}
}
}
6 changes: 3 additions & 3 deletions cypress/integration/api/student-competencies.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ describe('/cbl/student-competencies API', () => {
expect(response.body.data).to.include({
ID: 1,
Class: 'Slate\\CBL\\StudentCompetency',
Created: 1546401845,
Created: 1546398245,
CreatorID: 2,
StudentID: 4,
CompetencyID: 1,
Expand Down Expand Up @@ -70,7 +70,7 @@ describe('/cbl/student-competencies API', () => {
expect(response.body.data.effectiveDemonstrationsData['1'][0]).to.include({
ID: 1,
Class: 'Slate\\CBL\\Demonstrations\\DemonstrationSkill',
Created: 1546401845,
Created: 1546398245,
CreatorID: 3,
Modified: null,
ModifierID: null,
Expand All @@ -79,7 +79,7 @@ describe('/cbl/student-competencies API', () => {
TargetLevel: 9,
DemonstratedLevel: 9,
Override: false,
DemonstrationDate: 1546304460
DemonstrationDate: 1546300860
});
});
});
Expand Down
Loading

0 comments on commit c4ef36e

Please sign in to comment.