Skip to content

Commit 23606d8

Browse files
Layouwenafc163
andauthored
test: use codecov/codecov-action (#554)
Co-authored-by: afc163 <[email protected]>
1 parent 4b0830a commit 23606d8

File tree

9 files changed

+19
-128
lines changed

9 files changed

+19
-128
lines changed
+5-113
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,6 @@
1-
name: CI
2-
3-
on:
4-
push:
5-
branches: [ master ]
6-
pull_request:
7-
branches: [ master ]
8-
1+
name: ✅ test
2+
on: [push, pull_request]
93
jobs:
10-
setup:
11-
runs-on: ubuntu-latest
12-
steps:
13-
- name: checkout
14-
uses: actions/checkout@master
15-
16-
- uses: actions/setup-node@v1
17-
with:
18-
node-version: '18'
19-
20-
- name: cache package-lock.json
21-
uses: actions/cache@v2
22-
with:
23-
path: package-temp-dir
24-
key: lock-${{ github.sha }}
25-
26-
- name: create package-lock.json
27-
run: npm i --package-lock-only --ignore-scripts
28-
29-
- name: hack for singe file
30-
run: |
31-
if [ ! -d "package-temp-dir" ]; then
32-
mkdir package-temp-dir
33-
fi
34-
cp package-lock.json package-temp-dir
35-
36-
- name: cache node_modules
37-
id: node_modules_cache_id
38-
uses: actions/cache@v2
39-
with:
40-
path: node_modules
41-
key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}
42-
43-
- name: install
44-
if: steps.node_modules_cache_id.outputs.cache-hit != 'true'
45-
run: npm ci
46-
47-
lint:
48-
runs-on: ubuntu-latest
49-
steps:
50-
- name: checkout
51-
uses: actions/checkout@master
52-
53-
- name: restore cache from package-lock.json
54-
uses: actions/cache@v2
55-
with:
56-
path: package-temp-dir
57-
key: lock-${{ github.sha }}
58-
59-
- name: restore cache from node_modules
60-
uses: actions/cache@v2
61-
with:
62-
path: node_modules
63-
key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}
64-
65-
- name: lint
66-
run: npm run lint
67-
68-
needs: setup
69-
70-
compile:
71-
runs-on: ubuntu-latest
72-
steps:
73-
- name: checkout
74-
uses: actions/checkout@master
75-
76-
- name: restore cache from package-lock.json
77-
uses: actions/cache@v2
78-
with:
79-
path: package-temp-dir
80-
key: lock-${{ github.sha }}
81-
82-
- name: restore cache from node_modules
83-
uses: actions/cache@v2
84-
with:
85-
path: node_modules
86-
key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}
87-
88-
- name: compile
89-
run: npm run compile
90-
91-
needs: setup
92-
93-
coverage:
94-
runs-on: ubuntu-latest
95-
steps:
96-
- name: checkout
97-
uses: actions/checkout@master
98-
99-
- name: restore cache from package-lock.json
100-
uses: actions/cache@v2
101-
with:
102-
path: package-temp-dir
103-
key: lock-${{ github.sha }}
104-
105-
- name: restore cache from node_modules
106-
uses: actions/cache@v2
107-
with:
108-
path: node_modules
109-
key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}
110-
111-
- name: coverage
112-
run: npm test -- --coverage && bash <(curl -s https://codecov.io/bash)
113-
114-
needs: setup
4+
test:
5+
uses: react-component/rc-test/.github/workflows/test.yml@main
6+
secrets: inherit

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,5 @@ es/*
3333
.dumi/tmp-test
3434
.dumi/tmp-production
3535
.env.local
36+
37+
bun.lockb

bunfig.toml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[install]
2+
peer = false

examples/dynamic.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Demo extends React.Component {
3030

3131
loadData = treeNode => {
3232
console.log('trigger load:', treeNode);
33-
return new Promise(resolve => {
33+
return new Promise<void>(resolve => {
3434
setTimeout(() => {
3535
let { treeData } = this.state;
3636
treeData = treeData.slice();

examples/utils/dataUtil.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable no-plusplus, no-mixed-operators, no-underscore-dangle */
22
export function generateData(x = 3, y = 2, z = 1, gData = []) {
33
// x:每一级下的节点总数。y:每级节点里有y个节点、存在子节点。z:树的level层级数(0表示一级)
4-
function _loop(_level, _preKey, _tns) {
4+
function _loop(_level, _preKey?, _tns?) {
55
const preKey = _preKey || '0';
66
const tns = _tns || gData;
77

@@ -88,7 +88,7 @@ export function getNewTreeData(treeData, curKey, child, level) {
8888
}
8989

9090
function loopData(data, callback) {
91-
const loop = (d, level = 0) => {
91+
const loop = (d, level = '0') => {
9292
d.forEach((item, index) => {
9393
const pos = `${level}-${index}`;
9494
if (item.children) {

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@
7575
"rc-virtual-list": "^3.0.0",
7676
"react": "^16.8.0",
7777
"react-dom": "^16.8.0",
78-
"typescript": "^5.0.0"
78+
"typescript": "^5.0.0",
79+
"cheerio": "1.0.0-rc.12"
7980
},
8081
"peerDependencies": {
8182
"react": "*",

src/TreeSelect.tsx

+1-7
Original file line numberDiff line numberDiff line change
@@ -440,13 +440,7 @@ const TreeSelect = React.forwardRef<BaseSelectRef, TreeSelectProps>((props, ref)
440440
// Back fill with origin label
441441
const labeledValues = values.map(val => {
442442
const targetItem = rawLabeledValues.find(item => item.value === val);
443-
let label;
444-
// Ensure that when labelInValue is true, if label is undefined, it remains undefined.
445-
if (labelInValue && targetItem.label !== undefined) {
446-
label = targetItem.label;
447-
} else if (!labelInValue && treeTitleRender) {
448-
label = treeTitleRender(targetItem);
449-
}
443+
const label = labelInValue ? targetItem?.label : treeTitleRender?.(targetItem);
450444
return {
451445
value: val,
452446
label,

tests/Select.checkable.spec.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ describe('TreeSelect.checkable', () => {
489489
describe('labelInValue', () => {
490490
it('basic', () => {
491491
const wrapper = mount(
492-
<TreeSelect checkable labelInValue value={[{ value: '0-0' }]}>
492+
<TreeSelect treeCheckable showCheckedStrategy="SHOW_PARENT" labelInValue value={[{ value: '0-0' }]}>
493493
<TreeNode key="0-0" value="0-0" title="0-0">
494494
<TreeNode key="0-0-0" value="0-0-0" title="0-0-0" />
495495
</TreeNode>

tests/Select.multiple.spec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe('TreeSelect.multiple', () => {
3232

3333
it('remove by backspace key', () => {
3434
const wrapper = mount(createSelect({ defaultValue: ['0', '1'] }));
35-
wrapper.find('input').first().simulate('keyDown', { which: KeyCode.BACKSPACE });
35+
wrapper.find('input').first().simulate('keyDown', { which: KeyCode.BACKSPACE, key: 'Backspace' });
3636
expect(wrapper.getSelection()).toHaveLength(1);
3737
expect(wrapper.getSelection(0).text()).toBe('label0');
3838
});
@@ -59,9 +59,9 @@ describe('TreeSelect.multiple', () => {
5959
}
6060
}
6161
const wrapper = mount(<App />);
62-
wrapper.find('input').first().simulate('keyDown', { which: KeyCode.BACKSPACE });
62+
wrapper.find('input').first().simulate('keyDown', { which: KeyCode.BACKSPACE, key: 'Backspace' });
6363
wrapper.selectNode(1);
64-
wrapper.find('input').first().simulate('keyDown', { which: KeyCode.BACKSPACE });
64+
wrapper.find('input').first().simulate('keyDown', { which: KeyCode.BACKSPACE, key: 'Backspace' });
6565
expect(wrapper.getSelection()).toHaveLength(1);
6666
expect(wrapper.getSelection(0).text()).toBe('label0');
6767
});

0 commit comments

Comments
 (0)