Skip to content

TagSpaces is an offline, open source, document manager with tagging support

screenshots && fix web (#1293)

Stanimir585ea266a095
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index ac9aaf594..f63e92478 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -28,7 +28,7 @@ jobs:
# - name: Run Unit tests
# run: yarn test-unit
- gitHubActionForNpmWin:
+ e2eTestsWin:
name: Validating Windows
runs-on: windows-latest
@@ -63,6 +63,66 @@ jobs:
with:
access-token: ${{ secrets.GITHUB_TOKEN }}
working-directory: tests
+ - uses: actions/upload-artifact@v2
+ if: failure()
+ with:
+ name: test-artifacts
+ path: |
+ tests/test-pages/
+ tests/test-reports/
+ # e2eTestsWebWin:
+ # name: E2E Windows Web
+ # runs-on: windows-latest
+ # steps:
+ # - name: Checking out default branch
+ # uses: actions/checkout@v2
+ # with:
+ # submodules: true
+ # - name: Checkout TagspacesPro
+ # uses: actions/checkout@v2
+ # with:
+ # repository: tagspaces/tagspacespro
+ # token: ${{ secrets.CHECKOUT_TSPRO }}
+ # path: extensions/tagspacespro
+ # - name: Checkout TestData
+ # uses: actions/checkout@v2
+ # with:
+ # repository: tagspaces/testdata
+ # path: tests/testdata
+ # - uses: actions/setup-node@v2-beta
+ # with:
+ # node-version: '10.x'
+ # - name: Running yarn install, prettier and type checks
+ # run: |
+ # yarn install --check-files --cache-folder .ycache
+ # yarn prettier-check
+ # yarn type-check
+ # - name: Run Unit tests
+ # run: yarn test-unit
+ # - uses: suisei-cn/actions-download-file@v1
+ # id: minio
+ # name: Download the Minio.exe
+ # with:
+ # url: 'https://dl.min.io/server/minio/release/windows-amd64/minio.exe'
+ # target: tests/bin/
+ # - name: Run Electron tests
+ # run: |
+ # yarn install-ext
+ # yarn build-main
+ # yarn build-e2e
+ # yarn test-e2e-web
+ # - uses: IgnusG/[email protected]
+ # if: always() # Run regardless of whether other steps failed
+ # with:
+ # access-token: ${{ secrets.GITHUB_TOKEN }}
+ # working-directory: tests
+ # - uses: actions/upload-artifact@v2
+ # if: always()
+ # with:
+ # name: test-artifacts-web
+ # path: |
+ # tests/test-pages/
+ # tests/test-reports/
# gitHubActionForNpmMac:
# name: Validating MacOS
# runs-on: macos-latest
diff --git a/.github/workflows/workflow_dispatch.yml b/.github/workflows/workflow_dispatch.yml
index 95e4a3ed0..05eda68a6 100644
--- a/.github/workflows/workflow_dispatch.yml
+++ b/.github/workflows/workflow_dispatch.yml
@@ -49,9 +49,10 @@ jobs:
yarn build-e2e
yarn ${{ github.event.inputs.command }}
- uses: actions/upload-artifact@v2
+ if: always()
with:
- name: test-reports
- path: tests/test-reports/
+ name: test-pages
+ path: tests/test-pages/
- uses: IgnusG/[email protected]
if: always() # Run regardless of whether other steps failed
with:
diff --git a/.github/workflows/workflow_scheduled.yml b/.github/workflows/workflow_scheduled.yml
index afb14765d..161fccd6a 100644
--- a/.github/workflows/workflow_scheduled.yml
+++ b/.github/workflows/workflow_scheduled.yml
@@ -35,6 +35,11 @@ jobs:
yarn build-main
yarn build-e2e
yarn test-e2e-electron
+ - uses: actions/upload-artifact@v2
+ if: always()
+ with:
+ name: test-pages
+ path: tests/test-pages/
e2eTestsMinioWin:
name: E2E Windows Minio
@@ -79,6 +84,11 @@ jobs:
yarn build-main
yarn build-e2e
yarn test-e2e-electron-minio
+ - uses: actions/upload-artifact@v2
+ if: always()
+ with:
+ name: test-pages
+ path: tests/test-pages/
e2eTestsWebWin:
name: E2E Windows Web
@@ -123,6 +133,11 @@ jobs:
yarn build-main
yarn build-e2e
yarn test-e2e-web
+ - uses: actions/upload-artifact@v2
+ if: always()
+ with:
+ name: test-pages
+ path: tests/test-pages/
e2eTestsElectronMac:
name: E2E Mac Electron
@@ -154,6 +169,11 @@ jobs:
yarn build-main
yarn build-e2e
yarn test-e2e-electron
+ - uses: actions/upload-artifact@v2
+ if: always()
+ with:
+ name: test-pages
+ path: tests/test-pages/
e2eTestsMinioMac:
name: E2E Mac Minio
@@ -199,6 +219,11 @@ jobs:
yarn build-main
yarn build-e2e
yarn test-e2e-electron-minio
+ - uses: actions/upload-artifact@v2
+ if: always()
+ with:
+ name: test-pages
+ path: tests/test-pages/
e2eTestsWebMac:
name: E2E Mac Web
@@ -245,9 +270,10 @@ jobs:
yarn build-e2e
yarn test-e2e-web
- uses: actions/upload-artifact@v2
+ if: always()
with:
- name: test-reports
- path: tests/test-reports/
+ name: test-pages
+ path: tests/test-pages/
e2eTestsElectronUbuntu:
name: E2E Ubuntu Electron
@@ -279,6 +305,11 @@ jobs:
yarn build-main
yarn build-e2e
yarn test-e2e-electron
+ - uses: actions/upload-artifact@v2
+ if: always()
+ with:
+ name: test-pages
+ path: tests/test-pages/
e2eTestsMinioUbuntu:
name: E2E Ubuntu Minio
@@ -324,6 +355,11 @@ jobs:
yarn build-main
yarn build-e2e
yarn test-e2e-electron-minio
+ - uses: actions/upload-artifact@v2
+ if: always()
+ with:
+ name: test-pages
+ path: tests/test-pages/
e2eTestsWebUbuntu:
name: E2E Ubuntu Web
@@ -370,6 +406,7 @@ jobs:
yarn build-e2e
yarn test-e2e-web
- uses: actions/upload-artifact@v2
+ if: always()
with:
name: test-reports
path: tests/test-reports/
diff --git a/app/components/AppOnboarding.tsx b/app/components/AppOnboarding.tsx
index cafebfd98..e32e439f8 100644
--- a/app/components/AppOnboarding.tsx
+++ b/app/components/AppOnboarding.tsx
@@ -1,4 +1,5 @@
-/**
+/*
+/!**
* TagSpaces - universal file and folder organizer
* Copyright (C) 2017-present TagSpaces UG (haftungsbeschraenkt)
*
@@ -14,7 +15,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
- */
+ *!/
import React, { Component } from 'react';
import Joyride from 'react-joyride';
@@ -25,13 +26,13 @@ class AppOnboarding extends Component {
run: false
};
- /* componentDidMount() {
+ /!* componentDidMount() {
setTimeout(() => {
this.setState({
run: true
});
}, 1000);
- } */
+ } *!/
callback = data => {
// const { action, index, type } = data;
@@ -57,3 +58,4 @@ class AppOnboarding extends Component {
}
export default AppOnboarding;
+*/
diff --git a/app/components/LocationManager.tsx b/app/components/LocationManager.tsx
index 31308a9d4..ac2d5c307 100644
--- a/app/components/LocationManager.tsx
+++ b/app/components/LocationManager.tsx
@@ -305,7 +305,8 @@ function mapDispatchToProps(dispatch) {
);
}
-export default withStyles(styles)(
+export default connect(
+ mapStateToProps,
+ mapDispatchToProps
// @ts-ignore
- connect(mapStateToProps, mapDispatchToProps)(LocationManager)
-);
+)(withStyles(styles)(LocationManager));
diff --git a/app/components/LocationView.tsx b/app/components/LocationView.tsx
index 7176319c3..921b792ba 100644
--- a/app/components/LocationView.tsx
+++ b/app/components/LocationView.tsx
@@ -357,7 +357,8 @@ function mapDispatchToProps(dispatch) {
);
}
-export default withStyles(styles)(
+export default connect(
+ mapStateToProps,
+ mapDispatchToProps
// @ts-ignore
- connect(mapStateToProps, mapDispatchToProps)(LocationView)
-);
+)(withStyles(styles)(LocationView));
diff --git a/app/components/Search.tsx b/app/components/Search.tsx
index 08009c9ef..34f27643b 100644
--- a/app/components/Search.tsx
+++ b/app/components/Search.tsx
@@ -71,6 +71,7 @@ import { formatDateTime, extractTimePeriod } from '-/utils/dates';
import { isPlusCode, parseLatLon } from '-/utils/misc';
import PlatformIO from '../services/platform-io';
import { AppConfig } from '-/config';
+import withMobileDialog from '@material-ui/core/withMobileDialog';
interface Props {
classes: any;
@@ -855,6 +856,7 @@ function mapDispatchToProps(dispatch) {
);
}
-export default withStyles(styles, { withTheme: true })(
- connect(mapStateToProps, mapDispatchToProps)(Search)
-);
+export default connect(
+ mapStateToProps,
+ mapDispatchToProps
+)(withStyles(styles, { withTheme: true })(Search));
diff --git a/app/components/SidePanels.css.tsx b/app/components/SidePanels.css.tsx
index 040aa2303..7030b518f 100644
--- a/app/components/SidePanels.css.tsx
+++ b/app/components/SidePanels.css.tsx
@@ -21,10 +21,10 @@ export default (theme: any) =>
({
panel: {
height: '100%',
- maxHeight: '100%',
- padding: 5,
- paddingBottom: 50,
- overflowY: 'hidden',
+ // maxHeight: '100%',
+ // padding: 5,
+ // paddingBottom: 50,
+ // overflowY: 'hidden',
backgroundColor: theme.palette.background.default
},
fontIcon: {
diff --git a/app/components/TagLibrary.tsx b/app/components/TagLibrary.tsx
index 62a71f615..7ff89a613 100644
--- a/app/components/TagLibrary.tsx
+++ b/app/components/TagLibrary.tsx
@@ -487,7 +487,8 @@ function mapDispatchToProps(dispatch) {
);
}
-export default withStyles(styles)(
+export default connect(
+ mapStateToProps,
+ mapDispatchToProps
// @ts-ignore
- connect(mapStateToProps, mapDispatchToProps)(TagLibrary)
-);
+)(withStyles(styles)(TagLibrary));
diff --git a/app/components/VerticalNavigation.tsx b/app/components/VerticalNavigation.tsx
index bb5484d65..5371c0359 100644
--- a/app/components/VerticalNavigation.tsx
+++ b/app/components/VerticalNavigation.tsx
@@ -30,7 +30,7 @@ import SettingsIcon from '@material-ui/icons/Settings';
import ThemingIcon from '@material-ui/icons/InvertColors';
import UpgradeIcon from '@material-ui/icons/FlightTakeoff';
import HelpIcon from '@material-ui/icons/HelpOutline';
-import { withTheme } from '@material-ui/core/styles';
+import { withStyles } from '@material-ui/core/styles';
import SplitPane from 'react-split-pane';
import { CircularProgress, Typography } from '@material-ui/core';
import Box from '@material-ui/core/Box';
@@ -66,7 +66,44 @@ const ProTeaserDialogAsync = props => (
</React.Suspense>
);
+const styles: any = (theme: any) => ({
+ panel: {
+ height: '100%',
+ backgroundColor: AppConfig.sidebarColor
+ },
+ buttonIcon: {
+ width: 28,
+ height: 28,
+ color: '#d6d6d6'
+ },
+ button: {
+ padding: 8,
+ width: 44,
+ height: 44
+ },
+ selectedButton: {
+ borderRadius: 0,
+ backgroundColor: AppConfig.sidebarSelectionColor
+ },
+ settingsButton: {
+ position: 'absolute',
+ bottom: 0,
+ left: 0
+ },
+ themingButton: {
+ position: 'absolute',
+ bottom: 45,
+ left: 0
+ },
+ upgradeButton: {
+ position: 'absolute',
+ bottom: 90,
+ left: 0
+ }
+});
+
interface Props {
+ classes: any;
theme: any;
isFirstRun: boolean;
directoryPath: string;
@@ -91,7 +128,7 @@ interface Props {
closeAllVerticalPanels: () => void;
openFileNatively: (url: string) => void;
openURLExternally: (url: string) => void;
- switchTheme: (theme: string) => void;
+ switchTheme: () => void;
showNotification: (message: string) => void;
isReadOnlyMode: boolean;
progress?: Array<any>;
@@ -106,42 +143,6 @@ class VerticalNavigation extends React.Component<Props, State> {
isProTeaserVisible: false
};
- styles = {
- panel: {
- height: '100%',
- backgroundColor: AppConfig.sidebarColor
- },
- buttonIcon: {
- width: 28,
- height: 28,
- color: '#d6d6d6'
- },
- button: {
- padding: 8,
- width: 44,
- height: 44
- },
- selectedButton: {
- borderRadius: 0,
- backgroundColor: AppConfig.sidebarSelectionColor
- },
- settingsButton: {
- position: 'absolute',
- bottom: 0,
- left: 0
- },
- themingButton: {
- position: 'absolute',
- bottom: 45,
- left: 0
- },
- upgradeButton: {
- position: 'absolute',
- bottom: 90,
- left: 0
- }
- };
-
toggleProTeaser = () => {
this.setState(prevState => ({
isProTeaserVisible: !prevState.isProTeaserVisible
@@ -160,6 +161,7 @@ class VerticalNavigation extends React.Component<Props, State> {
render() {
const {
+ classes,
isLocationManagerPanelOpened,
isTagLibraryPanelOpened,
isSearchPanelOpened,
@@ -208,16 +210,17 @@ class VerticalNavigation extends React.Component<Props, State> {
defaultSize={44}
resizerStyle={{ backgroundColor: theme.palette.divider }}
>
- <div style={this.styles.panel}>
+ <div className={classes.panel}>
<IconButton
onClick={toggleAboutDialog}
- style={{ ...this.styles.button, marginTop: 10, marginBottom: 16 }}
+ className={classes.button}
+ style={{ marginTop: 10, marginBottom: 16 }}
title={i18n.t('core:aboutTitle')}
data-tid="aboutTagSpaces"
>
<img
+ className={classes.buttonIcon}
style={{
- ...this.styles.buttonIcon,
color: this.props.theme.palette.text.primary
}}
src={LogoIcon}
@@ -235,11 +238,12 @@ class VerticalNavigation extends React.Component<Props, State> {
toggleCreateFileDialog();
}
}}
- style={{ ...this.styles.button, marginBottom: 20 }}
+ className={classes.button}
+ style={{ marginBottom: 20 }}
title={i18n.t('core:createFileTitle')}
data-tid="locationManager"
>
- <NewFileIcon style={this.styles.buttonIcon} />
+ <NewFileIcon className={classes.buttonIcon} />
</IconButton>
<IconButton
id="verticalNavButton"
@@ -250,15 +254,15 @@ class VerticalNavigation extends React.Component<Props, State> {
openLocationManagerPanel();
}
}}
- style={
+ className={
isLocationManagerPanelOpened
- ? { ...this.styles.button, ...this.styles.selectedButton }
- : this.styles.button
+ ? [classes.button, classes.selectedButton].join(' ')
+ : classes.button
}
title={i18n.t('core:locationManager')}
data-tid="locationManagerPanel"
>
- <LocationsIcon style={this.styles.buttonIcon} />
+ <LocationsIcon className={classes.buttonIcon} />
</IconButton>
<IconButton
id="verticalNavButton"
@@ -271,13 +275,13 @@ class VerticalNavigation extends React.Component<Props, State> {
openTagLibraryPanel();
}
}}
- style={
+ className={
isTagLibraryPanelOpened
- ? { ...this.styles.button, ...this.styles.selectedButton }
- : this.styles.button
+ ? [classes.button, classes.selectedButton].join(' ')
+ : classes.button
}
>
- <TagLibraryIcon style={this.styles.buttonIcon} />
+ <TagLibraryIcon className={classes.buttonIcon} />
</IconButton>
<IconButton
id="verticalNavButton"
@@ -290,13 +294,13 @@ class VerticalNavigation extends React.Component<Props, State> {
openSearchPanel();
}
}}
- style={
+ className={
isSearchPanelOpened
- ? { ...this.styles.button, ...this.styles.selectedButton }
- : this.styles.button
+ ? [classes.button, classes.selectedButton].join(' ')
+ : classes.button
}
>
- <SearchIcon style={this.styles.buttonIcon} />
+ <SearchIcon className={classes.buttonIcon} />
</IconButton>
{/* <IconButton
title={i18n.t('core:perspectiveManager')}
@@ -311,11 +315,11 @@ class VerticalNavigation extends React.Component<Props, State> {
disabled={false}
style={
isPerspectivePanelOpened
- ? { ...this.styles.button, ...this.styles.selectedButton }
- : this.styles.button
+ ? { ...classes.button, ...classes.selectedButton }
+ : classes.button
}
>
- <PerspectivesIcon style={this.styles.buttonIcon} />
+ <PerspectivesIcon style={classes.buttonIcon} />
</IconButton> */}
<IconButton
id="verticalNavButton"
@@ -328,13 +332,13 @@ class VerticalNavigation extends React.Component<Props, State> {
openHelpFeedbackPanel();
}
}}
- style={
+ className={
isHelpFeedbackPanelOpened
- ? { ...this.styles.button, ...this.styles.selectedButton }
- : this.styles.button
+ ? [classes.button, classes.selectedButton].join(' ')
+ : classes.button
}
>
- <HelpIcon style={this.styles.buttonIcon} />
+ <HelpIcon className={classes.buttonIcon} />
</IconButton>
{!Pro && (
<IconButton
@@ -343,13 +347,9 @@ class VerticalNavigation extends React.Component<Props, State> {
data-tid="upgradeToPro"
onClick={this.toggleProTeaser}
// @ts-ignore
- style={{ ...this.styles.button, ...this.styles.upgradeButton }}
+ className={[classes.button, classes.upgradeButton].join(' ')}
>
- <UpgradeIcon
- style={{
- ...this.styles.buttonIcon
- }}
- />
+ <UpgradeIcon className={classes.buttonIcon} />
</IconButton>
)}
{this.props.progress && this.props.progress.length > 0 && (
@@ -359,7 +359,7 @@ class VerticalNavigation extends React.Component<Props, State> {
data-tid="uploadProgress"
onClick={() => this.props.toggleUploadDialog()}
// @ts-ignore
- style={{ ...this.styles.button, ...this.styles.upgradeButton }}
+ className={[classes.button, classes.upgradeButton].join(' ')}
>
<CircularProgressWithLabel value={this.getProgressValue()} />
</IconButton>
@@ -369,10 +369,9 @@ class VerticalNavigation extends React.Component<Props, State> {
title={i18n.t('core:switchTheme')}
data-tid="switchTheme"
onClick={switchTheme}
- // @ts-ignore
- style={{ ...this.styles.button, ...this.styles.themingButton }}
+ className={[classes.button, classes.themingButton].join(' ')}
>
- <ThemingIcon style={this.styles.buttonIcon} />
+ <ThemingIcon className={classes.buttonIcon} />
</IconButton>
<IconButton
id="verticalNavButton"
@@ -380,28 +379,21 @@ class VerticalNavigation extends React.Component<Props, State> {
data-tid="settings"
onClick={toggleSettingsDialog}
// @ts-ignore
- style={
+ className={
isSettingsDialogOpened
- ? {
- ...this.styles.button,
- ...this.styles.settingsButton,
- ...this.styles.selectedButton
- }
- : {
- ...this.styles.button,
- ...this.styles.settingsButton
- }
+ ? [
+ classes.button,
+ classes.settingsButton,
+ classes.selectedButton
+ ].join(' ')
+ : [classes.button, classes.settingsButton].join(' ')
}
>
- <SettingsIcon style={this.styles.buttonIcon} />
+ <SettingsIcon className={classes.buttonIcon} />
</IconButton>
</div>
- <div style={this.styles.panel}>
- <LocationManager
- style={{
- display: isLocationManagerPanelOpened ? 'block' : 'none'
- }}
- />
+ <div className={classes.panel}>
+ {isLocationManagerPanelOpened && <LocationManager />}
{isTagLibraryPanelOpened && <TagLibrary />}
{isSearchPanelOpened && <Search />}
{isHelpFeedbackPanelOpened && (
@@ -490,4 +482,4 @@ function mapActionCreatorsToProps(dispatch) {
export default connect(
mapStateToProps,
mapActionCreatorsToProps
-)(withTheme(VerticalNavigation));
+)(withStyles(styles, { withTheme: true })(VerticalNavigation));
diff --git a/app/components/dialogs/CreateEditLocationDialog.tsx b/app/components/dialogs/CreateEditLocationDialog.tsx
index 69b341ae7..ca15fe0f4 100644
--- a/app/components/dialogs/CreateEditLocationDialog.tsx
+++ b/app/components/dialogs/CreateEditLocationDialog.tsx
@@ -488,4 +488,4 @@ const CreateEditLocationDialog = (props: Props) => {
);
};
-export default withStyles(styles)(withMobileDialog()(CreateEditLocationDialog));
+export default withMobileDialog()(withStyles(styles)(CreateEditLocationDialog));
diff --git a/app/components/dialogs/CreateTagGroupDialog.tsx b/app/components/dialogs/CreateTagGroupDialog.tsx
index 1b47cef08..b094e8b81 100644
--- a/app/components/dialogs/CreateTagGroupDialog.tsx
+++ b/app/components/dialogs/CreateTagGroupDialog.tsx
@@ -232,7 +232,11 @@ class CreateTagGroupDialog extends React.Component<Props, State> {
</FormControl>
</DialogContent>
<DialogActions>
- <Button onClick={this.props.onClose} color="primary">
+ <Button
+ data-tid="createTagGroupCancelButton"
+ onClick={this.props.onClose}
+ color="primary"
+ >
{i18n.t('core:cancel')}
</Button>
<Button
diff --git a/app/components/dialogs/EditEntryTagDialog.tsx b/app/components/dialogs/EditEntryTagDialog.tsx
index 7e2f32208..162444a82 100644
--- a/app/components/dialogs/EditEntryTagDialog.tsx
+++ b/app/components/dialogs/EditEntryTagDialog.tsx
@@ -221,8 +221,7 @@ function mapDispatchToProps(dispatch) {
);
}
-export default withMobileDialog()(
- withStyles(styles)(
- connect(mapStateToProps, mapDispatchToProps)(EditEntryTagDialog)
- )
-);
+export default connect(
+ mapStateToProps,
+ mapDispatchToProps
+)(withMobileDialog()(withStyles(styles)(EditEntryTagDialog)));
diff --git a/app/components/dialogs/ImportExportTagGroupsDialog.tsx b/app/components/dialogs/ImportExportTagGroupsDialog.tsx
index ed4bb656a..62804052e 100644
--- a/app/components/dialogs/ImportExportTagGroupsDialog.tsx
+++ b/app/components/dialogs/ImportExportTagGroupsDialog.tsx
@@ -182,6 +182,6 @@ const ImportExportTagGroupsDialog = (props: Props) => {
);
};
-export default withStyles(styles)(
- withMobileDialog()(ImportExportTagGroupsDialog)
+export default withMobileDialog()(
+ withStyles(styles)(ImportExportTagGroupsDialog)
);
diff --git a/app/components/dialogs/settings/SettingsGeneral.tsx b/app/components/dialogs/settings/SettingsGeneral.tsx
index ee9284d99..fad8913f9 100644
--- a/app/components/dialogs/settings/SettingsGeneral.tsx
+++ b/app/components/dialogs/settings/SettingsGeneral.tsx
@@ -16,7 +16,7 @@
*
*/
-import React from 'react';
+import React, { useState } from 'react';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import { withStyles } from '@material-ui/core/styles';
@@ -33,8 +33,7 @@ import { actions as SettingsActions, getSettings } from '-/reducers/settings';
import ColorPickerDialog from '../ColorPickerDialog';
import TransparentBackground from '../../TransparentBackground';
-const styles: any = (theme: any) => ({
- // const styles = theme => ({
+const styles: any = {
root: {
overflowX: 'hidden'
},
@@ -49,7 +48,7 @@ const styles: any = (theme: any) => ({
minHeight: 30,
border: '1px solid lightgray'
}
-});
+};
interface Props {
setTagColor: (tagColor: string) => void;
@@ -70,203 +69,186 @@ interface Props {
showResetSettings: (showDialog: boolean) => void;
}
-interface State {
- displayColorPicker: boolean;
- displayTextColorPicker: boolean;
- currentTheme?: any;
-}
-
-class SettingsGeneral extends React.Component<Props, State> {
- state = {
- displayColorPicker: false,
- displayTextColorPicker: false
- };
+const SettingsGeneral = (props: Props) => {
+ const [displayColorPicker, setDisplayColorPicker] = useState<boolean>(false);
+ const [displayTextColorPicker, setDisplayTextColorPicker] = useState<boolean>(
+ false
+ );
- toggleDefaultTagBackgroundColorPicker = () => {
- this.setState({ displayColorPicker: !this.state.displayColorPicker });
+ const toggleDefaultTagBackgroundColorPicker = () => {
+ setDisplayColorPicker(!displayColorPicker);
};
- toggleDefaultTagTextColorPicker = () => {
- this.setState({
- displayTextColorPicker: !this.state.displayTextColorPicker
- });
+ const toggleDefaultTagTextColorPicker = () => {
+ setDisplayTextColorPicker(!displayTextColorPicker);
};
- handleChange = event => {
+ /* handleChange = event => {
this.setState({ currentTheme: event.target.value });
- };
+ }; */
- handleTagDelimiterChange = event => {
+ /* handleTagDelimiterChange = event => {
this.props.setTagDelimiter(event.target.value);
- };
+ }; */
- handleMaxSearchResult = event => {
- this.props.setMaxSearchResult(event.target.value);
+ const handleMaxSearchResult = event => {
+ props.setMaxSearchResult(event.target.value);
};
- render() {
- const { classes } = this.props;
+ const { classes } = props;
- return (
- <List className={classes.root}>
- <ListItem className={classes.listItem}>
- <ListItemText primary={i18n.t('core:interfaceLanguage')} />
- <Select
- data-tid="settingsSetLanguage"
- value={this.props.settings.interfaceLanguage}
- onChange={(event: any) =>
- this.props.setLanguage(event.target.value)
- }
- input={<Input id="languageSelector" />}
- >
- {this.props.settings.supportedLanguages.map(language => (
- <MenuItem key={language.iso} value={language.iso}>
- {language.title}
- </MenuItem>
- ))}
- </Select>
- </ListItem>
- <ListItem className={classes.listItem}>
- <ListItemText primary={i18n.t('core:themeSelector')} />
- <Select
- data-tid="settingsSetCurrentTheme"
- value={this.props.settings.currentTheme}
- onChange={(event: any) =>
- this.props.setCurrentTheme(event.target.value)
- }
- input={<Input id="themeSelector" />}
+ return (
+ <List className={classes.root}>
+ <ListItem className={classes.listItem}>
+ <ListItemText primary={i18n.t('core:interfaceLanguage')} />
+ <Select
+ data-tid="settingsSetLanguage"
+ value={props.settings.interfaceLanguage}
+ onChange={(event: any) => props.setLanguage(event.target.value)}
+ input={<Input id="languageSelector" />}
+ >
+ {props.settings.supportedLanguages.map(language => (
+ <MenuItem key={language.iso} value={language.iso}>
+ {language.title}
+ </MenuItem>
+ ))}
+ </Select>
+ </ListItem>
+ <ListItem className={classes.listItem}>
+ <ListItemText primary={i18n.t('core:themeSelector')} />
+ <Select
+ data-tid="settingsSetCurrentTheme"
+ value={props.settings.currentTheme}
+ onChange={(event: any) => props.setCurrentTheme(event.target.value)}
+ input={<Input id="themeSelector" />}
+ >
+ {props.settings.supportedThemes.map(theme => (
+ <MenuItem key={theme} value={theme}>
+ {theme}
+ </MenuItem>
+ ))}
+ </Select>
+ </ListItem>
+ <ListItem className={classes.listItem}>
+ <ListItemText primary={i18n.t('core:checkForNewVersionOnStartup')} />
+ <Switch
+ data-tid="settingsSetCheckForUpdates"
+ onClick={() =>
+ props.setCheckForUpdates(!props.settings.checkForUpdates)
+ }
+ checked={props.settings.checkForUpdates}
+ />
+ </ListItem>
+ <ListItem className={classes.listItem}>
+ <ListItemText primary={i18n.t('core:persistTagsInSidecarFile')} />
+ <Switch
+ data-tid="settingsSetPersistTagsInSidecarFile"
+ onClick={() =>
+ props.setPersistTagsInSidecarFile(
+ !props.settings.persistTagsInSidecarFile
+ )
+ }
+ checked={props.settings.persistTagsInSidecarFile}
+ />
+ </ListItem>
+ <ListItem className={classes.listItem}>
+ <ListItemText primary={i18n.t('core:addTagsToLibrary')} />
+ <Switch
+ data-tid="settingsSetAddTagsToLibrary"
+ onClick={() =>
+ props.setAddTagsToLibrary(!props.settings.addTagsToLibrary)
+ }
+ checked={props.settings.addTagsToLibrary}
+ />
+ </ListItem>
+ <ListItem className={classes.listItem}>
+ <ListItemText primary={i18n.t('core:useGenerateThumbnails')} />
+ <Switch
+ data-tid="settingsUseGenerateThumbnails"
+ onClick={() =>
+ props.setUseGenerateThumbnails(
+ !props.settings.useGenerateThumbnails
+ )
+ }
+ checked={props.settings.useGenerateThumbnails}
+ />
+ </ListItem>
+ <ListItem className={classes.listItem}>
+ <ListItemText primary={i18n.t('core:tagBackgroundColor')} />
+ <TransparentBackground>
+ <Button
+ data-tid="settingsToggleDefaultTagBackgroundColor"
+ className={classes.colorChooserButton}
+ size="small"
+ style={{
+ backgroundColor: props.settings.tagBackgroundColor
+ }}
+ onClick={toggleDefaultTagBackgroundColorPicker}
>
- {this.props.settings.supportedThemes.map(theme => (
- <MenuItem key={theme} value={theme}>
- {theme}
- </MenuItem>
- ))}
- </Select>
- </ListItem>
- <ListItem className={classes.listItem}>
- <ListItemText primary={i18n.t('core:checkForNewVersionOnStartup')} />
- <Switch
- data-tid="settingsSetCheckForUpdates"
- onClick={() =>
- this.props.setCheckForUpdates(
- !this.props.settings.checkForUpdates
- )
- }
- checked={this.props.settings.checkForUpdates}
- />
- </ListItem>
- <ListItem className={classes.listItem}>
- <ListItemText primary={i18n.t('core:persistTagsInSidecarFile')} />
- <Switch
- data-tid="settingsSetPersistTagsInSidecarFile"
- onClick={() =>
- this.props.setPersistTagsInSidecarFile(
- !this.props.settings.persistTagsInSidecarFile
- )
- }
- checked={this.props.settings.persistTagsInSidecarFile}
- />
- </ListItem>
- <ListItem className={classes.listItem}>
- <ListItemText primary={i18n.t('core:addTagsToLibrary')} />
- <Switch
- data-tid="settingsSetAddTagsToLibrary"
- onClick={() =>
- this.props.setAddTagsToLibrary(
- !this.props.settings.addTagsToLibrary
- )
- }
- checked={this.props.settings.addTagsToLibrary}
- />
- </ListItem>
- <ListItem className={classes.listItem}>
- <ListItemText primary={i18n.t('core:useGenerateThumbnails')} />
- <Switch
- data-tid="settingsUseGenerateThumbnails"
- onClick={() =>
- this.props.setUseGenerateThumbnails(
- !this.props.settings.useGenerateThumbnails
- )
- }
- checked={this.props.settings.useGenerateThumbnails}
- />
- </ListItem>
- <ListItem className={classes.listItem}>
- <ListItemText primary={i18n.t('core:tagBackgroundColor')} />
- <TransparentBackground>
- <Button
- data-tid="settingsToggleDefaultTagBackgroundColor"
- className={classes.colorChooserButton}
- size="small"
- style={{
- backgroundColor: this.props.settings.tagBackgroundColor
- }}
- onClick={this.toggleDefaultTagBackgroundColorPicker}
- >
- &nbsp;
- </Button>
- </TransparentBackground>
+ &nbsp;
+ </Button>
+ </TransparentBackground>
+ {displayColorPicker && (
<ColorPickerDialog
- open={this.state.displayColorPicker}
+ open={displayColorPicker}
setColor={color => {
- this.props.setTagColor(color);
+ props.setTagColor(color);
}}
- onClose={this.toggleDefaultTagBackgroundColorPicker}
- color={this.props.settings.tagBackgroundColor}
+ onClose={toggleDefaultTagBackgroundColorPicker}
+ color={props.settings.tagBackgroundColor}
/>
- </ListItem>
- <ListItem className={classes.listItem}>
- <ListItemText primary={i18n.t('core:tagForegroundColor')} />
- <TransparentBackground>
- <Button
- data-tid="settingsToggleDefaultTagForegroundColor"
- className={classes.colorChooserButton}
- size="small"
- style={{ backgroundColor: this.props.settings.tagTextColor }}
- onClick={this.toggleDefaultTagTextColorPicker}
- >
- &nbsp;
- </Button>
- </TransparentBackground>
+ )}
+ </ListItem>
+ <ListItem className={classes.listItem}>
+ <ListItemText primary={i18n.t('core:tagForegroundColor')} />
+ <TransparentBackground>
+ <Button
+ data-tid="settingsToggleDefaultTagForegroundColor"
+ className={classes.colorChooserButton}
+ size="small"
+ style={{ backgroundColor: props.settings.tagTextColor }}
+ onClick={toggleDefaultTagTextColorPicker}
+ >
+ &nbsp;
+ </Button>
+ </TransparentBackground>
+ {displayTextColorPicker && (
<ColorPickerDialog
- open={this.state.displayTextColorPicker}
+ open={displayTextColorPicker}
setColor={color => {
- this.props.setTagTextColor(color);
+ props.setTagTextColor(color);
}}
- onClose={this.toggleDefaultTagTextColorPicker}
- color={this.props.settings.tagTextColor}
- />
- </ListItem>
- <ListItem className={classes.listItem}>
- <ListItemText primary={i18n.t('core:useTrashCan')} />
- <Switch
- data-tid="settingsSetUseTrashCan"
- onClick={() =>
- this.props.setUseTrashCan(!this.props.settings.useTrashCan)
- }
- checked={this.props.settings.useTrashCan}
- />
- </ListItem>
- <ListItem className={classes.listItem}>
- <ListItemText primary={i18n.t('core:showUnixHiddenFiles')} />
- <Switch
- data-tid="settingsSetShowUnixHiddenEntries"
- onClick={this.props.toggleShowUnixHiddenEntries}
- checked={this.props.settings.showUnixHiddenEntries}
- />
- </ListItem>
- <ListItem className={classes.listItem}>
- <ListItemText primary="Enable mobile (small screen) mode" />
- <Switch
- data-tid="settingsSetDesktopMode"
- disabled={!(typeof window.ExtDisplayMode === 'undefined')}
- onClick={() =>
- this.props.setDesktopMode(!this.props.settings.desktopMode)
- }
- checked={!this.props.settings.desktopMode}
+ onClose={toggleDefaultTagTextColorPicker}
+ color={props.settings.tagTextColor}
/>
- </ListItem>
- {/* <ListItem className={classes.listItem}>
+ )}
+ </ListItem>
+ <ListItem className={classes.listItem}>
+ <ListItemText primary={i18n.t('core:useTrashCan')} />
+ <Switch
+ data-tid="settingsSetUseTrashCan"
+ onClick={() => props.setUseTrashCan(!props.settings.useTrashCan)}
+ checked={props.settings.useTrashCan}
+ />
+ </ListItem>
+ <ListItem className={classes.listItem}>
+ <ListItemText primary={i18n.t('core:showUnixHiddenFiles')} />
+ <Switch
+ data-tid="settingsSetShowUnixHiddenEntries"
+ onClick={props.toggleShowUnixHiddenEntries}
+ checked={props.settings.showUnixHiddenEntries}
+ />
+ </ListItem>
+ <ListItem className={classes.listItem}>
+ <ListItemText primary="Enable mobile (small screen) mode" />
+ <Switch
+ data-tid="settingsSetDesktopMode"
+ disabled={!(typeof window.ExtDisplayMode === 'undefined')}
+ onClick={() => props.setDesktopMode(!props.settings.desktopMode)}
+ checked={!props.settings.desktopMode}
+ />
+ </ListItem>
+ {/* <ListItem className={classes.listItem}>
<ListItemText style={{ maxWidth: '300px' }} primary={i18n.t('core:tagDelimiterChoose')} />
<Select
style={{ minWidth: '170px' }}
@@ -283,17 +265,17 @@ class SettingsGeneral extends React.Component<Props, State> {
<MenuItem value=",">{i18n.t('core:tagDelimiterComma')}</MenuItem>
</Select>
</ListItem> */}
- <ListItem className={classes.listItem}>
- <ListItemText primary={i18n.t('core:maxSearchResultChoose')} />
- <Input
- style={{ maxWidth: '100px' }}
- type="number"
- data-tid="settingsMaxSearchResult"
- value={this.props.settings.maxSearchResult}
- onChange={this.handleMaxSearchResult}
- />
- </ListItem>
- {/* <ListItem className={classes.listItem}>
+ <ListItem className={classes.listItem}>
+ <ListItemText primary={i18n.t('core:maxSearchResultChoose')} />
+ <Input
+ style={{ maxWidth: '100px' }}
+ type="number"
+ data-tid="settingsMaxSearchResult"
+ value={props.settings.maxSearchResult}
+ onChange={handleMaxSearchResult}
+ />
+ </ListItem>
+ {/* <ListItem className={classes.listItem}>
<ListItemText primary={i18n.t('core:coloredFileExtensionsEnabled')} />
<Switch
data-tid="settingsSetColoredFileExtension"
@@ -305,7 +287,7 @@ class SettingsGeneral extends React.Component<Props, State> {
checked={this.props.settings.coloredFileExtension}
/>
</ListItem> */}
- {/* <ListItem className={classes.listItem}>
+ {/* <ListItem className={classes.listItem}>
<ListItemText primary={i18n.t('core:loadLocationMetaData')} />
<Switch
data-tid="settingsSetLoadsLocationMetaData"
@@ -317,20 +299,19 @@ class SettingsGeneral extends React.Component<Props, State> {
checked={this.props.settings.loadsLocationMetaData}
/>
</ListItem> */}
- <ListItem className={classes.listItem}>
- <Button
- data-tid="resetSettingsTID"
- onClick={() => this.props.showResetSettings(true)}
- color="secondary"
- style={{ marginLeft: -7 }}
- >
- {i18n.t('core:resetSettings')}
- </Button>
- </ListItem>
- </List>
- );
- }
-}
+ <ListItem className={classes.listItem}>
+ <Button
+ data-tid="resetSettingsTID"
+ onClick={() => props.showResetSettings(true)}
+ color="secondary"
+ style={{ marginLeft: -7 }}
+ >
+ {i18n.t('core:resetSettings')}
+ </Button>
+ </ListItem>
+ </List>
+ );
+};
/*
<ListItem className={classes.listItem}>
diff --git a/app/components/menus/LocationContextMenu.tsx b/app/components/menus/LocationContextMenu.tsx
index 1a7a10ac8..3f9941821 100644
--- a/app/components/menus/LocationContextMenu.tsx
+++ b/app/components/menus/LocationContextMenu.tsx
@@ -173,7 +173,7 @@ const LocationContextMenu = (props: Props) => {
</ListItemIcon>
<ListItemText primary={i18n.t('core:showInFileManager')} />
</MenuItem>
- <MenuItem data-tid="removeLocation" onClick={closeLocation}>
+ <MenuItem data-tid="closeLocationTID" onClick={closeLocation}>
<ListItemIcon>
<CloseIcon />
</ListItemIcon>
diff --git a/app/containers/App.tsx b/app/containers/App.tsx
index 2cf3b3a9e..edb1ad49e 100644
--- a/app/containers/App.tsx
+++ b/app/containers/App.tsx
@@ -21,7 +21,7 @@ import { connect } from 'react-redux';
import { I18nextProvider } from 'react-i18next'; // as we build ourself via webpack
import { createMuiTheme, ThemeProvider } from '@material-ui/core/styles';
import i18n from '../services/i18n';
-import { getCurrentTheme } from '../reducers/settings';
+import { getCurrentTheme } from '-/reducers/settings';
// import AppOnBoarding from '../components/AppOnboarding';
import AppConfig from '-/config';
diff --git a/app/containers/MainPage.tsx b/app/containers/MainPage.tsx
index e27ce4d91..727d93369 100644
--- a/app/containers/MainPage.tsx
+++ b/app/containers/MainPage.tsx
@@ -16,7 +16,7 @@
*
*/
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import { withStyles } from '@material-ui/core/styles';
@@ -319,9 +319,13 @@ if (window.ExtDefaultVerticalPanel === 'none') {
} */
const MainPage = (props: Props) => {
- const [selectedDirectoryPath, setSelectedDirectoryPath] = useState<string>(
+ /* const [selectedDirectoryPath, setSelectedDirectoryPath] = useState<string>(
''
- );
+ ); */
+ const selectedDirectoryPath = useRef<string>('');
+ const setSelectedDirectoryPath = (path: string) => {
+ selectedDirectoryPath.current = path;
+ };
/* const [isManagementPanelVisible, setManagementPanelVisible] = useState<
boolean
>(window.ExtDefaultVerticalPanel !== 'none' && !props.isEntryInFullWidth); */
@@ -606,7 +610,7 @@ const MainPage = (props: Props) => {
chooseDirectoryPath={currentPath =>
setSelectedDirectoryPath(currentPath)
}
- selectedDirectoryPath={selectedDirectoryPath || directoryPath}
+ selectedDirectoryPath={selectedDirectoryPath.current || directoryPath}
/>
)}
{props.isUploadProgressDialogOpened && (
@@ -631,7 +635,7 @@ const MainPage = (props: Props) => {
{props.isCreateFileDialogOpened && (
<CreateFileDialog
open={props.isCreateFileDialogOpened}
- selectedDirectoryPath={selectedDirectoryPath || directoryPath}
+ selectedDirectoryPath={selectedDirectoryPath.current || directoryPath}
chooseDirectoryPath={currentPath =>
setSelectedDirectoryPath(currentPath)
}
diff --git a/app/reducers/app.ts b/app/reducers/app.ts
index ebf87c84e..7b3bcda1b 100644
--- a/app/reducers/app.ts
+++ b/app/reducers/app.ts
@@ -1765,7 +1765,7 @@ export const actions = {
.catch(() =>
dispatch(
actions.showNotification(
- i18n.t('core:Invalid link'),
+ i18n.t('core:invalidLink'),
'warning',
true
)
diff --git a/package.json b/package.json
index d0e25bd15..6abe83901 100644
--- a/package.json
+++ b/package.json
@@ -145,6 +145,8 @@
"@types/react-redux": "^6.0.12",
"@types/react-router-dom": "^4.3.1",
"@types/redux-logger": "^3.0.6",
+ "@wdio/junit-reporter": "^6.11.0",
+ "@wdio/spec-reporter": "^6.11.0",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-jest": "^26.6.3",
@@ -218,6 +220,7 @@
"ts-loader": "^6.2.1",
"typescript": "3.7.4",
"url-loader": "^3.0.0",
+ "wdio-image-comparison-service": "^2.0.0",
"webpack": "^4.43.0",
"webpack-bundle-analyzer": "^3.8.0",
"webpack-cli": "^3.3.12",
@@ -273,7 +276,6 @@
"react-hotkeys": "^2.0.0",
"react-i18next": "^4.6.1",
"react-image-gallery": "^1.0.8",
- "react-joyride": "^2.0.0-11",
"react-leaflet": "^2.8.0",
"react-redux": "^5.0.7",
"react-router": "^4.3.1",
diff --git a/tests/e2e/clearstorage.helpers.js b/tests/e2e/clearstorage.helpers.js
index d4a90adc1..be02444ce 100644
--- a/tests/e2e/clearstorage.helpers.js
+++ b/tests/e2e/clearstorage.helpers.js
@@ -1,16 +1,14 @@
import { clickOn } from './general.helpers';
export async function clearStorage() {
- if (!global.isWeb) {
- await global.client.pause(500);
- await clickOn('[data-tid=settings]');
- // const settingsDialog = await global.client.$('[data-tid=settingsDialog]');
- // await settingsDialog.waitForDisplayed();
- // await settingsDialog.click();
- await global.client.pause(500);
- await clickOn('[data-tid=resetSettingsTID]');
- await clickOn('[data-tid=confirmResetSettingsDialogTID]');
- return true;
- }
- return false;
+ await global.client.pause(500);
+ await clickOn('[data-tid=settings]');
+ //await clickOn('[data-tid=settings]');
+ // const settingsDialog = await global.client.$('[data-tid=settingsDialog]');
+ // await settingsDialog.waitForDisplayed();
+ // await settingsDialog.click();
+ await global.client.pause(500);
+ await clickOn('[data-tid=resetSettingsTID]');
+ await clickOn('[data-tid=confirmResetSettingsDialogTID]');
+ return true;
}
diff --git a/tests/e2e/fileopener.e2e.js b/tests/e2e/fileopener.e2e.js
index 6d9e49810..9518a06fd 100644
--- a/tests/e2e/fileopener.e2e.js
+++ b/tests/e2e/fileopener.e2e.js
@@ -27,7 +27,7 @@ import {
perspectiveGridTable
} from './test-utils.spec';
-describe('TST08 - File / folder properties', () => {
+describe('TST08 - File folder properties', () => {
beforeEach(async () => {
if (global.isMinio) {
await createMinioLocation('', defaultLocationName, true);
@@ -40,7 +40,7 @@ describe('TST08 - File / folder properties', () => {
await closeFileProperties();
});
- it('TST0801 - Arrow keys select next/prev file (keybindings) [TST0801,web,minio,electron]', async () => {
+ it('TST0801 - Arrow keys select next prev file (keybindings) [TST0801,web,minio,electron]', async () => {
const firstFileName = await getGridFileName(0);
// open fileProperties
diff --git a/tests/e2e/general.helpers.js b/tests/e2e/general.helpers.js
index becf4f120..88888b71b 100644
--- a/tests/e2e/general.helpers.js
+++ b/tests/e2e/general.helpers.js
@@ -18,8 +18,8 @@ export async function clickOn(selector, options = {}) {
const element = await global.client.$(selector);
await element.waitUntil(
async function() {
- // const displayed = await this.isDisplayed();
- const displayed = await this.isDisplayedInViewport();
+ const displayed = await this.isDisplayed();
+ // const displayed = await this.isDisplayedInViewport();
return displayed === true;
},
{
@@ -27,6 +27,8 @@ export async function clickOn(selector, options = {}) {
timeoutMsg: 'clickOn selector ' + selector + ' to exist after 5s'
}
);
+ //await element.scrollIntoView();
+ //await element.moveTo(selector);
await element.click(options);
}
@@ -202,7 +204,7 @@ export async function getGridFileName(fileIndex) {
return fileName + '.' + fileExt.toLowerCase();
}
} catch (e) {
- console.log("Can't find getGridFileName:" + fileIndex);
+ console.log("Can't find getGridFileName:" + fileIndex, e);
}
return undefined;
}
@@ -310,6 +312,54 @@ export async function selectAllFiles(classNotSelected) {
);
}
+/**
+ * TODO holdDownKey + click not work:
+ * @param arrIndex
+ * @returns {Promise<[]>}
+ */
+export async function selectFiles(arrIndex = []) {
+ // console.debug(JSON.stringify(await global.client.status()));
+
+ const filesList = await global.client.$$(perspectiveGridTable + firstFile);
+ const arrElements = [];
+ //await global.client.keys('Shift');
+ await holdDownKey('\uE008');
+ for (let i = 0; i < arrIndex.length; i++) {
+ const index =
+ arrIndex[i] < 0 ? filesList.length + arrIndex[i] : arrIndex[i];
+
+ // await holdDownKey('\uE008');
+ filesList[index].click();
+ //await global.client.keys('Shift');
+ //await releaseKey('\uE008');
+ // await global.client.releaseActions();
+ arrElements.push(filesList[index]);
+ }
+ await releaseKey('\uE008');
+ await global.client.releaseActions();
+ return arrElements;
+}
+
+export async function holdDownKey(character) {
+ await global.client.performActions([
+ {
+ type: 'key',
+ id: 'keyboard',
+ actions: [{ type: 'keyDown', value: character }]
+ }
+ ]);
+}
+
+export async function releaseKey(character) {
+ await global.client.performActions([
+ {
+ type: 'key',
+ id: 'keyboard',
+ actions: [{ type: 'keyUp', value: character }]
+ }
+ ]);
+}
+
export async function extractTags(selectorElement) {
const arrTags = [];
const tags = await selectorElement.$('#gridCellTags');
diff --git a/tests/e2e/hook.js b/tests/e2e/hook.js
index 991adcdc2..8fb22b3fb 100644
--- a/tests/e2e/hook.js
+++ b/tests/e2e/hook.js
@@ -28,12 +28,19 @@ export async function clearLocalStorage() {
global.app.webContents.reload();
}*/
if (global.isWeb) {
+ //clearAllURLParams && clears everything in localStorage
+ await global.client.execute(
+ "window.history.pushState('', document.title, window.location.pathname);localStorage.clear();"
+ );
// global.client.executeScript('window.localStorage.clear()');
// global.client.clearLocalStorage();
// window.localStorage.clear();
- global.client.refresh();
+ //await global.client.reloadSession();
+ await global.client.refresh();
} else {
- await global.app.webContents.executeJavaScript('localStorage.clear()');
+ await global.app.webContents.executeJavaScript(
+ "window.history.pushState('', document.title, window.location.pathname);localStorage.clear()"
+ );
global.app.webContents.reload();
}
// browser.clearLocalStorage();
@@ -43,6 +50,7 @@ export async function clearLocalStorage() {
export async function startSpectronApp() {
if (global.isWeb) {
+ //require('scripts/wdio.conf');
const webdriverio = require('webdriverio');
// https://webdriver.io/docs/configurationfile.html
let options = {
@@ -50,13 +58,37 @@ export async function startSpectronApp() {
port: 9515, // "9515" is the port opened by chrome driver.
capabilities: {
browserName: 'chrome',
+ 'goog:chromeOptions': {
+ w3c: true,
+ args: [
+ '--no-sandbox',
+ '--window-size=1920,1080',
+ '--disable-dev-shm-usage'
+ ]
+ },
timeouts: {
script: 60000
}
},
+ // Warns when a deprecated command is used
+ deprecationWarnings: true,
+ // If you only want to run your tests until a specific amount of tests have failed use
+ // bail (default is 0 - don't bail, run all tests).
+ bail: 0,
+ reporters: ['spec'],
+ /* afterTest: [async function(
+ test,
+ context,
+ { error, result, duration, passed, retries }
+ ) => {
+ await takeScreenshot();
+ await clearLocalStorage();
+ }], */
waitforTimeout: 5000,
+ maxInstances: 1,
// logLevel: 'debug'
- logLevel: 'silent'
+ logLevel: 'silent',
+ coloredLogs: true
};
if (global.isHeadlessChrome) {
options = {
@@ -67,7 +99,14 @@ export async function startSpectronApp() {
// binary: electronPath, // Path to your Electron binary.
// to run chrome headless the following flags are required
// (see https://developers.google.com/web/updates/2017/04/headless-chrome)
- args: ['--headless', '--disable-gpu']
+ // args: ['--headless', '--disable-gpu']
+ args: [
+ '--headless',
+ // '--disable-gpu',
+ '--no-sandbox',
+ '--window-size=1920,1080',
+ '--disable-dev-shm-usage'
+ ]
},
timeouts: {
script: 60000
@@ -88,6 +127,7 @@ export async function startSpectronApp() {
*!/
// .timeouts('implicit', 5000)
.timeouts('pageLoad', 30000);*/
+ setWdioImageComparisonService(global.client);
await global.client.url('http://localhost:8000');
} else {
@@ -104,6 +144,26 @@ export async function startSpectronApp() {
}
}
+function setWdioImageComparisonService(browser) {
+ global.browser = browser;
+ const WdioImageComparisonService = require('wdio-image-comparison-service')
+ .default;
+ let wdioImageComparisonService = new WdioImageComparisonService({
+ baselineFolder: pathLib.join(__dirname, '../test-pages/Baseline/'),
+ formatImageName: '{tag}-{logName}-{width}x{height}',
+ screenshotPath: pathLib.join(__dirname, '../test-pages/'),
+ savePerInstance: true,
+ autoSaveBaseline: true,
+ blockOutStatusBar: true,
+ blockOutToolBar: true
+ });
+ // wdioImageComparisonService.defaultOptions.autoSaveBaseline = true;
+ browser.defaultOptions = wdioImageComparisonService.defaultOptions;
+ browser.folders = wdioImageComparisonService.folders;
+
+ wdioImageComparisonService.before(browser.capabilities);
+}
+
export async function stopSpectronApp() {
if (global.app && global.app.isRunning()) {
// await clearLocalStorage();
@@ -131,6 +191,37 @@ export function testDataRefresh() {
fse.copySync(src, newPath, { overwrite: true });
}
+export async function takeScreenshot(name = expect.getState().currentTestName) {
+ // if (jasmine.currentTest.failedExpectations.length > 0) {
+ if (global.isWeb) {
+ await global.client.saveFullPageScreen(`${name}`, {
+ fullPageScrollTimeout: '1500'
+ });
+ } else {
+ // await global.client.takeScreenshot();
+ const filename = `${name}.png`; // -${new Date().toISOString()}
+ //.replace(/\s/g, '_')
+ //.replace(/:/g, '')
+ //.replace(/\*/g, '')
+ //.replace(/-/g, '');
+ const imageBuffer = await global.app.browserWindow.capturePage();
+ const fs = require('fs-extra');
+ const path = pathLib.resolve(__dirname, 'test-pages', filename);
+ fs.outputFile(path, imageBuffer, 'base64');
+ /*global.app.webContents
+ .savePage(
+ pathLib.resolve(__dirname, 'test-pages', filename),
+ 'HTMLComplete'
+ )
+ .then(function() {
+ console.log('page saved');
+ })
+ .catch(function(error) {
+ console.error('saving page failed', error.message);
+ });*/
+ }
+}
+
// the path the electron app, that will be tested
/* let testPath = '../tsn/app'; // '../repo/app';
if (global.isWin) {
diff --git a/tests/e2e/location.helpers.js b/tests/e2e/location.helpers.js
index cbb442bfc..291fdfb9d 100644
--- a/tests/e2e/location.helpers.js
+++ b/tests/e2e/location.helpers.js
@@ -95,6 +95,17 @@ export async function openLocationMenu(locationName) {
await clickOn('[data-tid=locationMoreButton_' + locationName + ']');
}
+export async function closeLocation(locationName) {
+ const locationSelector = '[data-tid=locationMoreButton_' + locationName + ']';
+ const element = await global.client.$(locationSelector);
+ if (!(await element.isDisplayed())) {
+ await clickOn('[data-tid=locationManagerPanel]');
+ }
+ await global.client.pause(500);
+ await clickOn(locationSelector);
+ await clickOn('[data-tid=closeLocationTID]');
+}
+
/**
* @deprecated use await clickOn('[data-tid=location_' + defaultLocationName + ']');
* @param locationName
diff --git a/tests/e2e/perspective-grid-right-button.e2e.js b/tests/e2e/perspective-grid-right-button.e2e.js
new file mode 100644
index 000000000..2225cb832
--- /dev/null
+++ b/tests/e2e/perspective-grid-right-button.e2e.js
@@ -0,0 +1,409 @@
+/*
+ * Copyright (c) 2016-present - TagSpaces UG (Haftungsbeschraenkt). All rights reserved.
+ */
+import {
+ createLocation,
+ defaultLocationPath,
+ defaultLocationName,
+ closeFileProperties,
+ getFirstFileName,
+ renameFirstFile,
+ deleteFirstFile,
+ createMinioLocation,
+ closeLocation
+} from './location.helpers';
+import { searchEngine } from './search.spec';
+import {
+ openContextEntryMenu,
+ perspectiveGridTable,
+ firstFile,
+ toContainTID,
+ firstFolder
+} from './test-utils.spec';
+import {
+ addInputKeys,
+ clickOn,
+ createNewDirectory,
+ createTxtFile,
+ doubleClickOn,
+ expectElementExist,
+ expectTagsExist,
+ getGridCellClass,
+ getGridFileName,
+ removeTagFromTagMenu,
+ selectAllFiles,
+ selectorFile,
+ selectorFolder,
+ setInputKeys,
+ setSettings,
+ showFilesWithTag,
+ waitForNotification
+} from './general.helpers';
+import { AddRemoveTagsToSelectedFiles } from './perspective-grid.helpers';
+
+const testTagName = 'test-tag'; // TODO fix camelCase tag name
+const newFileName = 'newFileName.txt';
+
+// Test the functionality of the right button on a file on a grid perspective table
+// Scenarios for right button on a file
+describe('TST50** - Right button on a file', () => {
+ beforeEach(async () => {
+ if (global.isMinio) {
+ await createMinioLocation('', defaultLocationName, true);
+ } else {
+ await createLocation(defaultLocationPath, defaultLocationName, true);
+ }
+ // openLocation
+ await clickOn('[data-tid=location_' + defaultLocationName + ']');
+ // If its have opened file
+ await closeFileProperties();
+ });
+
+ /*afterEach(async () => {
+ if (global.isMinio || global.isWeb) {
+ await closeLocation(defaultLocationName);
+ }
+ });*/
+
+ test('TST5016 - Open file [TST5016,web,minio,electron]', async () => {
+ //await searchEngine('bmp');
+ await searchEngine('txt');
+ await openContextEntryMenu(
+ perspectiveGridTable + firstFile,
+ 'fileMenuOpenFile'
+ );
+ // Check if the file is opened
+ // await delay(1500);
+ const webViewer = await expectElementExist('#FileViewer');
+ // const webViewer = await global.client.$('#FileViewer');
+ // await webViewer.waitForDisplayed();
+ //await delay(5000);
+ // expect(await webViewer.isDisplayed()).toBe(true);
+ await global.client.switchToFrame(webViewer);
+ await global.client.pause(500);
+ const iframeBody = await global.client.$('body');
+ await iframeBody.waitForDisplayed();
+ const bodyTxt = await iframeBody.getText();
+
+ await global.client.switchToParentFrame();
+ expect(toContainTID(bodyTxt)).toBe(true);
+ });
+
+ test('TST5017 - Rename file [TST5017,web,minio,electron]', async () => {
+ await searchEngine('txt');
+ const oldName = await getFirstFileName();
+ await renameFirstFile(newFileName);
+ const fileNameTxt = await getFirstFileName();
+ expect(fileNameTxt).toContain(newFileName);
+ //rename back to oldName
+ await renameFirstFile(oldName);
+ const fileName = await getFirstFileName();
+ expect(fileName).toContain(oldName);
+ });
+
+ test('TST5018 - Delete file [TST5018,web,minio,electron]', async () => {
+ await createTxtFile();
+ await searchEngine('note'); //select new created file - note[date_created].txt
+ /*let firstFileName = await getGridFileName(0);
+ expect(firstFileName).toBe('note.txt');*/
+
+ await expectElementExist(selectorFile, true);
+
+ await deleteFirstFile();
+ await expectElementExist(selectorFile, false);
+ /*firstFileName = await getGridFileName(0);
+ expect(firstFileName).toBe(undefined);*/
+ });
+
+ test('TST5019 - Rename tag in file [TST5019,web,minio,electron]', async () => {
+ await searchEngine('desktop');
+ // Select file
+ await clickOn(perspectiveGridTable + firstFile);
+ await AddRemoveTagsToSelectedFiles([testTagName], true);
+ let file = await global.client.$(perspectiveGridTable + firstFile);
+ await expectTagsExist(file, [testTagName], true);
+
+ /*await AddRemoveTagsToFile(perspectiveGridTable + firstFile, [testTagName], {
+ add: true
+ });*/
+ await clickOn('[data-tid=tagMoreButton_' + testTagName + ']');
+ await global.client.pause(500);
+ await clickOn('[data-tid=editTagDialogMenu]');
+ await setInputKeys('editTagEntryDialog_input', testTagName + '-edited');
+ await clickOn('[data-tid=confirmEditTagEntryDialog]');
+ await waitForNotification();
+
+ file = await global.client.$(perspectiveGridTable + firstFile);
+ await expectTagsExist(file, [testTagName + '-edited'], true);
+
+ //cleanup
+ await clickOn(perspectiveGridTable + firstFile);
+ await AddRemoveTagsToSelectedFiles([testTagName + '-edited'], false);
+ file = await global.client.$(perspectiveGridTable + firstFile);
+ await expectTagsExist(file, [testTagName + '-edited'], false);
+ });
+
+ test('TST5023 - Remove tag from file (tag menu) [TST5023,web,minio,electron]', async () => {
+ await searchEngine('desktop');
+ // select file
+ await clickOn(perspectiveGridTable + firstFile);
+ await AddRemoveTagsToSelectedFiles([testTagName], true);
+ let file = await global.client.$(perspectiveGridTable + firstFile);
+ await expectTagsExist(file, [testTagName], true);
+
+ await removeTagFromTagMenu(testTagName);
+ await global.client.pause(500);
+
+ file = await global.client.$(perspectiveGridTable + firstFile);
+ await expectTagsExist(file, [testTagName], false);
+ });
+
+ test('TST5024 - Show files with a given tag (tag menu) [TST5024,web,minio,electron]', async () => {
+ const classNotSelected = await getGridCellClass(0);
+ const classSelected = await selectAllFiles(classNotSelected);
+ expect(classNotSelected).not.toBe(classSelected);
+
+ await AddRemoveTagsToSelectedFiles([testTagName], true);
+ await showFilesWithTag(testTagName);
+
+ const filesList = await global.client.$$(perspectiveGridTable + firstFile);
+ for (let i = 0; i < filesList.length; i++) {
+ await expectTagsExist(filesList[i], [testTagName], true);
+ }
+
+ // cleanup
+ await selectAllFiles(classNotSelected);
+ expect(classNotSelected).not.toBe(classSelected);
+ await AddRemoveTagsToSelectedFiles([testTagName], false);
+ });
+
+ /**
+ * TODO web sometimes: stale element reference: stale element reference: element is not attached to the page document
+ * TODO minio sometimes: stale element reference: stale element reference: element is not attached to the page document
+ */
+ test('TST5025 - Add - Remove tags (file menu) [TST5025,electron]', async () => {
+ await searchEngine('desktop');
+ const tags = [testTagName, testTagName + '2'];
+ // select file
+ await clickOn(perspectiveGridTable + firstFile);
+ await AddRemoveTagsToSelectedFiles(tags, true);
+
+ const file = await global.client.$(perspectiveGridTable + firstFile);
+ await expectTagsExist(file, tags, true);
+
+ //cleanup
+ await clickOn(perspectiveGridTable + firstFile);
+ await AddRemoveTagsToSelectedFiles(tags, false);
+ });
+
+ test('TST5026 - Open file natively [electron]', async () => {
+ if (!global.isMinio) {
+ // Open file natively option is missing for Minio Location
+ await searchEngine('txt');
+ await openContextEntryMenu(
+ perspectiveGridTable + firstFile,
+ 'fileMenuOpenFileNatively'
+ );
+ }
+ // check parent directory
+ });
+
+ test('TST5027 - Open containing folder [electron,web]', async () => {
+ if (!global.isMinio) {
+ // Show in File Manager option is missing for Minio Location
+ await searchEngine('txt');
+ await openContextEntryMenu(
+ perspectiveGridTable + firstFile,
+ 'fileMenuOpenContainingFolder'
+ );
+ }
+ // check parent directory
+ });
+
+ /*test('TST50** - Add / Remove tags', async () => {
+ await searchEngine('txt');
+ await openContextEntryMenu(
+ perspectiveGridTable + firstFile,
+ 'fileMenuAddRemoveTags'
+ );
+ //TODO cannot find cancelTagsMultipleEntries ??
+ await delay(500);
+ const cancelButton = await global.client
+ .$('[data-tid=cancelTagsMultipleEntries]');
+ await cancelButton.waitForDisplayed();
+ await cancelButton.click();
+ });*/
+
+ /**
+ * TODO github minio (expected selector to exist=false after 5s)
+ */
+ test('TST5028 - Move - Copy file (file menu) [TST5028,electron]', async () => {
+ // Move file in child folder
+ await searchEngine('eml');
+ await openContextEntryMenu(
+ perspectiveGridTable + firstFile,
+ 'fileMenuMoveCopyFile'
+ );
+ await addInputKeys(
+ 'targetPathInput',
+ defaultLocationPath + '/empty_folder'
+ );
+
+ await clickOn('[data-tid=confirmMoveFiles]');
+ await waitForNotification();
+ await clickOn('#clearSearchID');
+ await global.client.pause(500);
+ await doubleClickOn(perspectiveGridTable + firstFolder);
+ await searchEngine('eml', { reindexing: true }); // TODO temp fix: https://trello.com/c/ZfcGGvOM/527-moved-files-is-not-indexing-not-found-in-search
+ let firstFileName = await getGridFileName(0);
+ expect(firstFileName).toBe('sample.eml');
+
+ //Copy file in parent directory
+ await openContextEntryMenu(
+ perspectiveGridTable + firstFile,
+ 'fileMenuMoveCopyFile'
+ );
+ await addInputKeys('targetPathInput', defaultLocationPath);
+ await clickOn('[data-tid=confirmCopyFiles]');
+ await waitForNotification();
+ await clickOn('#clearSearchID');
+ await clickOn('[data-tid=gridPerspectiveOnBackButton]');
+ await global.client.pause(500);
+ await searchEngine('eml');
+ firstFileName = await getGridFileName(0);
+ expect(firstFileName).toBe('sample.eml');
+
+ // cleanup
+ await deleteFirstFile();
+ await expectElementExist(selectorFile, false);
+ });
+
+ test('TST5033 - Open directory (directory menu) [TST5033,web,minio,electron]', async () => {
+ // open empty_folder
+ await openContextEntryMenu(
+ perspectiveGridTable + firstFolder,
+ 'openDirectory'
+ );
+ const firstFileName = await getGridFileName(0);
+ expect(firstFileName).toBe(undefined); //'sample.eml');
+ });
+
+ /**
+ * minio not support rename folder
+ */
+ test('TST5034 - Rename directory (directory menu) [TST5034,electron]', async () => {
+ const newDirName = 'new_dir_name';
+ await openContextEntryMenu(
+ perspectiveGridTable + firstFolder,
+ 'renameDirectory'
+ );
+ const oldDirName = await setInputKeys(
+ 'renameDirectoryDialogInput',
+ newDirName
+ );
+ await clickOn('[data-tid=confirmRenameDirectory]');
+ await waitForNotification();
+
+ //turn dir name back
+ await openContextEntryMenu(
+ perspectiveGridTable + firstFolder,
+ 'renameDirectory'
+ );
+ const renamedDir = await setInputKeys(
+ 'renameDirectoryDialogInput',
+ oldDirName
+ );
+ await clickOn('[data-tid=confirmRenameDirectory]');
+ await waitForNotification();
+ expect(renamedDir).toBe(newDirName);
+ });
+
+ /**
+ * delete dir is not supported on minio
+ */
+ test('TST5035 - Delete directory (directory menu) [TST5035,electron]', async () => {
+ await setSettings('[data-tid=settingsSetUseTrashCan]');
+ await global.client.pause(500);
+ const testFolder = await createNewDirectory('aaa');
+
+ await openContextEntryMenu(
+ perspectiveGridTable + firstFolder,
+ 'deleteDirectory'
+ );
+ await clickOn('[data-tid=confirmDeleteDirectoryDialog]');
+
+ await expectElementExist(
+ '[data-tid=fsEntryName_' + testFolder + ']',
+ false
+ );
+ });
+
+ test('TST5036 - Open directory properties (directory menu) [TST5036,web,minio,electron]', async () => {
+ await openContextEntryMenu(
+ perspectiveGridTable + firstFolder,
+ 'showProperties'
+ );
+ await expectElementExist('[data-tid=fileNameProperties]', true);
+ });
+
+ test('TST5037 - Show sub folders [TST5037,web,minio,electron]', async () => {
+ //open Option menu
+ await clickOn('[data-tid=gridPerspectiveOptionsMenu]');
+ //click on hide directories
+ await clickOn('[data-tid=gridPerspectiveToggleShowDirectories]');
+
+ //file
+ await expectElementExist(selectorFile, true);
+ //folder
+ await expectElementExist(selectorFolder, false);
+
+ if (global.isWeb) {
+ await global.client.pause(500);
+ }
+ // show sub folder in the grid perspective
+ await clickOn('[data-tid=gridPerspectiveOptionsMenu]');
+ await clickOn('[data-tid=gridPerspectiveToggleShowDirectories]');
+
+ //file
+ await expectElementExist(selectorFile, true);
+ //folder
+ await expectElementExist(selectorFolder, true);
+ });
+
+ test('TST5038 - Return directory back [TST5038,web,minio,electron]', async () => {
+ await expectElementExist(selectorFolder);
+
+ //Open folder
+ await doubleClickOn(selectorFolder);
+
+ await expectElementExist(selectorFolder, false);
+ await clickOn('[data-tid=gridPerspectiveOnBackButton]');
+ await expectElementExist(selectorFolder);
+ });
+
+ test('TST5039 - Changing the Perspective View [TST5039,web,minio,electron]', async () => {
+ const grid = await global.client.$('[data-tid=perspectiveGridFileTable]');
+ let gridStyle = await grid.getAttribute('style');
+
+ expect(gridStyle).toContain(
+ 'grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));'
+ );
+
+ await clickOn('[data-tid=gridPerspectiveSwitchLayoutToRow]');
+ // check perspective view
+
+ gridStyle = await grid.getAttribute('style');
+ expect(gridStyle).toContain('grid-template-columns: none;');
+ });
+
+ test('TST5040 - Create file [TST5040,web,minio,electron]', async () => {
+ await createTxtFile();
+ await searchEngine('note');
+ await expectElementExist(selectorFile, true);
+
+ //cleanup
+ //await deleteFirstFile();
+ //const firstFileName = await getGridFileName(0);
+ //expect(firstFileName).toBe(undefined);
+ });
+});
diff --git a/tests/e2e/perspective-grid.e2e.js b/tests/e2e/perspective-grid.e2e.js
index 002ab2bce..c6a604e21 100644
--- a/tests/e2e/perspective-grid.e2e.js
+++ b/tests/e2e/perspective-grid.e2e.js
@@ -6,23 +6,19 @@ import {
defaultLocationPath,
defaultLocationName,
closeFileProperties,
- getFirstFileName,
- renameFirstFile,
deleteFirstFile,
- createMinioLocation
+ createMinioLocation,
+ getFirstFileName
} from './location.helpers';
import { searchEngine } from './search.spec';
import {
- openContextEntryMenu,
perspectiveGridTable,
firstFile,
- toContainTID,
firstFolder
} from './test-utils.spec';
import {
addInputKeys,
clickOn,
- createNewDirectory,
createTxtFile,
doubleClickOn,
expectElementExist,
@@ -30,26 +26,20 @@ import {
extractTags,
getGridCellClass,
getGridFileName,
- removeTagFromTagMenu,
selectAllFiles,
selectorFile,
- selectorFolder,
- setInputKeys,
setSettings,
- showFilesWithTag,
waitForNotification
} from './general.helpers';
import { AddRemoveTagsToSelectedFiles } from './perspective-grid.helpers';
import { getPropertiesFileName } from './file.properties.helpers';
-const subFolderName = '/test-perspective-grid';
+/*const subFolderName = '/test-perspective-grid';
const subFolderContentExtractionPath =
defaultLocationPath + '/content-extraction';
const subFolderThumbnailsPath = defaultLocationPath + '/thumbnails';
-
-const testTagName = 'test-tag'; // TODO fix camelCase tag name
const testTestFilename = 'sample';
-const newFileName = 'newFileName.txt';
+*/
describe('TST50 - Perspective Grid', () => {
beforeEach(async () => {
@@ -90,16 +80,22 @@ describe('TST50 - Perspective Grid', () => {
await global.client.pause(500); // TODO
const firstFileName = await getGridFileName(0);
expect(firstFileName).toBe('sample_exif.jpg');
+ // asc/desc
+ await clickOn('[data-tid=gridPerspectiveSortMenu]');
+ await clickOn('[data-tid=gridPerspectiveSortByName]');
});
/**
* TODO web https://trello.com/c/b2isDaUc/533-switch-asc-desc-while-sort-by-options
*/
- test('TST10** - Sort by size [minio,electron]', async () => {
+ test('TST10** - Sort by size [web,minio,electron]', async () => {
await clickOn('[data-tid=gridPerspectiveSortBySize]');
await global.client.pause(500); // TODO
const firstFileName = await getGridFileName(0);
expect(firstFileName).toBe('sample.ogv');
+ // asc/desc
+ await clickOn('[data-tid=gridPerspectiveSortMenu]');
+ await clickOn('[data-tid=gridPerspectiveSortBySize]');
});
test('TST10** - Sort by date [web,minio,electron]', async () => {
@@ -111,6 +107,9 @@ describe('TST50 - Perspective Grid', () => {
let firstFileName = await getGridFileName(0);
expect(firstFileName).toBe('note.txt');
+ // asc/desc
+ await clickOn('[data-tid=gridPerspectiveSortMenu]');
+ await clickOn('[data-tid=gridPerspectiveSortByDate]');
//cleanup
await setSettings('[data-tid=settingsSetUseTrashCan]');
@@ -123,11 +122,14 @@ describe('TST50 - Perspective Grid', () => {
/**
* TODO web https://trello.com/c/b2isDaUc/533-switch-asc-desc-while-sort-by-options
*/
- test('TST10** - Sort by extension [minio,electron]', async () => {
+ test('TST10** - Sort by extension [web,minio,electron]', async () => {
await clickOn('[data-tid=gridPerspectiveSortByExt]');
await global.client.pause(1000); // TODO
const firstFileName = await getGridFileName(0);
expect(firstFileName).toBe('sample.zip');
+ // asc/desc
+ await clickOn('[data-tid=gridPerspectiveSortMenu]');
+ await clickOn('[data-tid=gridPerspectiveSortByExt]');
});
test('TST10** - Sort by tags [web,minio,electron]', async () => {
@@ -135,10 +137,13 @@ describe('TST50 - Perspective Grid', () => {
await global.client.pause(1000); // TODO
const firstFileName = await getGridFileName(0);
expect(firstFileName).toBe('sample_exif.jpg');
+ // asc/desc
+ await clickOn('[data-tid=gridPerspectiveSortMenu]');
+ await clickOn('[data-tid=gridPerspectiveSortByFirstTag]');
});
});
- test('TST5004 - Select/deselect all files [TST5004,web,minio,electron]', async () => {
+ test('TST5004 - Select-deselect all files [TST5004,web,minio,electron]', async () => {
const classNotSelected = await getGridCellClass(0);
const classSelected = await selectAllFiles(classNotSelected);
@@ -164,7 +169,7 @@ describe('TST50 - Perspective Grid', () => {
});
// This scenario includes "Add tags" && "Remove tags" to be fulfilled
- test('TST5005 - Add tags to the selected files [TST5005,electron]', async () => {
+ test('TST5005 - Add tags to the selected files [TST5005,web,minio,electron]', async () => {
const classNotSelected = await getGridCellClass(0);
const classSelected = await selectAllFiles(classNotSelected);
expect(classNotSelected).not.toBe(classSelected);
@@ -196,7 +201,7 @@ describe('TST50 - Perspective Grid', () => {
}*/
});
- test('TST5006 - Remove tags from selected files [TST5006, electron]', async () => {
+ test('TST5006 - Remove tags from selected files [TST5006,web,minio,electron]', async () => {
const classNotSelected = await getGridCellClass(0);
const classSelected = await selectAllFiles(classNotSelected);
expect(classNotSelected).not.toBe(classSelected);
@@ -224,7 +229,7 @@ describe('TST50 - Perspective Grid', () => {
}*/
});
- test('TST5007 - Remove all tags from selected files [TST5007, electron]', async () => {
+ test('TST5007 - Remove all tags from selected files [TST5007,web,minio,electron]', async () => {
const classNotSelected = await getGridCellClass(0);
const classSelected = await selectAllFiles(classNotSelected);
expect(classNotSelected).not.toBe(classSelected);
@@ -243,12 +248,13 @@ describe('TST50 - Perspective Grid', () => {
/**
* TODO copy file on minio failed with path: ./testdata-tmp/file-structure/supported-filestypes/empty_folder
+ * web cannot find bmp file
*/
test('TST5008 - Copy file [TST5008,electron]', async () => {
- await searchEngine('bmp');
+ const fileName = await getFirstFileName();
// select file
- await clickOn(perspectiveGridTable + firstFile);
+ await clickOn(selectorFile);
// open Copy File Dialog
await clickOn('[data-tid=gridPerspectiveCopySelectedFiles]');
await addInputKeys(
@@ -257,17 +263,19 @@ describe('TST50 - Perspective Grid', () => {
);
await clickOn('[data-tid=confirmCopyFiles]');
await waitForNotification();
- await clickOn('#clearSearchID');
- await global.client.pause(500);
+
await doubleClickOn(perspectiveGridTable + firstFolder);
const firstFileName = await getGridFileName(0);
- expect(firstFileName).toBe('sample.bmp');
+ expect(firstFileName).toBe(fileName);
// cleanup
await deleteFirstFile();
await expectElementExist(selectorFile, false);
});
- test('TST5010 - Move file [TST5010,web,minio,electron]', async () => {
+ /**
+ * TODO reindexing don't work in web
+ */
+ test('TST5010 - Move file [TST5010,minio,electron]', async () => {
await searchEngine('epub');
// select file
@@ -316,361 +324,3 @@ describe('TST50 - Perspective Grid', () => {
// Check if the directories are displayed
});*/
});
-
-// Test the functionality of the right button on a file on a grid perspective table
-// Scenarios for right button on a file
-describe('TST50** - Right button on a file', () => {
- beforeEach(async () => {
- if (global.isMinio) {
- await createMinioLocation('', defaultLocationName, true);
- } else {
- await createLocation(defaultLocationPath, defaultLocationName, true);
- }
- // openLocation
- await clickOn('[data-tid=location_' + defaultLocationName + ']');
- // If its have opened file
- await closeFileProperties();
- });
-
- test('TST5016 - Open file [TST5016,web,minio,electron]', async () => {
- //await searchEngine('bmp');
- await searchEngine('txt');
- await openContextEntryMenu(
- perspectiveGridTable + firstFile,
- 'fileMenuOpenFile'
- );
- // Check if the file is opened
- // await delay(1500);
- const webViewer = await expectElementExist('#FileViewer');
- // const webViewer = await global.client.$('#FileViewer');
- // await webViewer.waitForDisplayed();
- //await delay(5000);
- // expect(await webViewer.isDisplayed()).toBe(true);
- await global.client.switchToFrame(webViewer);
- await global.client.pause(500);
- const iframeBody = await global.client.$('body');
- await iframeBody.waitForDisplayed();
- const bodyTxt = await iframeBody.getText();
-
- await global.client.switchToParentFrame();
- expect(toContainTID(bodyTxt)).toBe(true);
- });
-
- test('TST5017 - Rename file [web,web,minio,electron]', async () => {
- await searchEngine('txt');
- const oldName = await getFirstFileName();
- await renameFirstFile(newFileName);
- const fileNameTxt = await getFirstFileName();
- expect(fileNameTxt).toContain(newFileName);
- //rename back to oldName
- await renameFirstFile(oldName);
- const fileName = await getFirstFileName();
- expect(fileName).toContain(oldName);
- });
-
- test('TST5018 - Delete file [TST5018,web,minio,electron]', async () => {
- await createTxtFile();
- await searchEngine('note'); //select new created file - note[date_created].txt
- /*let firstFileName = await getGridFileName(0);
- expect(firstFileName).toBe('note.txt');*/
-
- await expectElementExist(selectorFile, true);
-
- await deleteFirstFile();
- await expectElementExist(selectorFile, false);
- /*firstFileName = await getGridFileName(0);
- expect(firstFileName).toBe(undefined);*/
- });
-
- test('TST5019 - Rename tag in file [TST5019,web,minio,electron]', async () => {
- await searchEngine('desktop');
- // Select file
- await clickOn(perspectiveGridTable + firstFile);
- await AddRemoveTagsToSelectedFiles([testTagName], true);
- let file = await global.client.$(perspectiveGridTable + firstFile);
- await expectTagsExist(file, [testTagName], true);
-
- /*await AddRemoveTagsToFile(perspectiveGridTable + firstFile, [testTagName], {
- add: true
- });*/
- await clickOn('[data-tid=tagMoreButton_' + testTagName + ']');
- await global.client.pause(500);
- await clickOn('[data-tid=editTagDialogMenu]');
- await setInputKeys('editTagEntryDialog_input', testTagName + '-edited');
- await clickOn('[data-tid=confirmEditTagEntryDialog]');
- await waitForNotification();
-
- file = await global.client.$(perspectiveGridTable + firstFile);
- await expectTagsExist(file, [testTagName + '-edited'], true);
-
- //cleanup
- await clickOn(perspectiveGridTable + firstFile);
- await AddRemoveTagsToSelectedFiles([testTagName + '-edited'], false);
- file = await global.client.$(perspectiveGridTable + firstFile);
- await expectTagsExist(file, [testTagName + '-edited'], false);
- });
-
- test('TST5023 - Remove tag from file (tag menu) [TST5023,web,minio,electron]', async () => {
- await searchEngine('desktop');
- // select file
- await clickOn(perspectiveGridTable + firstFile);
- await AddRemoveTagsToSelectedFiles([testTagName], true);
- let file = await global.client.$(perspectiveGridTable + firstFile);
- await expectTagsExist(file, [testTagName], true);
-
- await removeTagFromTagMenu(testTagName);
- await global.client.pause(500);
-
- file = await global.client.$(perspectiveGridTable + firstFile);
- await expectTagsExist(file, [testTagName], false);
- });
-
- test('TST5024 - Show files with a given tag (tag menu) [TST5024,web,minio,electron]', async () => {
- const classNotSelected = await getGridCellClass(0);
- const classSelected = await selectAllFiles(classNotSelected);
- expect(classNotSelected).not.toBe(classSelected);
-
- await AddRemoveTagsToSelectedFiles([testTagName], true);
- await showFilesWithTag(testTagName);
-
- const filesList = await global.client.$$(perspectiveGridTable + firstFile);
- for (let i = 0; i < filesList.length; i++) {
- await expectTagsExist(filesList[i], [testTagName], true);
- }
-
- // cleanup
- await selectAllFiles(classNotSelected);
- expect(classNotSelected).not.toBe(classSelected);
- await AddRemoveTagsToSelectedFiles([testTagName], false);
- });
-
- /**
- * TODO web sometimes: stale element reference: stale element reference: element is not attached to the page document
- * TODO minio sometimes: stale element reference: stale element reference: element is not attached to the page document
- */
- test('TST5025 - Add / Remove tags (file menu) [TST5025,electron]', async () => {
- await searchEngine('desktop');
- const tags = [testTagName, testTagName + '2'];
- // select file
- await clickOn(perspectiveGridTable + firstFile);
- await AddRemoveTagsToSelectedFiles(tags, true);
-
- const file = await global.client.$(perspectiveGridTable + firstFile);
- await expectTagsExist(file, tags, true);
-
- //cleanup
- await clickOn(perspectiveGridTable + firstFile);
- await AddRemoveTagsToSelectedFiles(tags, false);
- });
-
- test('TST5026 - Open file natively [electron]', async () => {
- if (!global.isMinio) {
- // Open file natively option is missing for Minio Location
- await searchEngine('txt');
- await openContextEntryMenu(
- perspectiveGridTable + firstFile,
- 'fileMenuOpenFileNatively'
- );
- }
- // check parent directory
- });
-
- test('TST5027 - Open containing folder [electron,web]', async () => {
- if (!global.isMinio) {
- // Show in File Manager option is missing for Minio Location
- await searchEngine('txt');
- await openContextEntryMenu(
- perspectiveGridTable + firstFile,
- 'fileMenuOpenContainingFolder'
- );
- }
- // check parent directory
- });
-
- /*test('TST50** - Add / Remove tags', async () => {
- await searchEngine('txt');
- await openContextEntryMenu(
- perspectiveGridTable + firstFile,
- 'fileMenuAddRemoveTags'
- );
- //TODO cannot find cancelTagsMultipleEntries ??
- await delay(500);
- const cancelButton = await global.client
- .$('[data-tid=cancelTagsMultipleEntries]');
- await cancelButton.waitForDisplayed();
- await cancelButton.click();
- });*/
-
- /**
- * TODO github minio (expected selector to exist=false after 5s)
- */
- test('TST5028 - Move / Copy file (file menu) [TST5028,electron]', async () => {
- // Move file in child folder
- await searchEngine('eml');
- await openContextEntryMenu(
- perspectiveGridTable + firstFile,
- 'fileMenuMoveCopyFile'
- );
- await addInputKeys(
- 'targetPathInput',
- defaultLocationPath + '/empty_folder'
- );
-
- await clickOn('[data-tid=confirmMoveFiles]');
- await waitForNotification();
- await clickOn('#clearSearchID');
- await global.client.pause(500);
- await doubleClickOn(perspectiveGridTable + firstFolder);
- await searchEngine('eml', { reindexing: true }); // TODO temp fix: https://trello.com/c/ZfcGGvOM/527-moved-files-is-not-indexing-not-found-in-search
- let firstFileName = await getGridFileName(0);
- expect(firstFileName).toBe('sample.eml');
-
- //Copy file in parent directory
- await openContextEntryMenu(
- perspectiveGridTable + firstFile,
- 'fileMenuMoveCopyFile'
- );
- await addInputKeys('targetPathInput', defaultLocationPath);
- await clickOn('[data-tid=confirmCopyFiles]');
- await waitForNotification();
- await clickOn('#clearSearchID');
- await clickOn('[data-tid=gridPerspectiveOnBackButton]');
- await global.client.pause(500);
- await searchEngine('eml');
- firstFileName = await getGridFileName(0);
- expect(firstFileName).toBe('sample.eml');
-
- // cleanup
- await deleteFirstFile();
- await expectElementExist(selectorFile, false);
- });
-
- test('TST5033 - Open directory (directory menu) [TST5033,web,minio,electron]', async () => {
- // open empty_folder
- await openContextEntryMenu(
- perspectiveGridTable + firstFolder,
- 'openDirectory'
- );
- const firstFileName = await getGridFileName(0);
- expect(firstFileName).toBe(undefined); //'sample.eml');
- });
-
- /**
- * minio not support rename folder
- */
- test('TST5034 - Rename directory (directory menu) [TST5034,electron]', async () => {
- const newDirName = 'new_dir_name';
- await openContextEntryMenu(
- perspectiveGridTable + firstFolder,
- 'renameDirectory'
- );
- const oldDirName = await setInputKeys(
- 'renameDirectoryDialogInput',
- newDirName
- );
- await clickOn('[data-tid=confirmRenameDirectory]');
- await waitForNotification();
-
- //turn dir name back
- await openContextEntryMenu(
- perspectiveGridTable + firstFolder,
- 'renameDirectory'
- );
- const renamedDir = await setInputKeys(
- 'renameDirectoryDialogInput',
- oldDirName
- );
- await clickOn('[data-tid=confirmRenameDirectory]');
- await waitForNotification();
- expect(renamedDir).toBe(newDirName);
- });
-
- /**
- * delete dir is not supported on minio
- */
- test('TST5035 - Delete directory (directory menu) [TST5035,electron]', async () => {
- await setSettings('[data-tid=settingsSetUseTrashCan]');
- await global.client.pause(500);
- const testFolder = await createNewDirectory('aaa');
-
- await openContextEntryMenu(
- perspectiveGridTable + firstFolder,
- 'deleteDirectory'
- );
- await clickOn('[data-tid=confirmDeleteDirectoryDialog]');
-
- await expectElementExist(
- '[data-tid=fsEntryName_' + testFolder + ']',
- false
- );
- });
-
- test('TST5036 - Open directory properties (directory menu) [TST5036,web,minio,electron]', async () => {
- await openContextEntryMenu(
- perspectiveGridTable + firstFolder,
- 'showProperties'
- );
- await expectElementExist('[data-tid=fileNameProperties]', true);
- });
-
- test('TST5037 - Show sub folders [TST5037,web,minio,electron]', async () => {
- //open Option menu
- await clickOn('[data-tid=gridPerspectiveOptionsMenu]');
- //click on hide directories
- await clickOn('[data-tid=gridPerspectiveToggleShowDirectories]');
-
- //file
- await expectElementExist(selectorFile, true);
- //folder
- await expectElementExist(selectorFolder, false);
-
- if (global.isWeb) {
- await global.client.pause(500);
- }
- // show sub folder in the grid perspective
- await clickOn('[data-tid=gridPerspectiveOptionsMenu]');
- await clickOn('[data-tid=gridPerspectiveToggleShowDirectories]');
-
- //file
- await expectElementExist(selectorFile, true);
- //folder
- await expectElementExist(selectorFolder, true);
- });
-
- test('TST5038 - Return directory back [TST5038,web,minio,electron]', async () => {
- await expectElementExist(selectorFolder);
-
- //Open folder
- await doubleClickOn(selectorFolder);
-
- await expectElementExist(selectorFolder, false);
- await clickOn('[data-tid=gridPerspectiveOnBackButton]');
- await expectElementExist(selectorFolder);
- });
-
- test('TST5039 - Changing the Perspective View [TST5039,web,minio,electron]', async () => {
- const grid = await global.client.$('[data-tid=perspectiveGridFileTable]');
- let gridStyle = await grid.getAttribute('style');
-
- expect(gridStyle).toContain(
- 'grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));'
- );
-
- await clickOn('[data-tid=gridPerspectiveSwitchLayoutToRow]');
- // check perspective view
-
- gridStyle = await grid.getAttribute('style');
- expect(gridStyle).toContain('grid-template-columns: none;');
- });
-
- test('TST5040 - Create file [TST5040,web,minio,electron]', async () => {
- await createTxtFile();
- await searchEngine('note');
- await expectElementExist(selectorFile, true);
-
- //cleanup
- await deleteFirstFile();
- const firstFileName = await getGridFileName(0);
- expect(firstFileName).toBe(undefined);
- });
-});
diff --git a/tests/e2e/search.spec.js b/tests/e2e/search.spec.js
index 348bf0581..142feee83 100644
--- a/tests/e2e/search.spec.js
+++ b/tests/e2e/search.spec.js
@@ -45,7 +45,9 @@ export async function searchEngine(filename, options = {}) {
await clickOn('#searchButton');
}
await waitForNotification('TIDSearching');
- await global.client.pause(1500); //todo: for minio search is slow
+ if (!global.isElectron) {
+ await global.client.pause(1500); //todo: for minio search is slow
+ }
}
/*describe('TST06 - Test Search in file structure:', () => {
diff --git a/tests/e2e/tag.e2e.js b/tests/e2e/tag.e2e.js
index 27374c4cf..8971a221c 100644
--- a/tests/e2e/tag.e2e.js
+++ b/tests/e2e/tag.e2e.js
@@ -14,11 +14,19 @@ const testGroup = 'testGroupName';
const editedGroupName = 'testGroup';
export async function createTagGroup(tagGroupName) {
- await clickOn('[data-tid=tagLibraryMenu]');
- await clickOn('[data-tid=createNewTagGroup]');
+ const tagGroup = await global.client.$(
+ '[data-tid=tagLibraryMoreButton_' + testGroup + ']'
+ );
+ if (!(await tagGroup.isDisplayed())) {
+ await clickOn('[data-tid=tagLibraryMenu]');
+ await clickOn('[data-tid=createNewTagGroup]');
- await setInputKeys('createTagGroupInput', tagGroupName);
- await clickOn('[data-tid=createTagGroupConfirmButton]');
+ await setInputKeys('createTagGroupInput', tagGroupName);
+ await clickOn('[data-tid=createTagGroupConfirmButton]');
+ if (isWeb) {
+ await global.client.pause(500);
+ }
+ }
}
export async function addTags(arrTags) {
@@ -54,6 +62,7 @@ describe('TST04 - Testing the tag library:', () => {
);
await clickOn('[data-tid=tagLibraryMoreButton_' + testGroup + ']');
+ await global.client.pause(500);
await clickOn('[data-tid=deleteTagGroup]');
await global.client.pause(500);
await clickOn('[data-tid=confirmDeleteTagGroupDialog]');
@@ -103,9 +112,10 @@ describe('TST04 - Testing the tag library:', () => {
);
const color = await colorElem.getCSSProperty('background');
- expect(color.value).toContain(
- 'rgb(0,0,0)'
- ); /*await openTagGroupMenu(
+ expect(color.value).toContain('rgb(0,0,0)');
+ await clickOn('[data-tid=editTagGroupConfirmButton]');
+
+ /*await openTagGroupMenu(
testGroup
);
await delay(500);
@@ -141,7 +151,7 @@ describe('TST04 - Testing the tag library:', () => {
expect(addedTag.selector).toBe('[data-tid=' + newTagName + ']');*/
});
- it('TST0405 - Add tag (s) / Should add comma separated tags to a tag group [TST0405,web,minio,electron]', async () => {
+ it('TST0405 - Add tag (s) Should add comma separated tags to a tag group [TST0405,web,minio,electron]', async () => {
await createTagGroup(testGroup);
await clickOn('[data-tid=tagLibraryMoreButton_' + testGroup + ']');
await addTags(arrTags);
@@ -166,10 +176,10 @@ describe('TST04 - Testing the tag library:', () => {
});
it('TST0408 - Should delete tag from a tag group [TST0408,web,minio,electron]', async () => {
- await tagMenu('done', 'deleteTagDialog');
+ await tagMenu('next', 'deleteTagDialog');
await global.client.pause(500);
await clickOn('[data-tid=confirmDeleteTagDialogTagMenu]');
- await expectElementExist('[data-tid=tagContainer_done]', false);
+ await expectElementExist('[data-tid=tagContainer_next]', false);
});
it('TST0409 - Should sort tags in a tag group lexicographically [TST0409,web,minio,electron]', async () => {
@@ -210,6 +220,7 @@ describe('TST04 - Testing the tag library:', () => {
const color = await colorElem.getCSSProperty('background');
expect(color.value).toContain('rgb(0,0,0)');
+ await clickOn('[data-tid=createTagGroupCancelButton]');
/* await global.client.waitForVisible('[data-tid=settings]');
await global.client.click('[data-tid=settings]');
diff --git a/tests/e2e/viewer-image.e2e.js b/tests/e2e/viewer-image.e2e.js
index 3e0b792cd..c2f2d07f7 100644
--- a/tests/e2e/viewer-image.e2e.js
+++ b/tests/e2e/viewer-image.e2e.js
@@ -39,7 +39,10 @@ export const perspectiveGridTable = '//*[@data-tid="perspectiveGridFileTable"]';
// .click('#closeAboutDialogButton');
// }
-describe('TST53 - Image viewer [web,minio,electron]', () => {
+/**
+ * TODO search don't work for web
+ */
+describe('TST53 - Image viewer [minio,electron]', () => {
beforeEach(async () => {
if (global.isMinio) {
await createMinioLocation('', defaultLocationName, true);
@@ -84,15 +87,18 @@ describe('TST53 - Image viewer [web,minio,electron]', () => {
await closeOpenedFile();
});
+ /**
+ * skip for web -> webp
+ */
it('TST5305 - Open WEBP [TST5305]', async () => {
- await delay(500);
+ /*await delay(500);
await searchEngine('webp');
await delay(500);
const file = await global.client.$(perspectiveGridTable + firstFile);
await file.waitForDisplayed();
await file.doubleClick();
await delay(500);
- await closeOpenedFile();
+ await closeOpenedFile();*/
});
it('TST5306 - Open SVG [TST5306]', async () => {
diff --git a/tests/setup-after-env.js b/tests/setup-after-env.js
index 4950a44a5..ce0a61ed8 100644
--- a/tests/setup-after-env.js
+++ b/tests/setup-after-env.js
@@ -1,10 +1,13 @@
+import pathLib from 'path';
import {
clearLocalStorage,
startSpectronApp,
stopSpectronApp,
+ takeScreenshot,
testDataRefresh
} from './e2e/hook';
import { closeWelcome } from './e2e/welcome.helpers';
+import { clearStorage } from './e2e/clearstorage.helpers';
// the default timeout before starting every test
jasmine.DEFAULT_TIMEOUT_INTERVAL = 300000;
@@ -25,6 +28,23 @@ global.isUnitTest =
}
});*/
+jasmine.getEnv().addReporter({
+ specStarted: result => (jasmine.currentTest = result),
+ specDone: result => (jasmine.previousTest = result)
+});
+
+/*jasmine.getEnv().addReporter({
+ specDone: async result => {
+ if (result.status !== 'disabled') {
+ // console.log('specDone Done' + JSON.stringify(result));
+ if (result.status === 'failed') {
+ await takeScreenshot();
+ }
+ // await clearLocalStorage(); //todo https://trello.com/c/hMCSKXWU/554-fix-takescreenshots-in-tests
+ }
+ }
+});*/
+
beforeAll(async () => {
testDataRefresh();
await startSpectronApp();
@@ -35,6 +55,14 @@ afterAll(async () => {
});
beforeEach(async () => {
+ if (jasmine.currentTest && jasmine.currentTest.status !== 'disabled') {
+ // console.log('specDone Done' + JSON.stringify(result));
+ if (jasmine.previousTest && jasmine.previousTest.status === 'failed') {
+ await takeScreenshot(jasmine.previousTest.description);
+ }
+ await clearLocalStorage(); //todo https://trello.com/c/hMCSKXWU/554-fix-takescreenshots-in-tests
+ }
+
if (global.isWeb) {
await global.client.pause(500);
}
@@ -42,6 +70,8 @@ beforeEach(async () => {
await closeWelcome();
});
-afterEach(async () => {
- await clearLocalStorage();
-});
+// afterEach(async () => {
+// // takeScreenshot();
+// // await clearLocalStorage();
+// await clearStorage();
+// });
diff --git a/yarn.lock b/yarn.lock
index 537712600..ca466813e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2374,6 +2374,11 @@
resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+"@types/cucumber@^6.0.1":
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/@types/cucumber/-/cucumber-6.0.1.tgz#0fe9673d34568d35ff21957af049883635472fcd"
+ integrity sha512-+GZV6xfN0MeN9shDCdny8GbC8N0+U6uca8cjyaJndcwmrUhwS6qOU2vmYn0d71EOwJF568/v3SxJ8VKxuZNYRw==
+
"@types/dateformat@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@types/dateformat/-/dateformat-3.0.1.tgz#98d747a2e5e9a56070c6bf14e27bff56204e34cc"
@@ -2682,6 +2687,16 @@
deepmerge "^4.0.0"
glob "^7.1.2"
+"@wdio/junit-reporter@^6.11.0":
+ version "6.11.0"
+ resolved "https://registry.yarnpkg.com/@wdio/junit-reporter/-/junit-reporter-6.11.0.tgz#d5b8837a0fa526c3f629b6844317ef3a7bb9272d"
+ integrity sha512-wOc1SYEHdGaLdO3zdcJ0U55p/LxMZL4erHSeqHMSJZLtuNPJYvj3RgRrhnVYMcnR6OjzIMC/acQ/hU2QwrzXNQ==
+ dependencies:
+ "@wdio/reporter" "6.11.0"
+ json-stringify-safe "^5.0.1"
+ junit-report-builder "^2.1.0"
+ validator "^13.0.0"
+
version "6.0.16"
resolved "https://registry.yarnpkg.com/@wdio/logger/-/logger-6.0.16.tgz#eef00e8369d8a5c86080a27d8bab41ad7dcdd2b2"
@@ -2704,6 +2719,24 @@
dependencies:
"@wdio/utils" "6.4.0"
+ version "6.11.0"
+ resolved "https://registry.yarnpkg.com/@wdio/reporter/-/reporter-6.11.0.tgz#edeb255df708509ea8428029273d4d65426ea2d5"
+ integrity sha512-SStNZZUI0bXI+omyIU6ql4Rh+Dews1dz1GlowHDrBxwKMPyAwytgYokXLn3zr+E3tkHDiRyJjQxfDetBWBGmtg==
+ dependencies:
+ "@types/cucumber" "^6.0.1"
+ fs-extra "^9.0.0"
+
+"@wdio/spec-reporter@^6.11.0":
+ version "6.11.0"
+ resolved "https://registry.yarnpkg.com/@wdio/spec-reporter/-/spec-reporter-6.11.0.tgz#99e0a03985c0dfccf57f4b24c75f03409e1caaca"
+ integrity sha512-X68HGyay/tt0Y2nHn5U519bx+yBobAHge7lPklZ2cHNPEsmPSrvTyKIw5h3YO8mkfWHdp6IGxgHrET521Oe6WA==
+ dependencies:
+ "@wdio/reporter" "6.11.0"
+ chalk "^4.0.0"
+ easy-table "^1.1.1"
+ pretty-ms "^7.0.0"
+
version "6.4.0"
resolved "https://registry.yarnpkg.com/@wdio/utils/-/utils-6.4.0.tgz#91ffe7192e883cd78f8d866c1f2226d65895b24e"
@@ -4436,6 +4469,15 @@ caniuse-lite@^1.0.30001157:
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001161.tgz#64f7ffe79ee780b8c92843ff34feb36cea4651e0"
integrity sha512-JharrCDxOqPLBULF9/SPa6yMcBRTjZARJ6sc3cuKrPfyIk64JN6kuMINWqA99Xc8uElMFcROliwtz0n9pYej+g==
+canvas@^2.6.1:
+ version "2.6.1"
+ resolved "https://registry.yarnpkg.com/canvas/-/canvas-2.6.1.tgz#0d087dd4d60f5a5a9efa202757270abea8bef89e"
+ integrity sha512-S98rKsPcuhfTcYbtF53UIJhcbgIAK533d1kJKMwsMwAIFgfd58MOyxRud3kktlzWiEkFliaJtvyZCBtud/XVEA==
+ dependencies:
+ nan "^2.14.0"
+ node-pre-gyp "^0.11.0"
+ simple-get "^3.0.3"
+
capture-exit@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -5573,6 +5615,11 @@ date-fns@^2.0.0-beta.4:
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.16.1.tgz#05775792c3f3331da812af253e1a935851d3834b"
integrity sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ==
+ version "0.0.2"
+ resolved "https://registry.yarnpkg.com/date-format/-/date-format-0.0.2.tgz#fafd448f72115ef1e2b739155ae92f2be6c28dd1"
+ integrity sha1-+v1Ej3IRXvHitzkVWukvK+bCjdE=
+
version "3.0.2"
resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.2.tgz#9a4df4bff158ac2f34bc637abdb15471607e1659"
@@ -5620,6 +5667,13 @@ debug@^3.1.0, debug@^3.1.1, debug@^3.2.5:
dependencies:
ms "^2.1.1"
+debug@^3.2.6:
+ version "3.2.7"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+ integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
+ dependencies:
+ ms "^2.1.1"
+
debug@^4.3.0:
version "4.3.1"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
@@ -5662,6 +5716,13 @@ decompress-response@^3.3.0:
dependencies:
mimic-response "^1.0.0"
+decompress-response@^4.2.0:
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986"
+ integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==
+ dependencies:
+ mimic-response "^2.0.0"
+
decompress-response@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
@@ -5679,11 +5740,6 @@ deep-diff@^0.3.5:
resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84"
integrity sha1-wB3mPvsO7JeYgB1Ax+Da4ltYLIQ=
-deep-diff@^1.0.2:
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-1.0.2.tgz#afd3d1f749115be965e89c63edc7abb1506b9c26"
- integrity sha512-aWS3UIVH+NPGCD1kki+DCU9Dua032iSsO43LqQpcs4R3+dVv7tX0qBGjiVHJHjplsoUM2XRO/KB92glqc68awg==
-
deep-equal@^1.0.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
@@ -5842,6 +5898,11 @@ detect-indent@~5.0.0:
resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
+detect-libc@^1.0.2:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+ integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
+
detect-newline@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
@@ -6154,6 +6215,15 @@ duplexify@^3.4.2, duplexify@^3.6.0:
readable-stream "^2.0.0"
stream-shift "^1.0.0"
+easy-table@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/easy-table/-/easy-table-1.1.1.tgz#c1b9b9ad68a017091a1c235e4bcba277540e143f"
+ integrity sha512-C9Lvm0WFcn2RgxbMnTbXZenMIWcBtkzMr+dWqq/JsVoGFSVUVlPqeOa5LP5kM0I3zoOazFpckOEb2/0LDFfToQ==
+ dependencies:
+ ansi-regex "^3.0.0"
+ optionalDependencies:
+ wcwidth ">=1.0.1"
+
ecc-jsbn@~0.1.1:
version "0.1.2"
resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -6918,11 +6988,6 @@ execall@^1.0.0:
dependencies:
clone-regexp "^1.0.0"
-exenv@^1.2.2:
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d"
- integrity sha1-KueOhdmJQVhnCwPUe+wfA72Ru50=
-
exif-js@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/exif-js/-/exif-js-2.3.0.tgz#9d10819bf571f873813e7640241255ab9ce1a814"
@@ -7500,6 +7565,16 @@ fs-extra@^8.1.0:
jsonfile "^4.0.0"
universalify "^0.1.0"
+fs-extra@^9.0.0:
+ version "9.1.0"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
+ integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
+ dependencies:
+ at-least-node "^1.0.0"
+ graceful-fs "^4.2.0"
+ jsonfile "^6.0.1"
+ universalify "^2.0.0"
+
fs-extra@^9.0.1:
version "9.0.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
@@ -7510,6 +7585,13 @@ fs-extra@^9.0.1:
jsonfile "^6.0.1"
universalify "^1.0.0"
+fs-minipass@^1.2.5:
+ version "1.2.7"
+ resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
+ integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
+ dependencies:
+ minipass "^2.6.0"
+
fs-vacuum@~1.2.10:
version "1.2.10"
resolved "https://registry.yarnpkg.com/fs-vacuum/-/fs-vacuum-1.2.10.tgz#b7629bec07a4031a2548fdf99f5ecf1cc8b31e36"
@@ -8480,7 +8562,7 @@ i18next@^11.3.3:
resolved "https://registry.yarnpkg.com/i18next/-/i18next-11.10.2.tgz#e5f10346f6320ecf15595419926c25255381a56c"
integrity sha512-1rowdX8PqrvsdFhYb3v0A/LlIHLQL1HTa4ia29IzhvNAg2fesNV7R1jXibWLmLQdz3FfTB8RuqSqDEjIawXruA==
[email protected], iconv-lite@^0.4.24:
[email protected], iconv-lite@^0.4.24, iconv-lite@^0.4.4:
version "0.4.24"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -8523,6 +8605,13 @@ iferr@^0.1.5, iferr@~0.1.5:
resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
+ignore-walk@^3.0.1:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
+ integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
+ dependencies:
+ minimatch "^3.0.4"
+
ignore@^4.0.3, ignore@^4.0.6:
version "4.0.6"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
@@ -9000,11 +9089,6 @@ is-installed-globally@^0.3.1:
global-dirs "^2.0.1"
is-path-inside "^3.0.1"
-is-lite@^0.6.0:
- version "0.6.0"
- resolved "https://registry.yarnpkg.com/is-lite/-/is-lite-0.6.0.tgz#806b7c967f1d75b5f4121d6ce93107c427b542eb"
- integrity sha512-kJ16DuwOhtZg7RimZOf+zK86XOlPeNGGy20MhAfjN/zozuetECxOEtUDUAtzC5n21Yd2lVx6LqZvO1Zvd5DYhw==
-
is-negative-zero@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
@@ -10144,6 +10228,16 @@ jszip@^3.1.0, jszip@^3.1.5:
readable-stream "~2.3.6"
set-immediate-shim "~1.0.1"
+junit-report-builder@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/junit-report-builder/-/junit-report-builder-2.1.0.tgz#7089dd8ae547657509b9a5eb7b5082bde22bcc7e"
+ integrity sha512-Ioj5I4w18ZcHFaaisqCKdh1z+ipzN7sA2JB+h+WOlGcOMWm0FFN1dfxkgc2I4EXfhSP/mOfM3W43uFzEdz4sTw==
+ dependencies:
+ date-format "0.0.2"
+ lodash "^4.17.15"
+ make-dir "^1.3.0"
+ xmlbuilder "^10.0.0"
+
just-extend@^4.0.2:
version "4.1.0"
resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.1.0.tgz#7278a4027d889601640ee0ce0e5a00b992467da4"
@@ -10802,7 +10896,7 @@ lru-cache@^6.0.0:
dependencies:
yallist "^4.0.0"
-make-dir@^1.0.0:
+make-dir@^1.0.0, make-dir@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
@@ -11117,6 +11211,11 @@ mimic-response@^1.0.0, mimic-response@^1.0.1:
resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
+mimic-response@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43"
+ integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==
+
mimic-response@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
@@ -11168,6 +11267,21 @@ minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
+ version "2.9.0"
+ resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
+ integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
+ dependencies:
+ safe-buffer "^5.1.2"
+ yallist "^3.0.0"
+
+minizlib@^1.2.1:
+ version "1.3.3"
+ resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
+ integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
+ dependencies:
+ minipass "^2.9.0"
+
mississippi@^1.2.0, mississippi@^1.3.0, mississippi@~1.3.0:
version "1.3.1"
resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-1.3.1.tgz#2a8bb465e86550ac8b36a7b6f45599171d78671e"
@@ -11312,6 +11426,11 @@ nan@^2.12.1, nan@^2.13.2:
resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==
+nan@^2.14.0:
+ version "2.14.2"
+ resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
+ integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
+
nanomatch@^1.2.9:
version "1.2.13"
resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
@@ -11339,6 +11458,15 @@ natural-compare@^1.4.0:
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+needle@^2.2.1:
+ version "2.6.0"
+ resolved "https://registry.yarnpkg.com/needle/-/needle-2.6.0.tgz#24dbb55f2509e2324b4a99d61f413982013ccdbe"
+ integrity sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==
+ dependencies:
+ debug "^3.2.6"
+ iconv-lite "^0.4.4"
+ sax "^1.2.4"
+
version "0.6.2"
resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@@ -11349,16 +11477,6 @@ neo-async@^2.5.0, neo-async@^2.6.1:
resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/nested-property/-/nested-property-1.0.1.tgz#2001105b5c69413411b876bba9b86f4316af613f"
- integrity sha512-BnBBoo/8bBNRdAnJc7+m79oWk7dXwW1+vCesaEQhfDGVwXGLMvmI4NwYgLTW94R/x+R2s/yr2g/hB/4w/YSAvA==
-
-nested-property@^1.0.2:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/nested-property/-/nested-property-1.0.4.tgz#4068c4289d1f3ac9f367e784502ff342d277ee2f"
- integrity sha512-6fNIumJJUyP3rkB4FyVYCYpdW+PKUCaxRWRGLLf0kv/RKoG4mbTvInedA9x3zOyuOmOkGudKuAtPSI+dnhwj2g==
-
nice-try@^1.0.4:
version "1.0.5"
resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@@ -11477,6 +11595,22 @@ node-notifier@^8.0.0:
uuid "^8.3.0"
which "^2.0.2"
+node-pre-gyp@^0.11.0:
+ version "0.11.0"
+ resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz#db1f33215272f692cd38f03238e3e9b47c5dd054"
+ integrity sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==
+ dependencies:
+ detect-libc "^1.0.2"
+ mkdirp "^0.5.1"
+ needle "^2.2.1"
+ nopt "^4.0.1"
+ npm-packlist "^1.1.6"
+ npmlog "^4.0.2"
+ rc "^1.2.7"
+ rimraf "^2.6.1"
+ semver "^5.3.0"
+ tar "^4"
+
node-releases@^1.1.60:
version "1.1.61"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz#707b0fca9ce4e11783612ba4a2fcba09047af16e"
@@ -11582,6 +11716,13 @@ normalize-url@^4.1.0:
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129"
integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==
+npm-bundled@^1.0.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
+ integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
+ dependencies:
+ npm-normalize-package-bin "^1.0.1"
+
npm-cache-filename@~1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz#ded306c5b0bfc870a9e9faf823bc5f283e05ae11"
@@ -11602,7 +11743,7 @@ npm-install-checks@~3.0.0:
dependencies:
semver "^2.3.0 || 3.x || 4 || 5"
-npm-normalize-package-bin@^1.0.0:
+npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
@@ -11627,6 +11768,15 @@ npm-normalize-package-bin@^1.0.0:
semver "^5.6.0"
validate-npm-package-name "^3.0.0"
+npm-packlist@^1.1.6:
+ version "1.4.8"
+ resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
+ integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
+ dependencies:
+ ignore-walk "^3.0.1"
+ npm-bundled "^1.0.1"
+ npm-normalize-package-bin "^1.0.1"
+
npm-path@^2.0.2:
version "2.0.4"
resolved "https://registry.yarnpkg.com/npm-path/-/npm-path-2.0.4.tgz#c641347a5ff9d6a09e4d9bce5580c4f505278e64"
@@ -11780,7 +11930,7 @@ [email protected]:
wrappy "~1.0.2"
write-file-atomic "~2.1.0"
-"npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@~4.1.2:
+"npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@^4.0.2, npmlog@~4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -12277,6 +12427,11 @@ parse-json@^5.0.0:
json-parse-even-better-errors "^2.3.0"
lines-and-columns "^1.1.6"
+parse-ms@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-2.1.0.tgz#348565a753d4391fa524029956b172cb7753097d"
+ integrity sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==
+
parse-node-version@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
@@ -12586,11 +12741,6 @@ [email protected]:
resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz#cf6847b807da3799d80ee3d6d2f90df8a3f50b05"
integrity sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA==
-popper.js@^1.16.0:
- version "1.16.1"
- resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
- integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
-
portfinder@^1.0.26:
version "1.0.28"
resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
@@ -13059,6 +13209,13 @@ pretty-format@^26.4.2:
ansi-styles "^4.0.0"
react-is "^16.12.0"
+pretty-ms@^7.0.0:
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-7.0.1.tgz#7d903eaab281f7d8e03c66f867e239dc32fb73e8"
+ integrity sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==
+ dependencies:
+ parse-ms "^2.1.0"
+
process-nextick-args@~2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
@@ -13373,7 +13530,7 @@ rc-util@^5.0.0, rc-util@^5.0.4:
react-is "^16.12.0"
shallowequal "^1.1.0"
-rc@^1.0.1, rc@^1.1.6, rc@^1.2.8:
+rc@^1.0.1, rc@^1.1.6, rc@^1.2.7, rc@^1.2.8:
version "1.2.8"
resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -13463,18 +13620,6 @@ react-event-listener@^0.6.0:
prop-types "^15.6.0"
warning "^4.0.1"
-react-floater@^0.7.2:
- version "0.7.2"
- resolved "https://registry.yarnpkg.com/react-floater/-/react-floater-0.7.2.tgz#c0c7ddab18a955b1c4a3934890fa804b3d2a4801"
- integrity sha512-YKixUNXdySMqo4gh6ZGVLI/h7cI59MFQKOG38jAdBJl7XVC///w+sa7dmz+o2xWe4oUSey3z2vmg+AtX7A7Kug==
- dependencies:
- deepmerge "^4.2.2"
- exenv "^1.2.2"
- is-lite "^0.6.0"
- popper.js "^1.16.0"
- react-proptype-conditional-require "^1.0.4"
- tree-changes "^0.5.1"
-
react-hot-loader@^4.8.2:
version "4.12.21"
resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.12.21.tgz#332e830801fb33024b5a147d6b13417f491eb975"
@@ -13521,22 +13666,6 @@ react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.0, react-i
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
-react-joyride@^2.0.0-11:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/react-joyride/-/react-joyride-2.2.1.tgz#a65fe7aba1184f2ceff3b2b79beffcc3cad17231"
- integrity sha512-2dcfuOPW1viQ7TxUxLajNJJiW+I4dh3dPaySuvc1uiWK1qC8uaxjhGwWSIdQitVw0j1/4NU7P2dPuB9d5umtlw==
- dependencies:
- deep-diff "^1.0.2"
- deepmerge "^4.2.2"
- exenv "^1.2.2"
- is-lite "^0.6.0"
- nested-property "^1.0.2"
- react-floater "^0.7.2"
- react-is "^16.12.0"
- scroll "^3.0.1"
- scrollparent "^2.0.1"
- tree-changes "^0.5.1"
-
react-leaflet@^2.8.0:
version "2.8.0"
resolved "https://registry.yarnpkg.com/react-leaflet/-/react-leaflet-2.8.0.tgz#14bfc77b6ae8263d3a62e0ba7a39539c05973c6f"
@@ -13552,11 +13681,6 @@ react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4:
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
-react-proptype-conditional-require@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/react-proptype-conditional-require/-/react-proptype-conditional-require-1.0.4.tgz#69c2d5741e6df5e08f230f36bbc2944ee1222555"
- integrity sha1-acLVdB5t9eCPIw82u8KUTuEiJVU=
-
react-redux@^5.0.7:
version "5.1.2"
resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.1.2.tgz#b19cf9e21d694422727bf798e934a916c4080f57"
@@ -14657,16 +14781,6 @@ schema-utils@^2.0.1, schema-utils@^2.5.0, schema-utils@^2.6.5, schema-utils@^2.6
ajv "^6.12.4"
ajv-keywords "^3.5.2"
-scroll@^3.0.1:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/scroll/-/scroll-3.0.1.tgz#d5afb59fb3592ee3df31c89743e78b39e4cd8a26"
- integrity sha512-pz7y517OVls1maEzlirKO5nPYle9AXsFzTMNJrRGmT951mzpIBy7sNHOg5o/0MQd/NqliCiWnAi0kZneMPFLcg==
-
-scrollparent@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/scrollparent/-/scrollparent-2.0.1.tgz#715d5b9cc57760fb22bdccc3befb5bfe06b1a317"
- integrity sha1-cV1bnMV3YPsivczDvvtb/gaxoxc=
-
scss-tokenizer@^0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
@@ -14937,6 +15051,20 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+simple-concat@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
+ integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==
+
+simple-get@^3.0.3:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3"
+ integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==
+ dependencies:
+ decompress-response "^4.2.0"
+ once "^1.3.1"
+ simple-concat "^1.0.0"
+
simple-git@^1.85.0:
version "1.132.0"
resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.132.0.tgz#53ac4c5ec9e74e37c2fd461e23309f22fcdf09b1"
@@ -15885,6 +16013,19 @@ tar@^2.0.0, tar@~2.2.1:
fstream "^1.0.12"
inherits "2"
+tar@^4:
+ version "4.4.13"
+ resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
+ integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
+ dependencies:
+ chownr "^1.1.1"
+ fs-minipass "^1.2.5"
+ minipass "^2.8.6"
+ minizlib "^1.2.1"
+ mkdirp "^0.5.0"
+ safe-buffer "^5.1.2"
+ yallist "^3.0.3"
+
tcp-port-used@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/tcp-port-used/-/tcp-port-used-1.0.1.tgz#46061078e2d38c73979a2c2c12b5a674e6689d70"
@@ -16141,14 +16282,6 @@ tr46@^2.0.2:
dependencies:
punycode "^2.1.1"
-tree-changes@^0.5.1:
- version "0.5.1"
- resolved "https://registry.yarnpkg.com/tree-changes/-/tree-changes-0.5.1.tgz#e31cc8a0f56c8c401f0a88243d9165dbea4f570c"
- integrity sha512-O873xzV2xRZ6N059Mn06QzmGKEE21LlvIPbsk2G+GS9ZX5OCur6PIwuuh0rWpAPvLWQZPj0XObyG27zZyLHUzw==
- dependencies:
- deep-diff "^1.0.2"
- nested-property "1.0.1"
-
tree-kill@^1.2.1:
version "1.2.2"
resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
@@ -16479,6 +16612,11 @@ universalify@^1.0.0:
resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
+universalify@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+ integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+
[email protected], unpipe@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -16744,6 +16882,11 @@ validate-npm-package-name@^3.0.0, validate-npm-package-name@~3.0.0:
dependencies:
builtins "^1.0.3"
+validator@^13.0.0:
+ version "13.5.2"
+ resolved "https://registry.yarnpkg.com/validator/-/validator-13.5.2.tgz#c97ae63ed4224999fb6f42c91eaca9567fe69a46"
+ integrity sha512-mD45p0rvHVBlY2Zuy3F3ESIe1h5X58GPfAtslBjY7EtTqGquZTj+VX/J4RnHWN8FKq0C9WRVt1oWAcytWRuYLQ==
+
value-equal@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c"
@@ -16863,13 +17006,29 @@ wbuf@^1.1.0, wbuf@^1.7.3:
dependencies:
minimalistic-assert "^1.0.0"
-wcwidth@^1.0.0:
+wcwidth@>=1.0.1, wcwidth@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
dependencies:
defaults "^1.0.3"
+wdio-image-comparison-service@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/wdio-image-comparison-service/-/wdio-image-comparison-service-2.0.0.tgz#e86247ee2577d1f5b147758b57c18cd862b71d67"
+ integrity sha512-LEUK9no+lnZno7EHSvLM1NVDmDHVBi/eoirr+WKiJfFF7rUFKKX6NnGTjbx26sykwo6potV6krM+VPpsYd7+1w==
+ dependencies:
+ webdriver-image-comparison "0.16.0"
+
+ version "0.16.0"
+ resolved "https://registry.yarnpkg.com/webdriver-image-comparison/-/webdriver-image-comparison-0.16.0.tgz#6976e6de26a870c8568bfd29d4d56fc408cdb56b"
+ integrity sha512-GRZFiFOi4Ho8RpwdWknsP4H493NnOHX1uEgGv1hur2+LiKxURBGlljBzym5Pi5OOcN9exZ0MOiJ/CKpotpUH/g==
+ dependencies:
+ canvas "^2.6.1"
+ chalk "^4.1.0"
+ fs-extra "^9.0.1"
+
version "6.4.6"
resolved "https://registry.yarnpkg.com/webdriver/-/webdriver-6.4.6.tgz#ac6f615dc52eb32da9615fdfb6433c044cf2d155"
@@ -17349,6 +17508,11 @@ [email protected]:
resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.0.0.tgz#de9a078a0b82ef0c6da5c76e58813a879eec31ec"
integrity sha512-KLu/G0DoWhkncQ9eHSI6s0/w+T4TM7rQaLhtCaL6tORv8jFlJPlnGumsgTcGfYeS1qZ/IHqrvDG7zJZ4d7e+nw==
+xmlbuilder@^10.0.0:
+ version "10.1.1"
+ resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-10.1.1.tgz#8cae6688cc9b38d850b7c8d3c0a4161dcaf475b0"
+ integrity sha512-OyzrcFLL/nb6fMGHbiRDuPup9ljBycsdCypwuyg5AAHvyWzGfChJpCXMG88AGTIMFhGZ9RccFN1e6lhg3hkwKg==
+
xmlbuilder@~9.0.1:
version "9.0.7"
resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
@@ -17399,7 +17563,7 @@ yallist@^2.1.2:
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
-yallist@^3.0.2:
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
version "3.1.1"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==