From 96fb1bebd93d55273bff52d97625f758ce512bc3 Mon Sep 17 00:00:00 2001
From: crapStone <crapstone01@gmail.com>
Date: Fri, 17 Nov 2023 23:38:42 +0100
Subject: [PATCH] fix pages-branch option

---
 config/setup.go      | 3 +++
 config/setup_test.go | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/config/setup.go b/config/setup.go
index 1cfa6ee..83e1049 100644
--- a/config/setup.go
+++ b/config/setup.go
@@ -62,6 +62,9 @@ func mergeServerConfig(ctx *cli.Context, config *ServerConfig) {
 	if ctx.IsSet("raw-domain") {
 		config.RawDomain = ctx.String("raw-domain")
 	}
+	if ctx.IsSet("pages-branch") {
+		config.PagesBranches = ctx.StringSlice("pages-branch")
+	}
 	if ctx.IsSet("allowed-cors-domains") {
 		config.AllowedCorsDomains = ctx.StringSlice("allowed-cors-domains")
 	}
diff --git a/config/setup_test.go b/config/setup_test.go
index 975071a..b04598f 100644
--- a/config/setup_test.go
+++ b/config/setup_test.go
@@ -88,6 +88,7 @@ func TestMergeConfigShouldReplaceAllExistingValuesGivenAllArgsExist(t *testing.T
 					HttpServerEnabled:  false,
 					MainDomain:         "original",
 					RawDomain:          "original",
+					PagesBranches:      []string{"original"},
 					AllowedCorsDomains: []string{"original"},
 					BlacklistedPaths:   []string{"original"},
 				},
@@ -126,6 +127,7 @@ func TestMergeConfigShouldReplaceAllExistingValuesGivenAllArgsExist(t *testing.T
 					HttpServerEnabled:  true,
 					MainDomain:         "changed",
 					RawDomain:          "changed",
+					PagesBranches:      []string{"changed"},
 					AllowedCorsDomains: []string{"changed"},
 					BlacklistedPaths:   append([]string{"changed"}, ALWAYS_BLACKLISTED_PATHS...),
 				},
@@ -164,6 +166,7 @@ func TestMergeConfigShouldReplaceAllExistingValuesGivenAllArgsExist(t *testing.T
 			"--raw-domain", "changed",
 			"--allowed-cors-domains", "changed",
 			"--blacklisted-paths", "changed",
+			"--pages-branch", "changed",
 			"--host", "changed",
 			"--port", "8443",
 			"--http-port", "443",
@@ -266,6 +269,7 @@ func TestMergeServerConfigShouldReplaceOnlyOneValueExistingValueGivenOnlyOneArgE
 		{args: []string{"--enable-http-server"}, callback: func(sc *ServerConfig) { sc.HttpServerEnabled = true }},
 		{args: []string{"--pages-domain", "changed"}, callback: func(sc *ServerConfig) { sc.MainDomain = "changed" }},
 		{args: []string{"--raw-domain", "changed"}, callback: func(sc *ServerConfig) { sc.RawDomain = "changed" }},
+		{args: []string{"--pages-branch", "changed"}, callback: func(sc *ServerConfig) { sc.PagesBranches = []string{"changed"} }},
 		{args: []string{"--allowed-cors-domains", "changed"}, callback: func(sc *ServerConfig) { sc.AllowedCorsDomains = []string{"changed"} }},
 		{args: []string{"--blacklisted-paths", "changed"}, callback: func(sc *ServerConfig) { sc.BlacklistedPaths = []string{"changed"} }},
 	}
@@ -281,6 +285,7 @@ func TestMergeServerConfigShouldReplaceOnlyOneValueExistingValueGivenOnlyOneArgE
 					HttpServerEnabled:  false,
 					MainDomain:         "original",
 					RawDomain:          "original",
+					PagesBranches:      []string{"original"},
 					AllowedCorsDomains: []string{"original"},
 					BlacklistedPaths:   []string{"original"},
 				}
@@ -289,6 +294,7 @@ func TestMergeServerConfigShouldReplaceOnlyOneValueExistingValueGivenOnlyOneArgE
 				pair.callback(&expectedConfig)
 				expectedConfig.BlacklistedPaths = append(expectedConfig.BlacklistedPaths, ALWAYS_BLACKLISTED_PATHS...)
 
+				expectedConfig.PagesBranches = fixArrayFromCtx(ctx, "pages-branch", expectedConfig.PagesBranches)
 				expectedConfig.AllowedCorsDomains = fixArrayFromCtx(ctx, "allowed-cors-domains", expectedConfig.AllowedCorsDomains)
 				expectedConfig.BlacklistedPaths = fixArrayFromCtx(ctx, "blacklisted-paths", expectedConfig.BlacklistedPaths)