actually run the portal... pt4, with anshul's fixes

Azure · Jun 20, 2023 · 9be4e6f · 9be4e6f
1 parent 8c0815c
commit 9be4e6f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -179,7 +179,7 @@ tunnel:
 	go run ./hack/tunnel $(shell az network public-ip show -g ${RESOURCEGROUP} -n rp-pip --query 'ipAddress')
 
 e2e.test:
-	go test ./test/e2e/... -tags e2e,codec.safe -c -ldflags "-X github.com/Azure/ARO-RP/pkg/util/version.GitCommit=$(VERSION)" -o e2e.test
+	go test ./test/e2e/e2e_test.go ./test/e2e/setup.go ./test/e2e/admin_portal.go -tags e2e,codec.safe -c -ldflags "-X github.com/Azure/ARO-RP/pkg/util/version.GitCommit=$(VERSION)" -o e2e.test
 
 e2etools:
 	CGO_ENABLED=0 go build -ldflags "-X github.com/Azure/ARO-RP/pkg/util/version.GitCommit=$(VERSION)" ./hack/cluster

diff --git a/test/e2e/admin_portal.go b/test/e2e/admin_portal.go
@@ -205,7 +205,7 @@ var _ = Describe("Admin Portal E2E Testing", func() {
 	})
 
 	It("Should be able to navigate to other regions", func() {
-		NUMBER_OF_REGIONS := 40
+		NUMBER_OF_REGIONS := 41
 		err := wd.WaitWithTimeout(conditions.ElementIsLocated(selenium.ByID, "RegionNavButton"), time.Second*30)
 		if err != nil {
 			SaveScreenshotAndExit(wd, err)
@@ -246,7 +246,7 @@ var _ = Describe("Admin Portal E2E Testing", func() {
 	})
 
 	It("Should open an error modal for an invalid resource ID parameter in the URL", func() {
-		wd.Get(host + "/v2" + "?resourceid=" + "invalidResourceId")
+		wd.Get(host + "/" + "?resourceid=" + "invalidResourceId")
 
 		wd.WaitWithTimeout(conditions.ElementIsLocated(selenium.ByCSSSelector, "div[role='document']"), time.Second*3)
 		errorModal, err := wd.FindElement(selenium.ByCSSSelector, "div[role='document']")
@@ -258,7 +258,7 @@ var _ = Describe("Admin Portal E2E Testing", func() {
 	})
 
 	It("Should display the correct cluster detail view for the resource ID parameter in the URL", func() {
-		wd.Get(host + "/v2" + "?resourceid=" + resourceIDFromEnv())
+		wd.Get(host + "/" + "?resourceid=" + resourceIDFromEnv())
 		wd.WaitWithTimeout(conditions.ElementIsLocated(selenium.ByID, "ClusterDetailPanel"), time.Second*3)
 
 		detailPanel, err := wd.FindElement(selenium.ByID, "ClusterDetailPanel")
@@ -268,7 +268,7 @@ var _ = Describe("Admin Portal E2E Testing", func() {
 
 		Expect(detailPanel.IsDisplayed()).To(BeTrue())
 
-		elem, err := wd.FindElement(selenium.ByCSSSelector, "div[class='titleText-109']")
+		elem, err := wd.FindElement(selenium.ByCSSSelector, "div[class='titleText-112']")
 		if err != nil {
 			SaveScreenshotAndExit(wd, err)
 		}