Merge branch 'master' into patch-no-any

Author: Can-Sahin

app/components/Footer/tests/index.test.tsx

@@ -2,16 +2,16 @@ import React from 'react';
 import renderer from 'react-test-renderer';
 import { IntlProvider } from 'react-intl';
 import { Provider } from 'react-redux';
-import { browserHistory } from 'react-router-dom';
 
 import Footer from '../index';
 import configureStore from '../../../configureStore';
+import history from '../../../utils/history';
 
 describe('<Footer />', () => {
   let store;
 
   beforeAll(() => {
-    store = configureStore({}, browserHistory);
+    store = configureStore({}, history);
   });
 
   it('should render and match the snapshot', () => {

app/components/ReposList/tests/index.test.tsx

@@ -1,11 +1,11 @@
 import React from 'react';
 import { IntlProvider } from 'react-intl';
 import { Provider } from 'react-redux';
-import { browserHistory } from 'react-router-dom';
 import { render } from '@testing-library/react';
 
 import ReposList from '../index';
 import configureStore from '../../../configureStore';
+import history from '../../../utils/history';
 
 describe('<ReposList />', () => {
   it('should render the loading indicator when its loading', () => {
@@ -37,7 +37,7 @@ describe('<ReposList />', () => {
     };
     const store = configureStore(
       initialState,
-      browserHistory,
+      history,
     );
     const repos = [
       {

app/containers/HomePage/tests/index.test.tsx

@@ -6,13 +6,13 @@ import React from 'react';
 import { render, cleanup, fireEvent } from '@testing-library/react';
 import { IntlProvider } from 'react-intl';
 import { Provider } from 'react-redux';
-import { browserHistory } from 'react-router-dom';
 
 import * as appActions from 'containers/App/actions';
 import configureStore from '../../../configureStore';
 import HomePage from '../index';
 import { initialState } from '../reducer';
 import { changeUsername } from '../actions';
+import history from '../../../utils/history';
 
 jest.mock('containers/App/actions');
 
@@ -36,7 +36,7 @@ describe('<HomePage />', () => {
   });
 
   beforeEach(() => {
-    store = configureStore({}, browserHistory);
+    store = configureStore({}, history);
     mockedLoadRepos.mockClear();
   });
 

app/containers/LanguageProvider/tests/index.test.tsx

@@ -2,12 +2,12 @@ import React from 'react';
 import { render } from '@testing-library/react';
 import { FormattedMessage, defineMessages } from 'react-intl';
 import { Provider } from 'react-redux';
-import { browserHistory } from 'react-router-dom';
 
 import LanguageProvider from '../index';
 import configureStore from '../../../configureStore';
 
 import { translationMessages } from '../../../i18n';
+import history from '../../../utils/history';
 
 const messages = defineMessages({
   someMessage: {
@@ -21,7 +21,7 @@ describe('<LanguageProvider />', () => {
   let store;
 
   beforeEach(() => {
-    store = configureStore({}, browserHistory);
+    store = configureStore({}, history);
   });
 
   it('should render its children', () => {

app/containers/LocaleToggle/tests/index.test.tsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import { Provider } from 'react-redux';
-import { browserHistory } from 'react-router-dom';
 import { render, fireEvent } from '@testing-library/react';
 
 import LocaleToggle from '../index';
@@ -10,6 +9,7 @@ import LanguageProvider from '../../LanguageProvider';
 import configureStore from '../../../configureStore';
 import { translationMessages } from '../../../i18n';
 import { action } from 'typesafe-actions';
+import history from '../../../utils/history';
 
 jest.mock('../../LanguageProvider/actions');
 
@@ -22,7 +22,7 @@ describe('<LocaleToggle />', () => {
     mockedChangeLocale.mockImplementation(
       () => action('test', undefined) as any,
     );
-    store = configureStore({}, browserHistory);
+    store = configureStore({}, history);
   });
 
   it('should match the snapshot', () => {

app/containers/RepoListItem/index.tsx

@@ -5,7 +5,7 @@
  */
 
 import React from 'react';
-import { connect, useSelector } from 'react-redux';
+import { useSelector } from 'react-redux';
 import { createStructuredSelector } from 'reselect';
 import { FormattedNumber } from 'react-intl';
 
@@ -15,10 +15,10 @@ import IssueIcon from './IssueIcon';
 import IssueLink from './IssueLink';
 import RepoLink from './RepoLink';
 import Wrapper from './Wrapper';
-import { RootState } from 'containers/App/types';
+import { Repo } from '../../types/GitHubResponse';
 
 interface OwnProps {
-  item: any; // Too many fields.
+  item: Repo;
 }
 
 // tslint:disable-next-line:no-empty-interface

app/containers/RepoListItem/tests/index.test.tsx

@@ -6,10 +6,10 @@ import React from 'react';
 import { getByText, render } from '@testing-library/react';
 import { IntlProvider } from 'react-intl';
 import { Provider } from 'react-redux';
-import { browserHistory } from 'react-router-dom';
 
 import RepoListItem from '../index';
 import configureStore from '../../../configureStore';
+import history from '../../../utils/history';
 
 const renderComponent = (item, currentUser) => {
   const initialState = {
@@ -23,7 +23,7 @@ const renderComponent = (item, currentUser) => {
     },
   };
   const store = configureStore(
-    initialState, browserHistory);
+    initialState, history);
 
   return render(
     // tslint:disable-next-line: jsx-wrap-multiline

app/tests/store.test.ts

@@ -1,16 +1,16 @@
 /**
  * Test store addons
  */
+import history from '../utils/history';
 
-import { browserHistory } from 'react-router-dom';
 import configureStore from '../configureStore';
 import { InjectedStore } from '../types';
 
 describe('configureStore', () => {
   let store: InjectedStore;
 
   beforeAll(() => {
-    store = configureStore({}, browserHistory);
+    store = configureStore({}, history);
   });
 
   describe('injectedReducers', () => {
@@ -36,7 +36,7 @@ describe('configureStore params', () => {
   it('should call window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__', () => {
     const compose = jest.fn();
     (window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ = () => compose;
-    configureStore(undefined, browserHistory);
+    configureStore(undefined, history);
     expect(compose).toHaveBeenCalled();
   });
 });

app/types/GitHubResponse.d.ts

@@ -0,0 +1,22 @@
+import { ReposListForksResponseItem, SearchReposResponseItemsItemOwner } from '@octokit/rest';
+
+interface Owner extends SearchReposResponseItemsItemOwner {
+  html_url: string;
+  followers_url: string;
+  following_url: string;
+  gists_url: string;
+  starred_url: string;
+  subscriptions_url: string;
+  organizations_url: string;
+  repos_url: string;
+  events_url: string;
+  site_admin: boolean;
+
+}
+
+export interface Repo extends Partial<ReposListForksResponseItem> {
+  owner: Owner
+  forks: number;
+  open_issues: number
+  watchers: number
+}

app/utils/tests/injectReducer.test.tsx

@@ -74,10 +74,12 @@ describe('injectReducer decorator', () => {
       <Provider store={store}>
         <ComponentWithReducer {...props} />
       </Provider>,
-    );
+    )
+      .getInstance()!;
+
     const {
       props: { children },
-    } = renderedComponent.getInstance();
+    } = renderedComponent;
 
     expect(children.props).toEqual(props);
   });