fix: issues resolved with tests

vip-git · vip-git · commit cdfff824583f · 2020-09-20T15:28:09.000+02:00
diff --git a/jest.backend.config.js b/jest.backend.config.js
@@ -8,7 +8,7 @@ module.exports = {
 		'<rootDir>/node_modules/regenerator-runtime/runtime',
 		'<rootDir>/scripts/config/polyfills.js'
 	],
-	setupTestFrameworkScriptFile: '<rootDir>/scripts/config/jest/setup.js',
+	setupFilesAfterEnv: ['<rootDir>/scripts/config/jest/setup.js'],
 	testMatch: [
 		'<rootDir>/src/server/app/modules/**/*.spec.{ts,tsx,mjs}',
 		'<rootDir>/src/server/app/common/interceptors/**/*.spec.{ts,tsx,mjs}',
@@ -27,7 +27,7 @@ module.exports = {
 	testEnvironment: 'node',
 	testURL: 'http://localhost',
 	transform: {
-		'^.+\\.tsx?$': '<rootDir>/node_modules/ts-jest/preprocessor.js',
+		'^.+\\.tsx?$': 'ts-jest',
 		'^.+\\.css$': '<rootDir>/scripts/config/jest/cssTransform.js',
 		'^(?!.*\\.(js|jsx|mjs|css|json)$)':
 			'<rootDir>/scripts/config/jest/fileTransform.js'
diff --git a/jest.e2e.config.js b/jest.e2e.config.js
@@ -8,7 +8,7 @@ module.exports = {
 	],
 	transform: {
 		'^.+\\.(js|jsx|mjs)$': '<rootDir>/node_modules/babel-jest',
-		'^.+\\.(ts|tsx|mjs)$': '<rootDir>/node_modules/ts-jest',
+		'^.+\\.(ts|tsx|mjs)$': 'ts-jest',
 		'^.+\\.css$': '<rootDir>/scripts/config/jest/cssTransform.js',
 		'^(?!.*\\.(js|jsx|mjs|css|json)$)':
 			'<rootDir>/scripts/config/jest/fileTransform.js'
diff --git a/jest.frontend.config.js b/jest.frontend.config.js
@@ -8,7 +8,7 @@ module.exports = {
 		'<rootDir>/scripts/config/polyfills.js'
 	],
 	snapshotSerializers: ['enzyme-to-json/serializer'],
-	setupTestFrameworkScriptFile: '<rootDir>/scripts/config/jest/setup.js',
+	setupFilesAfterEnv: ['<rootDir>/scripts/config/jest/setup.js'],
 	testMatch: [
 		'<rootDir>/src/client/web/**/?(*.)(spec|test).{js,jsx,ts,tsx,mjs}',
 		'<rootDir>/src/client/shared/**/?(*.)(spec|test).{js,jsx,ts,tsx,mjs}'
@@ -50,7 +50,7 @@ module.exports = {
 	testURL: 'http://localhost',
 	transform: {
 		'^.+\\.(js|jsx|mjs)$': '<rootDir>/node_modules/babel-jest',
-		'\\.(ts|tsx)$': '<rootDir>/node_modules/ts-jest/preprocessor.js',
+		'\\.(ts|tsx)$': 'ts-jest',
 		'^.+\\.css$': '<rootDir>/scripts/config/jest/cssTransform.js',
 		'^(?!.*\\.(js|jsx|mjs|css|json)$)':
 			'<rootDir>/scripts/config/jest/fileTransform.js'
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -186,7 +186,7 @@
 		"tsconfig-paths-webpack-plugin": "3.2.0",
 		"tslint": "5.17.0",
 		"typedoc": "0.19.1",
-		"typescript": "3.7.2",
+		"typescript": "4.0.3",
 		"url-loader": "2.1.0",
 		"webpack": "4.43.0",
 		"webpack-bundle-analyzer": "3.8.0",
diff --git a/src/client/shared/config/index.ts b/src/client/shared/config/index.ts
@@ -17,18 +17,18 @@ export const webConfig = {
 };
 
 export const config = {
-					WS_PROTOCOL:
-						process.env.NODE_ENV === 'development'
-							? 'ws://'
-							: process.env.WS_PROTOCOL,
-					WS_URL:
-						process.env.NODE_ENV === 'development'
-							? 'localhost:3000'
-							: process.env.WS_URL,
-					API_URL:
-						process.env.NODE_ENV === 'development'
-							? 'http://localhost:3000'
-							: '/api',
-					LOGIN_URL: '/auth/github',
-					...webConfig
-				};
+	WS_PROTOCOL:
+		process.env.NODE_ENV === 'development'
+			? 'ws://'
+			: process.env.WS_PROTOCOL,
+	WS_URL:
+		process.env.NODE_ENV === 'development'
+			? 'localhost:3000'
+			: process.env.WS_URL,
+	API_URL:
+		process.env.NODE_ENV === 'development'
+			? 'http://localhost:3000'
+			: '/api',
+	LOGIN_URL: '/auth/github',
+	...webConfig
+};
diff --git a/src/client/shared/services/chat/__tests__/chat-service.spec.ts b/src/client/shared/services/chat/__tests__/chat-service.spec.ts
@@ -38,4 +38,12 @@ describe('Chat Service', () => {
 		});
 		expect(requestRemoveChat).toBeDefined();
 	});
+
+	it('can request All chats', () => {
+		const requestRemoveChat = ChatServiceEngine.requestAllChatsRest({
+			apolloClientMock,
+			data: {}
+		});
+		expect(requestRemoveChat).toBeDefined();
+	});
 });
diff --git a/src/client/web/app/common/components/chat-box/functional-components/__tests__/__snapshots__/app-header-component.spec.tsx.snap b/src/client/web/app/common/components/chat-box/functional-components/__tests__/__snapshots__/app-header-component.spec.tsx.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AppHeaderComponent <AppHeaderComponent /> AppHeader Component renders correctly 1`] = `[Function]`;
diff --git a/src/client/web/app/common/components/chat-box/functional-components/__tests__/__snapshots__/chat-header-component.spec.tsx.snap b/src/client/web/app/common/components/chat-box/functional-components/__tests__/__snapshots__/chat-header-component.spec.tsx.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ChatHeaderComponent <ChatHeaderComponent /> ChatHeader Component renders correctly 1`] = `[Function]`;
diff --git a/src/client/web/app/common/components/chat-box/functional-components/__tests__/__snapshots__/chat-main-component.spec.tsx.snap b/src/client/web/app/common/components/chat-box/functional-components/__tests__/__snapshots__/chat-main-component.spec.tsx.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ChatMainComponent <ChatMainComponent /> ChatMain Component renders correctly 1`] = `[Function]`;
diff --git a/src/client/web/app/common/components/chat-box/functional-components/__tests__/app-header-component.spec.tsx b/src/client/web/app/common/components/chat-box/functional-components/__tests__/app-header-component.spec.tsx
@@ -0,0 +1,37 @@
+// Library
+import * as React from 'react';
+import { ThemeProvider } from '@material-ui/styles';
+import { shallow, mount } from 'enzyme';
+
+// Theme
+import theme from '../../../../styles';
+
+// Web
+import { AppHeaderComponent } from '../app-header.component';
+
+describe('AppHeaderComponent <AppHeaderComponent />', () => {
+    it('AppHeader Component renders correctly', () => {
+        const appHeaderComponent = shallow(
+            <ThemeProvider theme={theme}>
+                <AppHeaderComponent title={'some title'} />
+            </ThemeProvider>
+        );
+
+        // Interaction demo
+        expect(appHeaderComponent.text()).toEqual(
+            '< />'
+        );
+
+        // Snapshot demo
+        expect(shallow).toMatchSnapshot();
+    });
+    it('AppHeader Component mounts correctly when props are true', () => {
+        const appHeaderComponent = mount(
+            <ThemeProvider theme={theme}>
+                <AppHeaderComponent title={'some title'} />
+            </ThemeProvider>
+        );
+
+        expect(appHeaderComponent.length).toBeTruthy();
+    });
+});
diff --git a/src/client/web/app/common/components/chat-box/functional-components/__tests__/chat-header-component.spec.tsx b/src/client/web/app/common/components/chat-box/functional-components/__tests__/chat-header-component.spec.tsx
@@ -0,0 +1,101 @@
+// Library
+import * as React from 'react';
+import { ThemeProvider } from '@material-ui/styles';
+import { shallow, mount } from 'enzyme';
+
+// Theme
+import theme from '../../../../styles';
+
+// Web
+import { ChatHeaderComponent } from '../chat-header.component';
+import { act } from '@testing-library/react-hooks';
+
+describe('ChatHeaderComponent <ChatHeaderComponent />', () => {
+    it('ChatHeader Component renders correctly', () => {
+        const chatHeaderComponent = shallow(
+            <ThemeProvider theme={theme}>
+                <ChatHeaderComponent
+                    classes={{}}
+                    t={jest.fn}
+                    handleCreateGroup={jest.fn}
+                    modalOpen={jest.fn}
+                    currentUsername={'currentUsername'}
+                    githubUserData={{}}
+                    oppositeAvatarUrl={'oppositeAvatarUrl'}
+                    oppositeDescription={'oppositeDescription'}
+                    oppositeUserName={'oppositeUserName'}
+                    createGroupForm={true}
+                    settingsForm={false}
+                    modalHandleClose={jest.fn}
+                    handleDrawerToggle={jest.fn}
+                    groupMembers={[]}
+                    ownerRealId={123}
+                 />
+            </ThemeProvider>
+        );
+
+        // Interaction demo
+        expect(chatHeaderComponent.text()).toEqual(
+            '< />'
+        );
+
+        // Snapshot demo
+        expect(shallow).toMatchSnapshot();
+    });
+    it('ChatHeader Component mounts correctly when props are true', () => {
+        const chatHeaderComponent = mount(
+            <ThemeProvider theme={theme}>
+                <ChatHeaderComponent
+                    classes={{}}
+                    t={jest.fn}
+                    handleCreateGroup={jest.fn}
+                    modalOpen={jest.fn}
+                    currentUsername={'currentUsername'}
+                    githubUserData={{}}
+                    oppositeAvatarUrl={'oppositeAvatarUrl'}
+                    oppositeDescription={'oppositeDescription'}
+                    oppositeUserName={'oppositeUserName'}
+                    createGroupForm={false}
+                    settingsForm={true}
+                    modalHandleClose={jest.fn}
+                    handleDrawerToggle={jest.fn}
+                    groupMembers={[]}
+                    ownerRealId={123}
+                />
+            </ThemeProvider>
+        );
+
+        act(() => {
+            (chatHeaderComponent.find('WithStyles(ForwardRef(IconButton))').first().props() as any).onClick({
+                currentTarget: ''
+            });
+        });
+        expect(chatHeaderComponent.length).toBeTruthy();
+    });
+
+    it('ChatHeader Component mounts correctly for groups form', () => {
+        const chatHeaderComponent = mount(
+            <ThemeProvider theme={theme}>
+                <ChatHeaderComponent
+                    classes={{}}
+                    t={jest.fn}
+                    handleCreateGroup={jest.fn}
+                    modalOpen={jest.fn}
+                    currentUsername={'currentUsername'}
+                    githubUserData={{}}
+                    oppositeAvatarUrl={'oppositeAvatarUrl'}
+                    oppositeDescription={'oppositeDescription'}
+                    oppositeUserName={'oppositeUserName'}
+                    createGroupForm={true}
+                    settingsForm={false}
+                    modalHandleClose={jest.fn}
+                    handleDrawerToggle={jest.fn}
+                    groupMembers={[]}
+                    ownerRealId={123}
+                />
+            </ThemeProvider>
+        );
+
+        expect(chatHeaderComponent.length).toBeTruthy();
+    });
+});
diff --git a/src/client/web/app/common/components/chat-box/functional-components/__tests__/chat-main-component.spec.tsx b/src/client/web/app/common/components/chat-box/functional-components/__tests__/chat-main-component.spec.tsx
@@ -0,0 +1,70 @@
+// Library
+import * as React from 'react';
+import { ThemeProvider } from '@material-ui/styles';
+import { shallow, mount } from 'enzyme';
+
+// Theme
+import theme from '../../../../styles';
+
+// Web
+import { ChatMainComponent } from '../chat-main.component';
+
+const chatMocks = [{
+    id: 1245,
+    groupId: 1233,
+    ownerId: 123,
+    owner: {
+        id: 123,
+        githubId: 'string',
+        lastTokenWeb: 'string',
+        lastTokenMobile: 'string',
+        name: 'string',
+        email: 'string',
+        avatarUrl: 'string',
+        bio: 'string',
+        location: 'string',
+        createdAt: 'string',
+        updatedAt: 'string'
+    },
+    message: 'new message',
+    date: new Date()
+}];
+
+describe('ChatMainComponent <ChatMainComponent />', () => {
+    it('ChatMain Component renders correctly', () => {
+        const chatMainComponent = shallow(
+            <ThemeProvider theme={theme}>
+                <ChatMainComponent
+                    chats={chatMocks}
+                    classes={{}}
+                    githubUserData={{}}
+                    t={jest.fn}
+                    renderSubmitChatBox={jest.fn}
+                />
+            </ThemeProvider>
+        );
+
+        // Interaction demo
+        expect(chatMainComponent.text()).toEqual(
+            '< />'
+        );
+
+        // Snapshot demo
+        expect(shallow).toMatchSnapshot();
+    });
+    it('ChatMain Component mounts correctly when props are true', () => {
+        const chatMainComponent = mount(
+            <ThemeProvider theme={theme}>
+                <ChatMainComponent
+                    chats={chatMocks}
+                    classes={{}}
+                    githubUserData={{}}
+                    t={jest.fn}
+                    renderSubmitChatBox={jest.fn}
+                />
+            </ThemeProvider>
+        );
+
+        expect(chatMainComponent.length).toBeTruthy();
+    });
+});
diff --git a/src/client/web/app/common/components/create-group/__tests__/create-group-component.spec.tsx b/src/client/web/app/common/components/create-group/__tests__/create-group-component.spec.tsx
@@ -1,6 +1,7 @@
 // Library
 import * as React from 'react';
 import { ThemeProvider } from '@material-ui/styles';
+import { act } from '@testing-library/react-hooks';
 import { shallow, mount } from 'enzyme';
 
 // Theme
@@ -26,10 +27,20 @@ describe('CreateGroupComponent <CreateGroup />', () => {
 	it('CreateGroup Component mount correctly', () => {
 		const createGroupComponent = mount(
 			<ThemeProvider theme={theme}>
-				<CreateGroupComponent />
+				<CreateGroupComponent 
+					onSubmit={jest.fn}
+				/>
 			</ThemeProvider>
 		);
 
+		act(() => { 
+			(createGroupComponent.find('MaterialForm').first().props() as any).onSubmit({
+				formData: {
+					groupMembers: '[]'
+				}
+			});
+		});
+
 		// Interaction demo
 		expect(createGroupComponent.length).toBeTruthy();
 	});
diff --git a/src/client/web/app/common/components/material-form/__tests__/material-form-component.spec.tsx b/src/client/web/app/common/components/material-form/__tests__/material-form-component.spec.tsx
diff --git a/src/client/web/app/common/config/index.ts b/src/client/web/app/common/config/index.ts

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// Jest Snapshot v1, https://goo.gl/fbAQLP`
	`2`	`+`
	`3`	+exports[`AppHeaderComponent <AppHeaderComponent /> AppHeader Component renders correctly 1`] = `[Function]`;
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// Jest Snapshot v1, https://goo.gl/fbAQLP`
	`2`	`+`
	`3`	+exports[`ChatHeaderComponent <ChatHeaderComponent /> ChatHeader Component renders correctly 1`] = `[Function]`;
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// Jest Snapshot v1, https://goo.gl/fbAQLP`
	`2`	`+`
	`3`	+exports[`ChatMainComponent <ChatMainComponent /> ChatMain Component renders correctly 1`] = `[Function]`;