Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@
"npm-package-json-lint-config-default": "^8.0.1",
"pkg-ok": "^3.0.0",
"prettier": "^3.7.4",
"react-test-renderer": "^18.3.1",
"redux-mock-store": "^1.5.5",
"source-map-explorer": "^2.5.3",
"storybook": "^10.1.10",
Expand Down
26 changes: 0 additions & 26 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 7 additions & 10 deletions src/RelExpr.test.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import React from 'react';
import renderer from 'react-test-renderer';
import {Provider} from 'react-redux';
import configureStore from 'redux-mock-store';
import {render, fireEvent, act} from '@testing-library/react';

Check warning on line 4 in src/RelExpr.test.js

View workflow job for this annotation

GitHub Actions / Test (ubuntu-latest)

'act' is defined but never used

Check warning on line 4 in src/RelExpr.test.js

View workflow job for this annotation

GitHub Actions / Test (windows-latest)

'act' is defined but never used

Check warning on line 4 in src/RelExpr.test.js

View workflow job for this annotation

GitHub Actions / Test (macos-latest)

'act' is defined but never used

import RelExpr from './RelExpr';
import {Selection} from './RelOp';

Check warning on line 7 in src/RelExpr.test.js

View workflow job for this annotation

GitHub Actions / Test (ubuntu-latest)

'Selection' is defined but never used

Check warning on line 7 in src/RelExpr.test.js

View workflow job for this annotation

GitHub Actions / Test (windows-latest)

'Selection' is defined but never used

Check warning on line 7 in src/RelExpr.test.js

View workflow job for this annotation

GitHub Actions / Test (macos-latest)

'Selection' is defined but never used

const mockStore = configureStore([]);

Expand Down Expand Up @@ -40,14 +39,12 @@
],
},
};
const tree = renderer
.create(
<Provider store={store}>
<RelExpr expr={expr} changeExpr={jest.fn()} />
</Provider>
)
.toJSON();
expect(tree).toMatchSnapshot();
const {asFragment} = render(
<Provider store={store}>
<RelExpr expr={expr} changeExpr={jest.fn()} />
</Provider>
);
expect(asFragment()).toMatchSnapshot();
});

const condTests = [
Expand Down Expand Up @@ -81,7 +78,7 @@
console.error = jest.fn();

expect(() => {
renderer.create(
render(
<Provider store={store}>
<RelExpr expr={{invalidExpr: 42}} changeExpr={jest.fn()} />
</Provider>
Expand Down
13 changes: 5 additions & 8 deletions src/RelExprTree.test.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import React from 'react';
import renderer from 'react-test-renderer';
import {render, fireEvent} from '@testing-library/react';

import RelExprTree from './RelExprTree';
import {Selection} from './RelOp';

Check warning on line 5 in src/RelExprTree.test.js

View workflow job for this annotation

GitHub Actions / Test (ubuntu-latest)

'Selection' is defined but never used

Check warning on line 5 in src/RelExprTree.test.js

View workflow job for this annotation

GitHub Actions / Test (windows-latest)

'Selection' is defined but never used

Check warning on line 5 in src/RelExprTree.test.js

View workflow job for this annotation

GitHub Actions / Test (macos-latest)

'Selection' is defined but never used

/** @test {RelExprTree} */
it('correctly renders a complex expression', () => {
Expand All @@ -29,10 +28,10 @@
],
},
};
const tree = renderer
.create(<RelExprTree expr={expr} changeExpr={jest.fn()} />)
.toJSON();
expect(tree).toMatchSnapshot();
const {asFragment} = render(
<RelExprTree expr={expr} changeExpr={jest.fn()} />
);
expect(asFragment()).toMatchSnapshot();
});

const condTests = [
Expand Down Expand Up @@ -64,9 +63,7 @@
console.error = jest.fn();

expect(() => {
renderer.create(
<RelExprTree expr={{invalidExpr: 42}} changeExpr={jest.fn()} />
);
render(<RelExprTree expr={{invalidExpr: 42}} changeExpr={jest.fn()} />);
}).toThrow();

console.error = errorObject;
Expand Down
111 changes: 44 additions & 67 deletions src/__snapshots__/RelExpr.test.js.snap
Original file line number Diff line number Diff line change
@@ -1,97 +1,74 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`RelExpr correctly renders a complex expression 1`] = `
<span
className="RelExpr"
onClick={[Function]}
onMouseOut={[Function]}
onMouseOver={[Function]}
style={
Object {
"margin": ".4em",
}
}
>
<span>
<div>
<span
class="RelExpr"
style="margin: .4em;"
>
<span>
<span>
<span>
ρ
<sub>
firstName/name
</sub>
</span>
(
<span
className="RelExpr"
onClick={[Function]}
onMouseOut={[Function]}
onMouseOver={[Function]}
style={
Object {
"margin": ".4em",
}
}
>
<span>
ρ
<sub>
firstName/name
</sub>
</span>
(
<span
class="RelExpr"
style="margin: .4em;"
>
<span>
<span>
<span>
π
<sub>
firstName,lastName
</sub>
</span>
(
<span
className="RelExpr"
onClick={[Function]}
onMouseOut={[Function]}
onMouseOver={[Function]}
style={
Object {
"margin": ".4em",
}
}
>
<span>
π
<sub>
firstName,lastName
</sub>
</span>
(
<span
class="RelExpr"
style="margin: .4em;"
>
<span>
<span>
<span>
σ
<sub>
salary &gt; 130000
</sub>
</span>
(
<span
className="RelExpr"
style={
Object {
"margin": ".4em",
}
}
>
<span>
σ
<sub>
salary &gt; 130000
</sub>
</span>
(
<span
className="Relation"
data-testid="span"
class="RelExpr"
style="margin: .4em;"
>
Doctor
<span
class="Relation"
data-testid="span"
>
Doctor
</span>
</span>
)
</span>
)
</span>
</span>
</span>
)
</span>
)
</span>
</span>
</span>
)
</span>
)
</span>
</span>
</span>
</span>
</div>
`;
Loading
Loading