Skip to content

Commit a60d110

Browse files
committed
EFS-948: Reverted code
1 parent 6db2e0d commit a60d110

File tree

4 files changed

+4
-56
lines changed

4 files changed

+4
-56
lines changed

.github/workflows/node.js.yml

+1-47
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@ jobs:
3535
matrix:
3636
shard: [ 1, 2, 3, 4, 5, 6, 7, 8 ]
3737
fail-fast: false
38-
outputs:
39-
jest_outcome: ${{ steps.output_variables.outputs.jest_outcome }}
40-
coverage_line: ${{ steps.output_variables.outputs.coverage_line }}
41-
coverage_statement: ${{ steps.output_variables.outputs.coverage_statement }}
42-
coverage_branch: ${{ steps.output_variables.outputs.coverage_branch }}
43-
coverage_function: ${{ steps.output_variables.outputs.coverage_function }}
4438
steps:
4539
- uses: actions/checkout@v4
4640
- name: Use Node.js 20.11.1
@@ -57,30 +51,11 @@ jobs:
5751
env:
5852
NODE_OPTIONS: "--max-old-space-size=10240"
5953
- name: jest
60-
id: jest
6154
run: |
6255
export NODE_OPTIONS="--max-old-space-size=8192"
63-
NODE_OPTIONS=--max-old-space-size=8192 node --max-old-space-size=8192 ./node_modules/.bin/jest --no-watchman --silent --logHeapUsage --bail --runInBand --forceExit --shard=${{ matrix.shard }}/${{ strategy.job-total }} --coverage
64-
if [ $exit_code -ne 0 ]; then
65-
echo "Some tests failed. Exiting with status code $exit_code"
66-
exit $exit_code
67-
fi
56+
NODE_OPTIONS=--max-old-space-size=8192 node --max-old-space-size=8192 ./node_modules/.bin/jest --no-watchman --silent --logHeapUsage --runInBand --forceExit --shard=${{ matrix.shard }}/${{ strategy.job-total }} --coverage
6857
env:
6958
NODE_OPTIONS: "--max-old-space-size=10240"
70-
- name: Set output variables for badges
71-
id: output_variables
72-
run: |
73-
jest_outcome=${{ steps.jest.outcome }}
74-
echo "jest_outcome=$jest_outcome" >> $GITHUB_OUTPUT
75-
echo "Output of my_step: ${{ steps.jest.outcome }}"
76-
coverage_line=$(jq -r '.total.lines.pct' coverage/coverage-summary.json)
77-
coverage_statement=$(jq -r '.total.statements.pct' coverage/coverage-summary.json)
78-
coverage_branch=$(jq -r '.total.branches.pct' coverage/coverage-summary.json)
79-
coverage_function=$(jq -r '.total.functions.pct' coverage/coverage-summary.json)
80-
echo "coverage_line=$coverage_line" >> $GITHUB_OUTPUT
81-
echo "coverage_statement=$coverage_statement" >> $GITHUB_OUTPUT
82-
echo "coverage_branch=$coverage_branch" >> $GITHUB_OUTPUT
83-
echo "coverage_function=$coverage_function" >> $GITHUB_OUTPUT
8459
- name: Rename coverage file name
8560
if: github.ref == 'refs/heads/main'
8661
run: mv coverage/coverage-final.json coverage/${{matrix.shard}}.json
@@ -90,24 +65,3 @@ jobs:
9065
with:
9166
name: coverage-artifacts
9267
path: coverage/
93-
create-badges:
94-
runs-on: ubuntu-latest
95-
if: ${{ always() }}
96-
needs: build
97-
steps:
98-
- name: Create Test Cases Status Badges
99-
uses: peterrhodesdev/[email protected]
100-
with:
101-
token: ${{ secrets.GITHUB_TOKEN }}
102-
filename: testcases_status
103-
label: Test cases status
104-
message: ${{ needs.build.outputs.jest_outcome }}
105-
color: ${{ needs.build.outputs.jest_outcome == 'success' && '009900' || 'FF0000' }}
106-
- name: Create Test Cases Coverage Badges
107-
uses: peterrhodesdev/[email protected]
108-
with:
109-
token: ${{ secrets.GITHUB_TOKEN }}
110-
filename: ("testcases_coverage_line" "testcases_coverage_statement" "testcases_coverage_branch" "testcases_coverage_function")
111-
label: ("Test cases coverage [Line]" "Test cases coverage [Statement]" "Test cases coverage [Branch]" "Test cases coverage [Function]")
112-
message: (${{ needs.build.outputs.coverage_line }} ${{ needs.build.outputs.coverage_statement }} ${{ needs.build.outputs.coverage_branch }} ${{ needs.build.outputs.coverage_function }})
113-
color: 993366

README.md

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
![Build Status](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/wiki/icanbwell/fhir-server/build_status.md)<br>
2-
![Test Cases Status](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/wiki/icanbwell/fhir-server/testcases_status.md)<br>
3-
![Test cases coverage [Line]](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/wiki/icanbwell/fhir-server/testcases_coverage_line.md)
4-
![Test cases coverage [Statement]](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/wiki/icanbwell/fhir-server/testcases_coverage_statement.md)
5-
![Test cases coverage [Branch]](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/wiki/icanbwell/fhir-server/testcases_coverage_branch.md)
6-
![Test cases coverage [Function]](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/wiki/icanbwell/fhir-server/testcases_coverage_function.md)
1+
![Build Status](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/wiki/icanbwell/fhir-server/build_status.md)
72

83
## Intro
94

package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@
5555
"coverageReporters": [
5656
"text",
5757
"lcov",
58-
"json",
59-
"json-summary"
58+
"json"
6059
],
6160
"reporters": [
6261
"default",

src/tests/graphql/field_filter/field_filter.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ describe('GraphQL CodeSystem Tests', () => {
6262
.send(codeSystem1Resource)
6363
.set(getHeaders());
6464
// noinspection JSUnresolvedFunction
65-
expect(resp).toHaveMergeResponse([{ created: false }, { created: true }]);
65+
expect(resp).toHaveMergeResponse([{ created: true }, { created: true }]);
6666

6767
/**
6868
* @type {SimpleContainer}

0 commit comments

Comments
 (0)