fixing merge conflict

Kira-Pilot · Kira-Pilot · commit 8f5a408844db · 2022-05-26T19:29:02.000Z
diff --git a/agent/agent.go b/agent/agent.go
@@ -359,7 +359,7 @@ func (a *agent) createCommand(ctx context.Context, rawCommand string, env []stri
 	if err != nil {
 		return nil, xerrors.Errorf("getting os executable: %w", err)
 	}
-	cmd.Env = append(cmd.Env, fmt.Sprintf(`PATH=%s%c%s`, os.Getenv("PATH"), filepath.ListSeparator, executablePath))
+	cmd.Env = append(cmd.Env, fmt.Sprintf(`PATH=%s%c%s`, os.Getenv("PATH"), filepath.ListSeparator, filepath.Dir(executablePath)))
 	// Git on Windows resolves with UNIX-style paths.
 	// If using backslashes, it's unable to find the executable.
 	unixExecutablePath := strings.ReplaceAll(executablePath, "\\", "/")
diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -80,7 +80,7 @@ func TestAgent(t *testing.T) {
 		ex, err := os.Executable()
 		t.Log(ex)
 		require.NoError(t, err)
-		require.True(t, strings.Contains(strings.TrimSpace(string(output)), ex), string(output), ex)
+		require.True(t, strings.Contains(strings.TrimSpace(string(output)), filepath.Dir(ex)))
 	})
 
 	t.Run("SessionTTY", func(t *testing.T) {
diff --git a/site/src/components/NavbarView/NavbarView.test.tsx b/site/src/components/NavbarView/NavbarView.test.tsx
@@ -2,7 +2,7 @@ import { screen } from "@testing-library/react"
 import React from "react"
 import { MockUser } from "../../testHelpers/entities"
 import { render } from "../../testHelpers/renderHelpers"
-import { NavbarView } from "./NavbarView"
+import { Language as navLanguage, NavbarView } from "./NavbarView"
 
 describe("NavbarView", () => {
   const noop = () => {
@@ -16,6 +16,24 @@ describe("NavbarView", () => {
     await screen.findAllByText("Coder", { exact: false })
   })
 
+  it("workspaces nav link has the correct href", async () => {
+    render(<NavbarView user={MockUser} onSignOut={noop} />)
+    const workspacesLink = await screen.findByText(navLanguage.workspaces)
+    expect((workspacesLink as HTMLAnchorElement).href).toContain("/workspaces")
+  })
+
+  it("templates nav link has the correct href", async () => {
+    render(<NavbarView user={MockUser} onSignOut={noop} />)
+    const templatesLink = await screen.findByText(navLanguage.templates)
+    expect((templatesLink as HTMLAnchorElement).href).toContain("/templates")
+  })
+
+  it("users nav link has the correct href", async () => {
+    render(<NavbarView user={MockUser} onSignOut={noop} />)
+    const userLink = await screen.findByText(navLanguage.users)
+    expect((userLink as HTMLAnchorElement).href).toContain("/users")
+  })
+
   it("renders profile picture for user", async () => {
     // Given
     const mockUser = {
diff --git a/site/src/components/NavbarView/NavbarView.tsx b/site/src/components/NavbarView/NavbarView.tsx
@@ -13,6 +13,12 @@ export interface NavbarViewProps {
   onSignOut: () => void
 }
 
+export const Language = {
+  workspaces: "Workspaces",
+  templates: "Templates",
+  users: "Users",
+}
+
 export const NavbarView: React.FC<NavbarViewProps> = ({ user, onSignOut }) => {
   const styles = useStyles()
   return (
@@ -25,12 +31,17 @@ export const NavbarView: React.FC<NavbarViewProps> = ({ user, onSignOut }) => {
         </ListItem>
         <ListItem button className={styles.item}>
           <NavLink className={styles.link} to="/workspaces">
-            Workspaces
+            {Language.workspaces}
           </NavLink>
         </ListItem>
         <ListItem button className={styles.item}>
           <NavLink className={styles.link} to="/templates">
-            Templates
+            {Language.templates}
+          </NavLink>
+        </ListItem>
+        <ListItem button className={styles.item}>
+          <NavLink className={styles.link} to="/users">
+            {Language.users}
           </NavLink>
         </ListItem>
       </List>

Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ func (a *agent) createCommand(ctx context.Context, rawCommand string, env []stri`
`359`	`359`	`if err != nil {`
`360`	`360`	`return nil, xerrors.Errorf("getting os executable: %w", err)`
`361`	`361`	`}`
`362`		- cmd.Env = append(cmd.Env, fmt.Sprintf(`PATH=%s%c%s`, os.Getenv("PATH"), filepath.ListSeparator, executablePath))
	`362`	+ cmd.Env = append(cmd.Env, fmt.Sprintf(`PATH=%s%c%s`, os.Getenv("PATH"), filepath.ListSeparator, filepath.Dir(executablePath)))
`363`	`363`	`// Git on Windows resolves with UNIX-style paths.`
`364`	`364`	`// If using backslashes, it's unable to find the executable.`
`365`	`365`	`unixExecutablePath := strings.ReplaceAll(executablePath, "\\", "/")`