Fix e2e tests

kylecarbs · kylecarbs · commit 48d7652d737e · 2022-03-07T01:35:17.000Z
diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml
@@ -157,6 +157,7 @@ jobs:
           GOMAXPROCS: ${{ runner.os == 'Windows' && 1 || 2 }}
         run: gotestsum --junitfile="gotests.xml" --packages="./..." --
           -covermode=atomic -coverprofile="gotests.coverage"
+          -coverpkg=./.,github.com/coder/coder/codersdk
           -timeout=3m -count=$GOCOUNT -race -short -failfast
 
       - name: Upload DataDog Trace
@@ -172,6 +173,7 @@ jobs:
         if: runner.os == 'Linux'
         run: DB=true gotestsum --junitfile="gotests.xml" --packages="./..." --
           -covermode=atomic -coverprofile="gotests.coverage" -timeout=3m
+          -coverpkg=./.,github.com/coder/coder/codersdk
           -count=1 -race -parallel=2 -failfast
 
       - name: Upload DataDog Trace
diff --git a/coderd/provisionerjobs_test.go b/coderd/provisionerjobs_test.go
@@ -97,4 +97,38 @@ func TestProvisionerJobLogs(t *testing.T) {
 		_, ok := <-logs
 		require.False(t, ok)
 	})
+
+	t.Run("List", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, nil)
+		user := coderdtest.CreateFirstUser(t, client)
+		coderdtest.NewProvisionerDaemon(t, client)
+		version := coderdtest.CreateProjectVersion(t, client, user.OrganizationID, &echo.Responses{
+			Parse: echo.ParseComplete,
+			Provision: []*proto.Provision_Response{{
+				Type: &proto.Provision_Response_Log{
+					Log: &proto.Log{
+						Level:  proto.LogLevel_INFO,
+						Output: "log-output",
+					},
+				},
+			}, {
+				Type: &proto.Provision_Response_Complete{
+					Complete: &proto.Provision_Complete{},
+				},
+			}},
+		})
+		project := coderdtest.CreateProject(t, client, user.OrganizationID, version.ID)
+		coderdtest.AwaitProjectVersionJob(t, client, version.ID)
+		workspace := coderdtest.CreateWorkspace(t, client, "me", project.ID)
+		build, err := client.CreateWorkspaceBuild(context.Background(), workspace.ID, coderd.CreateWorkspaceBuildRequest{
+			ProjectVersionID: project.ActiveVersionID,
+			Transition:       database.WorkspaceTransitionStart,
+		})
+		require.NoError(t, err)
+		coderdtest.AwaitWorkspaceBuildJob(t, client, build.ID)
+		logs, err := client.WorkspaceBuildLogsBefore(context.Background(), build.ID, time.Now())
+		require.NoError(t, err)
+		require.Len(t, logs, 1)
+	})
 }
diff --git a/develop.sh b/develop.sh
@@ -18,7 +18,7 @@ function create_initial_user() {
   curl -X POST \
     -d "{\"email\": \"$EMAIL\", \"username\": \"$USERNAME\", \"organization\": \"$ORGANIZATION\", \"password\": \"$PASSWORD\"}" \
     -H 'Content-Type:application/json' \
-    http://localhost:3000/api/v2/user
+    http://localhost:3000/api/v2/users/first
 }
 
 # Run yarn install, to make sure node_modules are ready to go
diff --git a/images/coder/run.sh b/images/coder/run.sh
@@ -17,7 +17,7 @@ function create_initial_user() {
   curl -X POST \
     -d '{"email": "'"$EMAIL"'", "username": "'"$USERNAME"'", "organization": "'"$ORGANIZATION"'", "password": "'"$PASSWORD"'"}' \
     -H 'Content-Type:application/json' \
-    "http://localhost:$PORT/api/v2/user"
+    "http://localhost:$PORT/api/v2/users/first"
 }
 
 # This is a way to run multiple processes in parallel, and have Ctrl-C work correctly
diff --git a/site/e2e/globalSetup.ts b/site/e2e/globalSetup.ts
@@ -11,7 +11,7 @@ const globalSetup = async (config: FullConfig): Promise<void> => {
   })
 
   // Create initial user
-  await context.post("/api/v2/user", {
+  await context.post("/api/v2/users/first", {
     data: {
       email,
       username,
diff --git a/site/pages/projects/index.tsx b/site/pages/projects/index.tsx
@@ -18,8 +18,8 @@ import { CodeExample } from "../../components/CodeExample/CodeExample"
 const ProjectsPage: React.FC = () => {
   const styles = useStyles()
   const { me, signOut } = useUser(true)
-  const { data: projects, error } = useSWR<Project[] | null, Error>("/api/v2/projects")
   const { data: orgs, error: orgsError } = useSWR<Organization[], Error>("/api/v2/users/me/organizations")
+  const { data: projects, error } = useSWR<Project[] | null, Error>(orgs ? `/api/v2/organizations/${orgs[0].id}/projects` : null)
 
   if (error) {
     return <ErrorSummary error={error} />

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ function create_initial_user() {`
`18`	`18`	`curl -X POST \`
`19`	`19`	`-d "{\"email\": \"$EMAIL\", \"username\": \"$USERNAME\", \"organization\": \"$ORGANIZATION\", \"password\": \"$PASSWORD\"}" \`
`20`	`20`	`-H 'Content-Type:application/json' \`
`21`		`- http://localhost:3000/api/v2/user`
	`21`	`+ http://localhost:3000/api/v2/users/first`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`# Run yarn install, to make sure node_modules are ready to go`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ function create_initial_user() {`
`17`	`17`	`curl -X POST \`
`18`	`18`	`-d '{"email": "'"$EMAIL"'", "username": "'"$USERNAME"'", "organization": "'"$ORGANIZATION"'", "password": "'"$PASSWORD"'"}' \`
`19`	`19`	`-H 'Content-Type:application/json' \`
`20`		`- "http://localhost:$PORT/api/v2/user"`
	`20`	`+ "http://localhost:$PORT/api/v2/users/first"`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`# This is a way to run multiple processes in parallel, and have Ctrl-C work correctly`