15424: Add WelcomePageHTML to config, with default text

[arvados.git] / lib / controller / handler_test.go

diff --git a/lib/controller/handler_test.go b/lib/controller/handler_test.go
index 9b0ff2764be620bd847dc03c2da2f0848b008f07..d34df7f2c45918103949300ca6619027696b757f 100644 (file)
--- a/lib/controller/handler_test.go
+++ b/lib/controller/handler_test.go
@@ -19,12 +19,17 @@ import (
        "git.curoverse.com/arvados.git/sdk/go/arvadostest"
        "git.curoverse.com/arvados.git/sdk/go/ctxlog"
        "git.curoverse.com/arvados.git/sdk/go/httpserver"
+       "github.com/prometheus/client_golang/prometheus"
        check "gopkg.in/check.v1"
 )
 
+var enableBetaController14287 bool
+
 // Gocheck boilerplate
 func Test(t *testing.T) {
-       check.TestingT(t)
+       for _, enableBetaController14287 = range []bool{false, true} {
+               check.TestingT(t)
+       }
 }
 
 var _ = check.Suite(&HandlerSuite{})
@@ -42,11 +47,13 @@ func (s *HandlerSuite) SetUpTest(c *check.C) {
        s.cluster = &arvados.Cluster{
                ClusterID:  "zzzzz",
                PostgreSQL: integrationTestCluster().PostgreSQL,
+
+               EnableBetaController14287: enableBetaController14287,
        }
        s.cluster.TLS.Insecure = true
        arvadostest.SetServiceURL(&s.cluster.Services.RailsAPI, "https://"+os.Getenv("ARVADOS_TEST_API_HOST"))
        arvadostest.SetServiceURL(&s.cluster.Services.Controller, "http://localhost:/")
-       s.handler = newHandler(s.ctx, s.cluster, "")
+       s.handler = newHandler(s.ctx, s.cluster, "", prometheus.NewRegistry())
 }
 
 func (s *HandlerSuite) TearDownTest(c *check.C) {
@@ -62,6 +69,9 @@ func (s *HandlerSuite) TestConfigExport(c *check.C) {
        resp := httptest.NewRecorder()
        s.handler.ServeHTTP(resp, req)
        c.Check(resp.Code, check.Equals, http.StatusOK)
+       c.Check(resp.Header().Get("Access-Control-Allow-Origin"), check.Equals, `*`)
+       c.Check(resp.Header().Get("Access-Control-Allow-Methods"), check.Matches, `.*\bGET\b.*`)
+       c.Check(resp.Header().Get("Access-Control-Allow-Headers"), check.Matches, `.+`)
        var cluster arvados.Cluster
        c.Log(resp.Body.String())
        err := json.Unmarshal(resp.Body.Bytes(), &cluster)