Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sort Buckets table test #2207

Merged
merged 4 commits into from
Jun 30, 2022
Merged

sort Buckets table test #2207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5cfb60
sort Buckets table test
juans-chainsafe Jun 28, 2022
6e00384
improve variables and cy names
juans-chainsafe Jun 29, 2022
49a4fa2
Merge branch 'dev' into mnt/sort-columns-buckets-table-test-2202
FSM1 Jun 30, 2022
e483bba
Merge branch 'dev' into mnt/sort-columns-buckets-table-test-2202
Tbaut Jun 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions packages/storage-ui/cypress/support/page-objects/bucketsPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Only add things here that could be applicable to the bucket page

import { FILE_SYSTEM_TYPES } from "../utils/TestConstants"
import { basePage } from "./basePage"
import { createBucketModal } from "./modals/createBucketModal"

Expand All @@ -12,8 +13,9 @@ export const bucketsPage = {

// bucket browser row elements
bucketItemRow: () => cy.get("[data-cy=row-bucket-item]"),
nameTableHeader: () => cy.get("[data-cy=table-header-name]"),
sizeTableHeader: () => cy.get("[data-cy=table-header-size]"),
bucketsTableHeaderName: () => cy.get("[data-cy=buckets-table-header-name]"),
bucketsTableHeaderFileSystem: () => cy.get("[data-cy=buckets-table-header-file-system]"),
bucketsTableHeaderSize: () => cy.get("[data-cy=buckets-table-header-size]"),
bucketItemName: () => cy.get("[data-cy=cell-bucket-name]"),
bucketFileSystemType: () => cy.get("[data-cy=cell-file-system-type]"),
bucketRowKebabButton: () => cy.get("[data-testid=dropdown-title-bucket-kebab]"),
Expand All @@ -22,11 +24,19 @@ export const bucketsPage = {
deleteBucketMenuOption: () => cy.get("[data-cy=menu-delete-bucket]"),

// helpers and convenience functions
createBucket(bucketName: string) {
createBucket(bucketName: string, bucketType: FILE_SYSTEM_TYPES) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked after merging, but this is somewhat of an outlier. It's working as you want, but we usually use type in a different way, without using enum, and a little less wordy, but effectively achieving the same, with type safety, this would be something like

type BucketType = "ipfs" | "chainsafe"

createBucket(bucketName: string, bucketType: BucketType) {
// ...
case "ipfs"
// ...
case "chainsafe"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for that Tbaut! I forget about type, but I remember that I use that to replace the enum 3 years ago haha, I will make this change in the "rename folder and file test" PR

this.createBucketButton().click()
createBucketModal.body().should("be.visible")
createBucketModal.bucketNameInput().type(bucketName)
createBucketModal.submitButton().safeClick()
switch (bucketType) {
case FILE_SYSTEM_TYPES.IPFS:
createBucketModal.ipfsRadioInput().click()
break
case FILE_SYSTEM_TYPES.CHAINSAFE:
createBucketModal.chainsafeRadioInput().click()
break
}
createBucketModal.submitButton().click()
createBucketModal.body().should("not.exist")
}
}
4 changes: 4 additions & 0 deletions packages/storage-ui/cypress/support/utils/TestConstants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export enum FILE_SYSTEM_TYPES {
CHAINSAFE,
IPFS
}
35 changes: 35 additions & 0 deletions packages/storage-ui/cypress/tests/bucket-management.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { navigationMenu } from "../support/page-objects/navigationMenu"
import { fileUploadModal } from "../support/page-objects/modals/fileUploadModal"
import { deleteBucketModal } from "../support/page-objects/modals/deleteBucketModal"
import { uploadCompleteToast } from "../support/page-objects/toasts/uploadCompleteToast"
import { FILE_SYSTEM_TYPES } from "../support/utils/TestConstants"

describe("Bucket management", () => {

Expand Down Expand Up @@ -103,5 +104,39 @@ describe("Bucket management", () => {
bucketsPage.bucketItemRow().should("not.exist")
bucketsPage.bucketItemName().should("not.exist")
})

it("can sort by name or file system in buckets table", () => {
cy.web3Login({ deleteFpsBuckets: true })
navigationMenu.bucketsNavButton().click()

bucketsPage.createBucket(chainSafeBucketName, FILE_SYSTEM_TYPES.CHAINSAFE)
bucketsPage.bucketItemRow().should("have.length", 1)
bucketsPage.createBucket(ipfsBucketName, FILE_SYSTEM_TYPES.IPFS)
bucketsPage.bucketItemRow().should("have.length", 2)

// by default should be sort by date uploading in ascending order (oldest first)
bucketsPage.bucketItemName().eq(0).should("have.text", chainSafeBucketName)
bucketsPage.bucketItemName().eq(1).should("have.text", ipfsBucketName)

// ensure that sort by name in descending order (Z-A)
bucketsPage.bucketsTableHeaderName().click()
bucketsPage.bucketItemName().eq(0).should("have.text", ipfsBucketName)
bucketsPage.bucketItemName().eq(1).should("have.text", chainSafeBucketName)

// ensure that sort by name in ascending order (A-Z)
bucketsPage.bucketsTableHeaderName().click()
bucketsPage.bucketItemName().eq(0).should("have.text", chainSafeBucketName)
bucketsPage.bucketItemName().eq(1).should("have.text", ipfsBucketName)

// ensure that sort by file system in descending order (Z-A)
bucketsPage.bucketsTableHeaderFileSystem().click()
bucketsPage.bucketItemName().eq(0).should("have.text", ipfsBucketName)
bucketsPage.bucketItemName().eq(1).should("have.text", chainSafeBucketName)

// ensure that sort by file system in ascending order (A-Z)
bucketsPage.bucketsTableHeaderFileSystem().click()
bucketsPage.bucketItemName().eq(0).should("have.text", chainSafeBucketName)
bucketsPage.bucketItemName().eq(1).should("have.text", ipfsBucketName)
})
})
})
6 changes: 3 additions & 3 deletions packages/storage-ui/src/Components/Pages/BucketsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ const BucketsPage = () => {
className={classes.tableRow}
>
<TableHeadCell
data-cy="table-header-name"
data-cy="buckets-table-header-name"
align="left"
sortButtons={true}
onSortChange={() => handleSortToggle("name")}
Expand All @@ -310,7 +310,7 @@ const BucketsPage = () => {
<Trans>Name</Trans>
</TableHeadCell>
<TableHeadCell
data-cy="table-header-file-system"
data-cy="buckets-table-header-file-system"
align="center"
sortButtons={true}
onSortChange={() => handleSortToggle("file_system")}
Expand All @@ -320,7 +320,7 @@ const BucketsPage = () => {
<Trans>File System</Trans>
</TableHeadCell>
<TableHeadCell
data-cy="table-header-size"
data-cy="buckets-table-header-size"
align="center"
sortButtons={true}
onSortChange={() => handleSortToggle("size")}
Expand Down