Merge branch 'dev' of...

Merge branch 'dev' of https://gitlab.liu.se/tddd96-grupp11/teknikattan-scoring-system into 86-fix-login-button

client/src/App.test.tsx

 import { render } from '@testing-library/react'
+import mockedAxios from 'axios'
 import React from 'react'
 import { act } from 'react-dom/test-utils'
 import { Provider } from 'react-redux'
@@ -7,6 +8,12 @@ import store from './store'
 
 test('renders app', async () => {
   await act(async () => {
+    const typeRes: any = {
+      data: { component_types: [], view_types: [], question_types: [], media_types: [] },
+    }
+    ;(mockedAxios.get as jest.Mock).mockImplementation(() => {
+      return Promise.resolve(typeRes)
+    })
     render(
       <Provider store={store}>
         <App />