Skip to content

Commit

Permalink
Prettier upgrade and e2e type checks (#1522)
Browse files Browse the repository at this point in the history
* upgrade prettier

* noImplicitAny rule

* fix type

* update tsconfig

* upgrade to 150 print width
  • Loading branch information
Denys Vuika authored Jul 14, 2020
1 parent 32793ea commit ddc6f36
Show file tree
Hide file tree
Showing 339 changed files with 5,281 additions and 8,874 deletions.
1 change: 0 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
node_modules
src/assets/i18n
e2e
/angular.json
docs/**/*.md
4 changes: 3 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{
"singleQuote": true
"singleQuote": true,
"trailingComma": "none",
"printWidth": 150
}
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"javascript.preferences.importModuleSpecifier": "relative",
"typescript.preferences.quoteStyle": "single",
"typescript.preferences.importModuleSpecifier": "relative",
"editor.formatOnSave": false,
"editor.formatOnSave": true,
"[json]": {
"editor.formatOnSave": false
},
Expand Down
67 changes: 53 additions & 14 deletions e2e/suites/actions-available/files-folders/favorites.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export function favoritesTests() {
const page = new BrowsingPage();

describe('available actions : ', () => {

beforeAll(async () => {
await page.clickFavoritesAndWait();
});
Expand All @@ -41,7 +40,6 @@ export function favoritesTests() {
});

describe('on a file', () => {

it('File Office, favorite - [C297618]', async () => {
await testUtil.checkToolbarActions(testData.fileDocxFav.name, testData.fileDocxFav.toolbarPrimary, testData.fileDocxFav.favoritesToolbarMore);
await testUtil.checkContextMenu(testData.fileDocxFav.name, testData.fileDocxFav.favoritesContextMenu);
Expand All @@ -53,22 +51,38 @@ export function favoritesTests() {
});

it('File Office, shared, favorite - [C297620]', async () => {
await testUtil.checkToolbarActions(testData.fileDocxSharedFav.name, testData.fileDocxSharedFav.favoritesToolbarPrimary, testData.fileDocxSharedFav.favoritesToolbarMore);
await testUtil.checkToolbarActions(
testData.fileDocxSharedFav.name,
testData.fileDocxSharedFav.favoritesToolbarPrimary,
testData.fileDocxSharedFav.favoritesToolbarMore
);
await testUtil.checkContextMenu(testData.fileDocxSharedFav.name, testData.fileDocxSharedFav.favoritesContextMenu);
});

it('File shared, favorite - [C280462]', async () => {
await testUtil.checkToolbarActions(testData.fileSharedFav.name, testData.fileSharedFav.favoritesToolbarPrimary, testData.fileSharedFav.favoritesToolbarMore);
await testUtil.checkToolbarActions(
testData.fileSharedFav.name,
testData.fileSharedFav.favoritesToolbarPrimary,
testData.fileSharedFav.favoritesToolbarMore
);
await testUtil.checkContextMenu(testData.fileSharedFav.name, testData.fileSharedFav.favoritesContextMenu);
});

it('File favorite, locked - [C280463]', async () => {
await testUtil.checkToolbarActions(testData.fileFavLocked.name, testData.fileFavLocked.toolbarPrimary, testData.fileFavLocked.favoritesToolbarMore);
await testUtil.checkToolbarActions(
testData.fileFavLocked.name,
testData.fileFavLocked.toolbarPrimary,
testData.fileFavLocked.favoritesToolbarMore
);
await testUtil.checkContextMenu(testData.fileFavLocked.name, testData.fileFavLocked.favoritesContextMenu);
});

it('File shared, favorite, locked - [C280469]', async () => {
await testUtil.checkToolbarActions(testData.fileSharedFavLocked.name, testData.fileSharedFavLocked.favoritesToolbarPrimary, testData.fileSharedFavLocked.favoritesToolbarMore);
await testUtil.checkToolbarActions(
testData.fileSharedFavLocked.name,
testData.fileSharedFavLocked.favoritesToolbarPrimary,
testData.fileSharedFavLocked.favoritesToolbarMore
);
await testUtil.checkContextMenu(testData.fileSharedFavLocked.name, testData.fileSharedFavLocked.favoritesContextMenu);
});
});
Expand All @@ -82,23 +96,48 @@ export function favoritesTests() {

describe('on multiple selection', () => {
it('multiple files - [C280656]', async () => {
await testUtil.checkMultipleSelContextMenu([ testData.fileDocxFav.name, testData.fileDocxSharedFav.name ], testData.multipleSelAllFav.favoritesContextMenu);
await testUtil.checkMultipleSelToolbarActions([ testData.fileDocxFav.name, testData.fileDocxSharedFav.name ], testData.multipleSelAllFav.toolbarPrimary, testData.multipleSelAllFav.favoritesToolbarMore);
await testUtil.checkMultipleSelContextMenu(
[testData.fileDocxFav.name, testData.fileDocxSharedFav.name],
testData.multipleSelAllFav.favoritesContextMenu
);
await testUtil.checkMultipleSelToolbarActions(
[testData.fileDocxFav.name, testData.fileDocxSharedFav.name],
testData.multipleSelAllFav.toolbarPrimary,
testData.multipleSelAllFav.favoritesToolbarMore
);
});

it('multiple locked files - [C297631]', async () => {
await testUtil.checkMultipleSelContextMenu([ testData.fileFavLocked.name, testData.fileSharedFavLocked.name ], testData.multipleSelAllFav.favoritesContextMenu);
await testUtil.checkMultipleSelToolbarActions([ testData.fileFavLocked.name, testData.fileSharedFavLocked.name ], testData.multipleSelAllFav.toolbarPrimary, testData.multipleSelAllFav.favoritesToolbarMore);
await testUtil.checkMultipleSelContextMenu(
[testData.fileFavLocked.name, testData.fileSharedFavLocked.name],
testData.multipleSelAllFav.favoritesContextMenu
);
await testUtil.checkMultipleSelToolbarActions(
[testData.fileFavLocked.name, testData.fileSharedFavLocked.name],
testData.multipleSelAllFav.toolbarPrimary,
testData.multipleSelAllFav.favoritesToolbarMore
);
});

it('multiple folders - [C280664]', async () => {
await testUtil.checkMultipleSelContextMenu([ testData.folderFav.name, testData.folderFav2.name ], testData.multipleSelAllFav.favoritesContextMenu);
await testUtil.checkMultipleSelToolbarActions([ testData.folderFav.name, testData.folderFav2.name ], testData.multipleSelAllFav.toolbarPrimary, testData.multipleSelAllFav.favoritesToolbarMore);
await testUtil.checkMultipleSelContextMenu(
[testData.folderFav.name, testData.folderFav2.name],
testData.multipleSelAllFav.favoritesContextMenu
);
await testUtil.checkMultipleSelToolbarActions(
[testData.folderFav.name, testData.folderFav2.name],
testData.multipleSelAllFav.toolbarPrimary,
testData.multipleSelAllFav.favoritesToolbarMore
);
});

it('both files and folders - [C280657]', async () => {
await testUtil.checkMultipleSelContextMenu([ testData.fileFav.name, testData.folderFav.name ], testData.multipleSelAllFav.favoritesContextMenu);
await testUtil.checkMultipleSelToolbarActions([ testData.fileFav.name, testData.folderFav.name ], testData.multipleSelAllFav.toolbarPrimary, testData.multipleSelAllFav.favoritesToolbarMore);
await testUtil.checkMultipleSelContextMenu([testData.fileFav.name, testData.folderFav.name], testData.multipleSelAllFav.favoritesContextMenu);
await testUtil.checkMultipleSelToolbarActions(
[testData.fileFav.name, testData.folderFav.name],
testData.multipleSelAllFav.toolbarPrimary,
testData.multipleSelAllFav.favoritesToolbarMore
);
});
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import { trashTests } from './trash';
describe('Files / folders actions : ', () => {
const random = Utils.random();

const username = `user-${random}`
const username = `user-${random}`;

const parent = `parent-${random}`;

Expand Down Expand Up @@ -68,7 +68,7 @@ describe('Files / folders actions : ', () => {

parentId = (await userApi.nodes.createFolder(parent)).entry.id;

await userApi.upload.uploadFileWithRename(FILES.docxFile, parentId, testData.fileDocx.name );
await userApi.upload.uploadFileWithRename(FILES.docxFile, parentId, testData.fileDocx.name);
fileDocxFavId = (await userApi.upload.uploadFileWithRename(FILES.docxFile, parentId, testData.fileDocxFav.name)).entry.id;
await userApi.nodes.createFile(testData.file.name, parentId);
fileFavId = (await userApi.nodes.createFile(testData.fileFav.name, parentId)).entry.id;
Expand Down Expand Up @@ -166,5 +166,4 @@ describe('Files / folders actions : ', () => {
describe('on Trash : ', () => {
trashTests();
});

});
64 changes: 48 additions & 16 deletions e2e/suites/actions-available/files-folders/personal-files.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ export function personalFilesTests(parentName?: string) {
const { dataTable } = page;

describe('available actions : ', () => {

beforeAll(async () => {
await page.clickPersonalFilesAndWait();
await dataTable.doubleClickOnRowByName(parentName);
Expand All @@ -44,7 +43,6 @@ export function personalFilesTests(parentName?: string) {
});

describe('on a file', () => {

it('File Office - [C213122]', async () => {
await testUtil.checkToolbarActions(testData.fileDocx.name, testData.fileDocx.toolbarPrimary, testData.fileDocx.toolbarMore);
await testUtil.checkContextMenu(testData.fileDocx.name, testData.fileDocx.contextMenu);
Expand All @@ -71,7 +69,11 @@ export function personalFilesTests(parentName?: string) {
});

it('File Office, shared, favorite - [C297616]', async () => {
await testUtil.checkToolbarActions(testData.fileDocxSharedFav.name, testData.fileDocxSharedFav.toolbarPrimary, testData.fileDocxSharedFav.toolbarMore);
await testUtil.checkToolbarActions(
testData.fileDocxSharedFav.name,
testData.fileDocxSharedFav.toolbarPrimary,
testData.fileDocxSharedFav.toolbarMore
);
await testUtil.checkContextMenu(testData.fileDocxSharedFav.name, testData.fileDocxSharedFav.contextMenu);
});

Expand All @@ -96,18 +98,25 @@ export function personalFilesTests(parentName?: string) {
});

it('File shared, locked - [C280453]', async () => {
await testUtil.checkToolbarActions(testData.fileSharedLocked.name, testData.fileSharedLocked.toolbarPrimary, testData.fileSharedLocked.toolbarMore);
await testUtil.checkToolbarActions(
testData.fileSharedLocked.name,
testData.fileSharedLocked.toolbarPrimary,
testData.fileSharedLocked.toolbarMore
);
await testUtil.checkContextMenu(testData.fileSharedLocked.name, testData.fileSharedLocked.contextMenu);
});

it('File shared, favorite, locked - [C280454]', async () => {
await testUtil.checkToolbarActions(testData.fileSharedFavLocked.name, testData.fileSharedFavLocked.toolbarPrimary, testData.fileSharedFavLocked.toolbarMore);
await testUtil.checkToolbarActions(
testData.fileSharedFavLocked.name,
testData.fileSharedFavLocked.toolbarPrimary,
testData.fileSharedFavLocked.toolbarMore
);
await testUtil.checkContextMenu(testData.fileSharedFavLocked.name, testData.fileSharedFavLocked.contextMenu);
});
});

describe('on a folder', () => {

it('Folder not favorite - [C213123]', async () => {
await testUtil.checkToolbarActions(testData.folder.name, testData.folder.toolbarPrimary, testData.folder.toolbarMore);
await testUtil.checkContextMenu(testData.folder.name, testData.folder.contextMenu);
Expand All @@ -121,28 +130,51 @@ export function personalFilesTests(parentName?: string) {

describe('on multiple selection', () => {
it('multiple files - [C217112]', async () => {
await testUtil.checkMultipleSelContextMenu([ testData.fileDocx.name, testData.fileDocxSharedFav.name ], testData.multipleSel.contextMenu);
await testUtil.checkMultipleSelToolbarActions([ testData.fileDocx.name, testData.fileDocxSharedFav.name ], testData.multipleSel.toolbarPrimary, testData.multipleSel.toolbarMore);
await testUtil.checkMultipleSelContextMenu([testData.fileDocx.name, testData.fileDocxSharedFav.name], testData.multipleSel.contextMenu);
await testUtil.checkMultipleSelToolbarActions(
[testData.fileDocx.name, testData.fileDocxSharedFav.name],
testData.multipleSel.toolbarPrimary,
testData.multipleSel.toolbarMore
);
});

it('multiple files - all favorite - [C297619]', async () => {
await testUtil.checkMultipleSelContextMenu([ testData.fileDocxFav.name, testData.fileDocxSharedFav.name ], testData.multipleSelAllFav.contextMenu);
await testUtil.checkMultipleSelToolbarActions([ testData.fileDocxFav.name, testData.fileDocxSharedFav.name ], testData.multipleSel.toolbarPrimary, testData.multipleSelAllFav.toolbarMore);
await testUtil.checkMultipleSelContextMenu(
[testData.fileDocxFav.name, testData.fileDocxSharedFav.name],
testData.multipleSelAllFav.contextMenu
);
await testUtil.checkMultipleSelToolbarActions(
[testData.fileDocxFav.name, testData.fileDocxSharedFav.name],
testData.multipleSel.toolbarPrimary,
testData.multipleSelAllFav.toolbarMore
);
});

it('multiple locked files - [C326688]', async () => {
await testUtil.checkMultipleSelContextMenu([ testData.fileLocked.name, testData.fileSharedFavLocked.name ], testData.multipleSel.contextMenu);
await testUtil.checkMultipleSelToolbarActions([ testData.fileLocked.name, testData.fileSharedFavLocked.name ], testData.multipleSel.toolbarPrimary, testData.multipleSel.toolbarMore);
await testUtil.checkMultipleSelContextMenu([testData.fileLocked.name, testData.fileSharedFavLocked.name], testData.multipleSel.contextMenu);
await testUtil.checkMultipleSelToolbarActions(
[testData.fileLocked.name, testData.fileSharedFavLocked.name],
testData.multipleSel.toolbarPrimary,
testData.multipleSel.toolbarMore
);
});

it('multiple folders - [C280459]', async () => {
await testUtil.checkMultipleSelContextMenu([ testData.folderFav.name, testData.folder.name ], testData.multipleSel.contextMenu);
await testUtil.checkMultipleSelToolbarActions([ testData.folderFav.name, testData.folder.name ], testData.multipleSel.toolbarPrimary, testData.multipleSel.toolbarMore);
await testUtil.checkMultipleSelContextMenu([testData.folderFav.name, testData.folder.name], testData.multipleSel.contextMenu);
await testUtil.checkMultipleSelToolbarActions(
[testData.folderFav.name, testData.folder.name],
testData.multipleSel.toolbarPrimary,
testData.multipleSel.toolbarMore
);
});

it('both files and folders - [C280460]', async () => {
await testUtil.checkMultipleSelContextMenu([ testData.file.name, testData.folder.name ], testData.multipleSel.contextMenu);
await testUtil.checkMultipleSelToolbarActions([ testData.file.name, testData.folder.name ], testData.multipleSel.toolbarPrimary, testData.multipleSel.toolbarMore);
await testUtil.checkMultipleSelContextMenu([testData.file.name, testData.folder.name], testData.multipleSel.contextMenu);
await testUtil.checkMultipleSelToolbarActions(
[testData.file.name, testData.folder.name],
testData.multipleSel.toolbarPrimary,
testData.multipleSel.toolbarMore
);
});
});
});
Expand Down
44 changes: 33 additions & 11 deletions e2e/suites/actions-available/files-folders/recent-files.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export function recentFilesTests() {
const page = new BrowsingPage();

describe('available actions : ', () => {

beforeAll(async () => {
await page.clickRecentFilesAndWait();
});
Expand Down Expand Up @@ -67,7 +66,11 @@ export function recentFilesTests() {
});

it('File Office, shared, favorite - [C280616]', async () => {
await testUtil.checkToolbarActions(testData.fileDocxSharedFav.name, testData.fileDocxSharedFav.toolbarPrimary, testData.fileDocxSharedFav.toolbarMore);
await testUtil.checkToolbarActions(
testData.fileDocxSharedFav.name,
testData.fileDocxSharedFav.toolbarPrimary,
testData.fileDocxSharedFav.toolbarMore
);
await testUtil.checkContextMenu(testData.fileDocxSharedFav.name, testData.fileDocxSharedFav.contextMenu);
});

Expand All @@ -92,32 +95,51 @@ export function recentFilesTests() {
});

it('File shared, locked - [C297636]', async () => {
await testUtil.checkToolbarActions(testData.fileSharedLocked.name, testData.fileSharedLocked.toolbarPrimary, testData.fileSharedLocked.toolbarMore);
await testUtil.checkToolbarActions(
testData.fileSharedLocked.name,
testData.fileSharedLocked.toolbarPrimary,
testData.fileSharedLocked.toolbarMore
);
await testUtil.checkContextMenu(testData.fileSharedLocked.name, testData.fileSharedLocked.contextMenu);
});

it('File shared, favorite, locked - [C286324]', async () => {
await testUtil.checkToolbarActions(testData.fileSharedFavLocked.name, testData.fileSharedFavLocked.toolbarPrimary, testData.fileSharedFavLocked.toolbarMore);
await testUtil.checkToolbarActions(
testData.fileSharedFavLocked.name,
testData.fileSharedFavLocked.toolbarPrimary,
testData.fileSharedFavLocked.toolbarMore
);
await testUtil.checkContextMenu(testData.fileSharedFavLocked.name, testData.fileSharedFavLocked.contextMenu);
});
});

describe('on multiple selection', () => {
it('multiple files - [C280468]', async () => {
await testUtil.checkMultipleSelContextMenu([ testData.fileDocxFav.name, testData.fileLocked.name ], testData.multipleSel.contextMenu);
await testUtil.checkMultipleSelToolbarActions([ testData.fileDocxFav.name, testData.fileLocked.name ], testData.multipleSel.toolbarPrimary, testData.multipleSel.toolbarMore);
await testUtil.checkMultipleSelContextMenu([testData.fileDocxFav.name, testData.fileLocked.name], testData.multipleSel.contextMenu);
await testUtil.checkMultipleSelToolbarActions(
[testData.fileDocxFav.name, testData.fileLocked.name],
testData.multipleSel.toolbarPrimary,
testData.multipleSel.toolbarMore
);
});

it('multiple files - all favorite - [C326689]', async () => {
await testUtil.checkMultipleSelContextMenu([ testData.fileDocxFav.name, testData.fileFav.name ], testData.multipleSelAllFav.contextMenu);
await testUtil.checkMultipleSelToolbarActions([ testData.fileDocxFav.name, testData.fileFav.name ], testData.multipleSel.toolbarPrimary, testData.multipleSelAllFav.toolbarMore);
await testUtil.checkMultipleSelContextMenu([testData.fileDocxFav.name, testData.fileFav.name], testData.multipleSelAllFav.contextMenu);
await testUtil.checkMultipleSelToolbarActions(
[testData.fileDocxFav.name, testData.fileFav.name],
testData.multipleSel.toolbarPrimary,
testData.multipleSelAllFav.toolbarMore
);
});

it('multiple locked files - [C297624]', async () => {
await testUtil.checkMultipleSelContextMenu([ testData.fileLocked.name, testData.fileSharedFavLocked.name ], testData.multipleSel.contextMenu);
await testUtil.checkMultipleSelToolbarActions([ testData.fileLocked.name, testData.fileSharedFavLocked.name ], testData.multipleSel.toolbarPrimary, testData.multipleSel.toolbarMore);
await testUtil.checkMultipleSelContextMenu([testData.fileLocked.name, testData.fileSharedFavLocked.name], testData.multipleSel.contextMenu);
await testUtil.checkMultipleSelToolbarActions(
[testData.fileLocked.name, testData.fileSharedFavLocked.name],
testData.multipleSel.toolbarPrimary,
testData.multipleSel.toolbarMore
);
});
});

});
}
Loading

0 comments on commit ddc6f36

Please sign in to comment.