Add support for validating tags

Nick-Lucas · Nov 7, 2021 · 09283e1 · 09283e1
1 parent bad7ff4
commit 09283e1
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/packages/giterm-e2e/GuiValidator.ts b/packages/giterm-e2e/GuiValidator.ts
@@ -5,6 +5,9 @@ const REPO_STATUS = '[data-testid="StatusBar_Status"]'
 const BRANCH_STATUS = '[data-testid="StatusBar_Branch"]'
 const SHOW_REMOTE_SELECTOR = '[data-testid="StatusBar_ShowRemote"]'
 
+const TAGS_OUTER = '[data-testid="tags"]'
+const TAG_ROW = `[data-testid="tag"]`
+const TAG_ROW_BY_NAME = (name: string) => `[data-tagid="${name}"]`
 const BRANCHES_OUTER = '[data-testid="branches"]'
 const BRANCH_ROW = `[data-testid="branch"]`
 const BRANCH_ROW_BY_NAME = (name: string) => `[data-branchid="${name}"]`
@@ -52,6 +55,7 @@ interface CheckScreen {
     remote?: RemoteBranchInfo
   }
   branches: Omit<RefBranch, 'type'>[]
+  tags: Omit<RefTag, 'type'>[]
   commits: number
   commitChecks: {
     index: number
@@ -107,6 +111,7 @@ export class GuiValidator {
     await this.status(expected.status)
     await this.currentBranch(expected.currentBranch.name)
     await this.branches(expected.branches)
+    await this.tags(expected.tags)
 
     await this.commits(expected.commits)
     for (const commit of expected.commitChecks) {
@@ -142,6 +147,17 @@ export class GuiValidator {
     }
   }
 
+  tags = async (tags: Omit<RefTag, 'type'>[]) => {
+    const tagsSection = await this.exists(TAGS_OUTER)
+
+    const tagRows = await tagsSection.$$(TAG_ROW)
+    expect(tagRows.length).toBe(tags.length)
+
+    for (const tag of tags) {
+      await this.exists(TAG_ROW_BY_NAME(tag.name), tagsSection)
+    }
+  }
+
   commits = async (count: number) => {
     const commits = await this.wd.$$(COMMIT_ROW)
     expect(commits.length).toBe(count)

diff --git a/packages/giterm-e2e/giterm.spec.ts b/packages/giterm-e2e/giterm.spec.ts
@@ -72,6 +72,7 @@ describe('giterm', () => {
         },
       },
       branches: [],
+      tags: [],
       commits: 0,
       commitChecks: [],
     })
@@ -94,6 +95,7 @@ describe('giterm', () => {
         },
       },
       branches: [],
+      tags: [],
       commits: 0,
       commitChecks: [],
     })
@@ -119,6 +121,7 @@ describe('giterm', () => {
           name: branchName,
         },
       ],
+      tags: [],
       commits: 1,
       commitChecks: [
         {
@@ -169,6 +172,7 @@ describe('giterm', () => {
           },
         },
       ],
+      tags: [],
       commits: 1,
       commitChecks: [
         {

diff --git a/packages/giterm/app/renderer/components/sidebar/Tags.tsx b/packages/giterm/app/renderer/components/sidebar/Tags.tsx
@@ -20,11 +20,15 @@ export function Tags() {
   }, [tags])
 
   return (
-    <Section title="TAGS" initialOpenState={false} icon={<Tag size={15} />}>
+    <Section
+      data-testid="tags"
+      title="TAGS"
+      initialOpenState={false}
+      icon={<Tag size={15} />}>
       {tags.map((tag, index) => {
         return (
           <RightClickArea key={tag.id} menuItems={menuItems[index]}>
-            <List.Row>
+            <List.Row data-testid="tag" data-tagid={tag.name}>
               <List.Label>{tag.name}</List.Label>
             </List.Row>
           </RightClickArea>