Public view fixes

jest.config.json

@@ -28,6 +28,7 @@
     "^.+\\.webapp$": "<rootDir>/test/jestLib/json-transformer.js"
   },
   "transformIgnorePatterns": ["node_modules/(?!cozy-ui)/"],
+  "testEnvironment": "jest-environment-jsdom-sixteen",
   "testMatch": ["**/(*.)(spec|test).js?(x)"],
   "globals": {
     "__APP_SLUG__": "drive"

package.json

@@ -85,6 +85,7 @@
     "eslint-config-cozy-app": "1.1.4",
     "husky": "0.14.3",
     "identity-obj-proxy": "3.0.0",
+    "jest-environment-jsdom-sixteen": "^1.0.3",
     "npm-run-all": "4.1.5",
     "react-addons-test-utils": "15.6.2",
     "react-test-renderer": "15.6.2",

src/drive/mobile/modules/settings/components/__snapshots__/Unlink.spec.jsx.snap

@@ -32,15 +32,15 @@ exports[`Unlink should render the Component 1`] = `
       ],
       "results": Array [
         Object {
-          "isThrow": false,
+          "type": "return",
           "value": "mobile.settings.unlink.title",
         },
         Object {
-          "isThrow": false,
+          "type": "return",
           "value": "mobile.settings.unlink.description",
         },
         Object {
-          "isThrow": false,
+          "type": "return",
           "value": "mobile.settings.unlink.button",
         },
       ],

src/drive/web/modules/drive/Toolbar/components/ShortcutCreationModal.jsx

@@ -55,11 +55,11 @@ const ShortcutCreationModal = ({ onClose, onCreated, displayedFolder }) => {
     }
     try {
       await client.collection('io.cozy.files.shortcuts').create(data)
-      Alerter.success('Shortcut.created')
-      onCreated()
+      Alerter.success(t('Shortcut.created'))
+      if (onCreated) onCreated()
       onClose()
     } catch (e) {
-      Alerter.error('Shortcut.errored')
+      Alerter.error(t('Shortcut.errored'))
     }
   }
 

src/drive/web/modules/drive/Toolbar/components/ShortcutCreationModal.spec.jsx

@@ -1,16 +1,19 @@
 /* eslint-env jest */
 import React from 'react'
-import { render, fireEvent } from '@testing-library/react'
+import { render, fireEvent, waitFor } from '@testing-library/react'
 import mediaQuery from 'css-mediaquery'
 
 import { createMockClient } from 'cozy-client'
 import MuiCozyTheme from 'cozy-ui/transpiled/react/MuiCozyTheme'
+import Alerter from 'cozy-ui/transpiled/react/Alerter'
 
 import ShortcutCreationModal from './ShortcutCreationModal'
 import AppLike from '../../../../../../../test/components/AppLike'
 const tMock = jest.fn()
-jest.mock('cozy-ui/transpiled/react/utils/color', () => ({
-  getCssVariableValue: () => '#fff'
+
+jest.mock('cozy-ui/transpiled/react/Alerter', () => ({
+  error: jest.fn(),
+  success: jest.fn()
 }))
 
 function createMatchMedia(width) {
@@ -22,7 +25,7 @@ function createMatchMedia(width) {
 }
 const client = new createMockClient({})
 const onCloseSpy = jest.fn()
-const props = {
+const defaultProps = {
   displayedFolder: {
     id: 'id'
   },
@@ -32,11 +35,12 @@ const props = {
 
 describe('ShortcutCreationModal', () => {
   beforeEach(() => {
+    jest.resetAllMocks()
     window.matchMedia = createMatchMedia(window.innerWidth)
     tMock.mockImplementation(key => key)
   })
 
-  it('should show the new account form', async () => {
+  const setup = props => {
     const { getByLabelText, getByText } = render(
       <AppLike client={client}>
         <MuiCozyTheme>
@@ -48,12 +52,25 @@ describe('ShortcutCreationModal', () => {
     const urlInput = getByLabelText('URL')
     const filenameInput = getByLabelText('Filename')
     const submitButton = getByText('Create')
+
+    return {
+      urlInput,
+      filenameInput,
+      submitButton
+    }
+  }
+
+  it('should show the new shortcut form', async () => {
+    const { urlInput, filenameInput, submitButton } = setup(defaultProps)
     fireEvent.change(urlInput, { target: { value: 'https://cozy.io' } })
 
     fireEvent.click(submitButton)
     expect(client.stackClient.fetchJSON).not.toHaveBeenCalled()
-    fireEvent.change(filenameInput, { target: { value: 'filename' } })
+    expect(Alerter.error).toHaveBeenCalledTimes(1)
+    expect(Alerter.success).not.toHaveBeenCalled()
 
+    client.stackClient.fetchJSON.mockResolvedValue({ data: {} })
+    fireEvent.change(filenameInput, { target: { value: 'filename' } })
     fireEvent.click(submitButton)
 
     expect(client.stackClient.fetchJSON).toHaveBeenCalledWith(
@@ -71,6 +88,8 @@ describe('ShortcutCreationModal', () => {
         }
       }
     )
+    expect(Alerter.error).toHaveBeenCalledTimes(1)
+    await waitFor(() => expect(Alerter.success).toHaveBeenCalledTimes(1))
 
     fireEvent.change(filenameInput, { target: { value: 'filename.url' } })
     fireEvent.click(submitButton)
@@ -89,5 +108,22 @@ describe('ShortcutCreationModal', () => {
         }
       }
     )
+    await waitFor(() => expect(Alerter.success).toHaveBeenCalledTimes(2))
+  })
+
+  it('should call the optional onCreated prop', async () => {
+    const onCreatedMock = jest.fn()
+    const { urlInput, filenameInput, submitButton } = setup({
+      ...defaultProps,
+      onCreated: onCreatedMock
+    })
+
+    client.stackClient.fetchJSON.mockResolvedValue({ data: {} })
+    fireEvent.change(urlInput, { target: { value: 'https://cozy.io' } })
+    fireEvent.change(filenameInput, { target: { value: 'filename' } })
+    fireEvent.click(submitButton)
+
+    await waitFor(() => expect(Alerter.success).toHaveBeenCalledTimes(1))
+    expect(onCreatedMock).toHaveBeenCalled()
   })
 })

src/drive/web/modules/public/Actions.jsx

@@ -2,11 +2,7 @@ import React from 'react'
 import { showModal } from 'react-cozy-helpers'
 import { downloadFiles, trashFiles } from 'drive/web/modules/navigation/duck'
 import DeleteConfirm from 'drive/web/modules/drive/DeleteConfirm'
-import {
-  isRenaming,
-  getRenamingFile,
-  startRenamingAsync
-} from 'drive/web/modules/drive/rename'
+import { startRenamingAsync } from 'drive/web/modules/drive/rename'
 import { isFile, isReferencedByAlbum } from 'drive/web/modules/drive/files'
 
 const isAnyFileReferencedByAlbum = files => {
@@ -16,11 +12,6 @@ const isAnyFileReferencedByAlbum = files => {
   return false
 }
 
-export const mapStateToProps = state => ({
-  isRenaming: isRenaming(state),
-  renamingFile: getRenamingFile(state)
-})
-
 export const mapDispatchToProps = (dispatch, ownProps) => {
   const { onFileDelete, hasWriteAccess } = ownProps
   return {

src/drive/web/modules/public/LightFileList.jsx

@@ -1,14 +1,18 @@
 import React from 'react'
 import { connect } from 'react-redux'
+import { withRouter } from 'react-router'
 
 import FileList from 'drive/web/modules/filelist/FileList'
 import SelectionBar from 'drive/web/modules/selection/SelectionBar'
-import { mapStateToProps, mapDispatchToProps } from './Actions'
+import { mapDispatchToProps } from './Actions'
+import { isRenaming, getRenamingFile } from 'drive/web/modules/drive/rename'
 
 const LightFileList = ({
   actions,
   onFileOpen,
   onFolderOpen,
+  isRenaming,
+  renamingFile,
   fileListProps
 }) => (
   <>
@@ -18,12 +22,22 @@ const LightFileList = ({
       onFolderOpen={onFolderOpen}
       withSelectionCheckbox={true}
       fileActions={actions}
+      isRenaming={isRenaming}
+      renamingFile={renamingFile}
       {...fileListProps}
     />
   </>
 )
 
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps
-)(LightFileList)
+const mapStateToProps = state => ({
+  isRenaming: isRenaming(state),
+  renamingFile: getRenamingFile(state)
+})
+
+export default withRouter(
+  //router is used in mapDispatchToProps
+  connect(
+    mapStateToProps,
+    mapDispatchToProps
+  )(LightFileList)
+)

src/photos/targets/public/__snapshots__/App.spec.jsx.snap

@@ -51,35 +51,35 @@ exports[`Public view should render children when they are present 1`] = `
                 ],
                 "results": Array [
                   Object {
-                    "isThrow": false,
+                    "type": "return",
                     "value": undefined,
                   },
                   Object {
-                    "isThrow": false,
+                    "type": "return",
                     "value": undefined,
                   },
                   Object {
-                    "isThrow": false,
+                    "type": "return",
                     "value": undefined,
                   },
                   Object {
-                    "isThrow": false,
+                    "type": "return",
                     "value": undefined,
                   },
                   Object {
-                    "isThrow": false,
+                    "type": "return",
                     "value": undefined,
                   },
                   Object {
-                    "isThrow": false,
+                    "type": "return",
                     "value": undefined,
                   },
                   Object {
-                    "isThrow": false,
+                    "type": "return",
                     "value": undefined,
                   },
                   Object {
-                    "isThrow": false,
+                    "type": "return",
                     "value": undefined,
                   },
                 ],
@@ -200,19 +200,19 @@ exports[`Public view should render the album 1`] = `
                 ],
                 "results": Array [
                   Object {
-                    "isThrow": false,
+                    "type": "return",
                     "value": undefined,
                   },
                   Object {
-                    "isThrow": false,
+                    "type": "return",
                     "value": undefined,
                   },
                   Object {
-                    "isThrow": false,
+                    "type": "return",
                     "value": undefined,
                   },
                   Object {
-                    "isThrow": false,
+                    "type": "return",
                     "value": undefined,
                   },
                 ],