Cleanup UI integration tests (#2055)

* Deleted UI integration test directory

* Deleted runner Describe from all specs

* Delete all testrunner references and updated with standard function calls

* Changed test-suite puplic functions to private as they are not referenced outside of package

* Updated acceptance test lables because no more UI integration exclusion is needed

Author: saeedfazal

.github/workflows/nightly.yaml

@@ -24,7 +24,7 @@ jobs:
       runs-on: ubuntu-latest
       os-name: linux
       timeout-minutes: 120
-      label-filter: "--label-filter='!(smoke, upgrade)'"
+      label-filter: "--label-filter='!(smoke, upgrade&&(cluster))'"
       kubectl-version: "v1.23.3"
       login_user_type: "oidc"
       git-provider: gitlab
@@ -56,7 +56,7 @@ jobs:
       runs-on: ubuntu-latest
       os-name: linux
       timeout-minutes: 90
-      label-filter: "--label-filter='!(capd, upgrade, kind-gitops-cluster, leaf-application, leaf-policy, leaf-violation)'"
+      label-filter: "--label-filter='!(smoke, capd, upgrade&&(cluster), leaf-cluster, leaf-application, leaf-policy, leaf-violation)'"
       kubectl-version: "v1.23.6"
       login_user_type: "oidc"
       git-provider: github
@@ -87,7 +87,7 @@ jobs:
       runs-on: ubuntu-latest
       os-name: linux
       timeout-minutes: 90
-      label-filter: "--label-filter='!(upgrade, capd, kind-gitops-cluster, tenant, leaf-application, leaf-policy, leaf-violation)'"
+      label-filter: "--label-filter='!(smoke, upgrade&&(cluster), capd, tenant, leaf-cluster, leaf-application, leaf-policy, leaf-violation)'"
       kubectl-version: "v1.23.3"
       login_user_type: "cluster-user"
       git-provider: gitlab

test/acceptance/test/acceptance_suite_test.go

@@ -11,16 +11,16 @@ import (
 var theT *testing.T
 
 func GomegaFail(message string, callerSkip ...int) {
-	randID := RandString(16)
+	randID := randString(16)
 	logger.Error("Spec has failed, capturing failure...")
-	logger.Tracef("Dumping artifacts to %s with prefix %s", artifacts_base_dir, randID)
+	logger.Tracef("Dumping artifacts to %s with prefix %s", artifactsBaseDir, randID)
 
-	TakeScreenShot(randID) //Save the screenshot of failure
-	DumpingDOM(randID)
-	DumpBrowserLogs(randID)
-	DumpResources(randID)
-	DumpClusterInfo(randID)
-	DumpConfigRepo(randID)
+	takeScreenShot(randID) //Save the screenshot of failure
+	dumpingDOM(randID)
+	dumpBrowserLogs(randID)
+	dumpResources(randID)
+	dumpClusterInfo(randID)
+	dumpConfigRepo(randID)
 
 	//Pass this down to the default handler for onward processing
 	ginkgo.Fail(message, callerSkip...)
@@ -35,21 +35,15 @@ func TestAcceptance(t *testing.T) {
 	//Intercept the assertiona Failure
 	gomega.RegisterFailHandler(GomegaFail)
 
-	// Runs the UI tests
-	DescribeSpecsUi(RealGitopsTestRunner{})
-	// Runs the CLI tests
-	DescribeSpecsCli(RealGitopsTestRunner{})
-
 	ginkgo.RunSpecs(t, "Weave GitOps Enterprise Acceptance Tests")
-
 }
 
 var _ = ginkgo.BeforeSuite(func() {
 	gomega.SetDefaultEventuallyTimeout(ASSERTION_DEFAULT_TIME_OUT) // Things are slow when running on Kind
-	SetupTestEnvironment()                                         // Read OS environment variables and initialize the test environment
-	InitializeLogger("acceptance-tests.log")                       // Initilaize the global logger and tee Ginkgowriter
-	InstallWeaveGitopsControllers()                                // Install weave gitops core and enterprise controllers
-	InitializeWebdriver(test_ui_url)                               // Initilize web driver for whole test suite run
+	setupTestEnvironment()                                         // Read OS environment variables and initialize the test environment
+	initializeLogger("acceptance-tests.log")                       // Initilaize the global logger and tee Ginkgowriter
+	installWeaveGitopsControllers()                                // Install weave gitops core and enterprise controllers
+	initializeWebdriver(testUiUrl)                                 // Initilize web driver for whole test suite run
 
 	ginkgo.By(fmt.Sprintf("Login as a %s user", userCredentials.UserType), func() {
 		loginUser() // Login to the weaveworks enterprise dashboard
@@ -59,14 +53,14 @@ var _ = ginkgo.BeforeSuite(func() {
 		}
 	})
 
-	CheckClusterService(wge_endpoint_url) // Cluster service should be running before running any test for enterprise
+	checkClusterService(wgeEndpointUrl) // Cluster service should be running before running any test for enterprise
 })
 
 var _ = ginkgo.AfterSuite(func() {
 	//Tear down the suite level setup
 	ginkgo.By(fmt.Sprintf("Logout as a %s user", userCredentials.UserType), func() {
-		gomega.Expect(webDriver.Navigate(test_ui_url)).To(gomega.Succeed()) // Make sure the UI should not has any popups and modal dialogs
-		logoutUser()                                                        // Logout to the weaveworks enterprise
+		gomega.Expect(webDriver.Navigate(testUiUrl)).To(gomega.Succeed()) // Make sure the UI should not has any popups and modal dialogs
+		logoutUser()                                                      // Logout to the weaveworks enterprise
 	})
 
 	deleteRepo(gitProviderEnv) // Delete the config repository to keep the org clean