Skip to content
Open
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
2,698 changes: 1,572 additions & 1,126 deletions package-lock.json

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@
},
"homepage": "https://github.com/dabapps/react-shallow-renderer#readme",
"dependencies": {
"@types/react": ">=16",
"@types/react-dom": ">=16",
"react": ">=16",
"react-dom": ">=16"
"@types/react": "^16.9.17",
"@types/react-dom": "^16.9.4",
"react": "^16.12.0",
"react-dom": "^16.12.0"
},
"devDependencies": {
"@types/jest": "^24.0.11",
"jest": "^24.4.0",
"prettier": "^1.16.4",
"ts-jest": "^24.0.0",
"tslint": "^5.13.1",
"tslint-config-dabapps": "github:dabapps/tslint-config-dabapps#v0.5.3",
"@types/jest": "^24.0.25",
"jest": "^24.9.0",
"prettier": "^1.19.1",
"ts-jest": "^24.3.0",
"tslint": "^5.20.1",
"tslint-config-dabapps": "^0.6.2",
"typescript": "^3.3.3333"
},
"peerDependencies": {
Expand Down
1 change: 1 addition & 0 deletions src/renderer.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';

import { elementSymbol } from './constants';
import {
isArrayOfChildren,
Expand Down
1 change: 1 addition & 0 deletions src/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';

import {
contextSymbol,
elementSymbol,
Expand Down
11 changes: 6 additions & 5 deletions tests/internal-methods.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import * as React from 'react';

import { ReactAnyNode, ReactShallowRenderer } from '../src';

describe('ReactShallowRenderer', () => {
describe('internalToJSON', () => {
it('throws an error if the node is invalid', () => {
const renderer = new ReactShallowRenderer(<div />);
const renderer = new ReactShallowRenderer((<div />));

expect(() =>
// tslint:disable-next-line:no-string-literal
Expand All @@ -15,14 +16,14 @@ describe('ReactShallowRenderer', () => {

describe('resolveChildren', () => {
it('returns an empty array when undefined is provided', () => {
const renderer = new ReactShallowRenderer(<div />);
const renderer = new ReactShallowRenderer((<div />));

// tslint:disable-next-line:no-string-literal
expect(renderer['resolveChildren'](undefined)).toEqual([]);
});

it('calls resolveNestedChildren with non-undefined children', () => {
const renderer = new ReactShallowRenderer(<div />);
const renderer = new ReactShallowRenderer((<div />));
// tslint:disable-next-line:no-string-literal
renderer['resolveNestedChildren'] = jest.fn();

Expand All @@ -42,7 +43,7 @@ describe('ReactShallowRenderer', () => {

describe('resolveChildName', () => {
it('throws an error if the node is invalid', () => {
const renderer = new ReactShallowRenderer(<div />);
const renderer = new ReactShallowRenderer((<div />));

expect(() =>
// tslint:disable-next-line:no-string-literal
Expand All @@ -53,7 +54,7 @@ describe('ReactShallowRenderer', () => {

describe('invalidNodeToString', () => {
it('returns a string representation of the invalid node', () => {
const renderer = new ReactShallowRenderer(<div />);
const renderer = new ReactShallowRenderer((<div />));

const selfReferencing: Record<string, any> = {};

Expand Down
1 change: 1 addition & 0 deletions tests/to-json/basic.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';

import { ReactShallowRenderer } from '../../src';
import { elementSymbol } from '../../src/constants';
import { compare } from '../helpers/compare';
Expand Down
1 change: 1 addition & 0 deletions tests/to-json/component-class.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';

import { ReactShallowRenderer } from '../../src';
import { elementSymbol } from '../../src/constants';
import { compare } from '../helpers/compare';
Expand Down
1 change: 1 addition & 0 deletions tests/to-json/component-function.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';

import { ReactShallowRenderer } from '../../src';
import { elementSymbol } from '../../src/constants';
import { compare } from '../helpers/compare';
Expand Down
1 change: 1 addition & 0 deletions tests/to-json/context.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';

import { ReactShallowRenderer } from '../../src';
import { elementSymbol } from '../../src/constants';
import { compare } from '../helpers/compare';
Expand Down
45 changes: 26 additions & 19 deletions tests/to-json/forward-ref.tsx
Original file line number Diff line number Diff line change
@@ -1,37 +1,44 @@
import * as React from 'react';

import { ReactShallowRenderer } from '../../src';
import { elementSymbol } from '../../src/constants';
import { compare } from '../helpers/compare';

describe('ReactShallowRenderer', () => {
const ForwardRefComponentReturnsArray: React.ForwardRefExoticComponent<
React.RefAttributes<HTMLParagraphElement>
const ForwardRefComponentReturnsArray: React.ForwardRefExoticComponent<React.RefAttributes<
HTMLParagraphElement
>> = React.forwardRef((((
// tslint:disable-next-line:variable-name
> = React.forwardRef((((_props: {}, ref: React.Ref<HTMLParagraphElement>) => [
_props: {},
ref: React.Ref<HTMLParagraphElement>
) => [
<p key={1} ref={ref}>
First
</p>,
<p key={2}>Second</p>,
]) as unknown) as React.RefForwardingComponent<HTMLParagraphElement, {}>);

const ComponentWithChildren: React.RefForwardingComponent<
HTMLParagraphElement
> = ({ children }, ref) => <p ref={ref}>{children}</p>;
const ComponentWithChildren: React.RefForwardingComponent<HTMLParagraphElement> = (
{ children },
ref
) => <p ref={ref}>{children}</p>;

const ForwardRefComponentWithChildren: React.ForwardRefExoticComponent<
React.PropsWithChildren<{}> & React.RefAttributes<HTMLParagraphElement>
> = React.forwardRef(ComponentWithChildren);
const ForwardRefComponentWithChildren: React.ForwardRefExoticComponent<React.PropsWithChildren<{}> &
React.RefAttributes<HTMLParagraphElement>> = React.forwardRef(
ComponentWithChildren
);

const ForwardRefComponentWithForwardRefChildren: React.ForwardRefExoticComponent<
React.PropsWithChildren<{}> & React.RefAttributes<HTMLParagraphElement>
> = React.forwardRef(({ children }, ref) => (
<div>
<ForwardRefComponentWithChildren ref={ref}>
I have children!
</ForwardRefComponentWithChildren>
{children}
</div>
));
const ForwardRefComponentWithForwardRefChildren: React.ForwardRefExoticComponent<React.PropsWithChildren<{}> &
React.RefAttributes<HTMLParagraphElement>> = React.forwardRef(
({ children }, ref) => (
<div>
<ForwardRefComponentWithChildren ref={ref}>
I have children!
</ForwardRefComponentWithChildren>
{children}
</div>
)
);

const UnknownForwardRefComponent: React.FunctionComponent = React.forwardRef(
() => <p>Unknown name</p>
Expand Down
1 change: 1 addition & 0 deletions tests/to-json/fragment.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';

import { ReactShallowRenderer } from '../../src';
import { elementSymbol } from '../../src/constants';
import { compare } from '../helpers/compare';
Expand Down
1 change: 1 addition & 0 deletions tests/to-json/memo.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as React from 'react';

import { ReactShallowRenderer } from '../../src';
import { elementSymbol } from '../../src/constants';
import { compare } from '../helpers/compare';
Expand Down
1 change: 1 addition & 0 deletions tests/to-json/portal.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as React from 'react';
import * as ReactDOM from 'react-dom';

import { ReactShallowRenderer } from '../../src';
import { elementSymbol } from '../../src/constants';
import { compare } from '../helpers/compare';
Expand Down