Merge branch 'update-to-weave-gitops-main' into track-released-oss

weaveworks · Sep 14, 2023 · fb6ec6f · fb6ec6f
2 parents 908faf5 + c108e93
commit fb6ec6f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -152,8 +152,7 @@ cmd/gitops/gitops: cmd/gitops/main.go $(shell find cmd/gitops -name "*.go")
 
 update-weave-gitops:
 	$(eval SHORTHASH := $(shell curl -q 'https://api.github.com/repos/weaveworks/weave-gitops/branches/$(BRANCH)' | jq -r '.commit.sha[:8]'))
-	go get -d github.com/weaveworks/weave-gitops@$(SHORTHASH)
-	go mod tidy
+	GOPRIVATE=github.com/weaveworks go get -d github.com/weaveworks/weave-gitops@$(SHORTHASH) && go mod tidy
 	$(eval NPM_VERSION := $(shell yarn info @weaveworks/weave-gitops-main time --json | jq -r '.data | keys | .[] | select(contains("$(SHORTHASH)"))'))
 	yarn add @weaveworks/weave-gitops@npm:@weaveworks/weave-gitops-main@$(NPM_VERSION)
 

diff --git a/test/acceptance/test/pages/clusters_page.go b/test/acceptance/test/pages/clusters_page.go
@@ -106,8 +106,8 @@ func GetClusterStatus(webDriver *agouti.Page) *ClusterStatus {
 
 func GetClusterInfrastructure(webDriver *agouti.Page) *ClusterInfrastructure {
 	return &ClusterInfrastructure{
-		Kind:       webDriver.FindByXPath(`//tr/td[.="Kind:"]/following-sibling::td`),
-		ApiVersion: webDriver.FindByButton(`//tr/td[.="APIVersion:"]/following-sibling::td`),
+		Kind:       webDriver.Find(`[data-testid="Kind"] :last-child`),
+		ApiVersion: webDriver.Find(`[data-testid="APIVersion"] :last-child`),
 	}
 }
 

diff --git a/ui/src/components/Terraform/__tests__/TerraformObjectDetail.test.tsx b/ui/src/components/Terraform/__tests__/TerraformObjectDetail.test.tsx
@@ -100,9 +100,9 @@ describe('TerraformObjectDetail', () => {
 
     const info = await screen.findByText('Suspended:');
 
-    const suspendedValue = info?.parentNode?.nextSibling?.textContent;
+    const suspendedValue = info?.parentNode?.textContent;
 
-    expect(suspendedValue).toEqual('False');
+    expect(suspendedValue).toEqual('Suspended:False');
 
     const button = await screen.findByText('Suspend');