aboutsummaryrefslogtreecommitdiffstats
path: root/modules/setting
diff options
context:
space:
mode:
Diffstat (limited to 'modules/setting')
-rw-r--r--modules/setting/actions.go2
-rw-r--r--modules/setting/cron_test.go53
2 files changed, 54 insertions, 1 deletions
diff --git a/modules/setting/actions.go b/modules/setting/actions.go
index 8bace1f750..34346b62cf 100644
--- a/modules/setting/actions.go
+++ b/modules/setting/actions.go
@@ -24,7 +24,7 @@ var (
ZombieTaskTimeout time.Duration `ini:"ZOMBIE_TASK_TIMEOUT"`
EndlessTaskTimeout time.Duration `ini:"ENDLESS_TASK_TIMEOUT"`
AbandonedJobTimeout time.Duration `ini:"ABANDONED_JOB_TIMEOUT"`
- SkipWorkflowStrings []string `ìni:"SKIP_WORKFLOW_STRINGS"`
+ SkipWorkflowStrings []string `ini:"SKIP_WORKFLOW_STRINGS"`
}{
Enabled: true,
DefaultActionsURL: defaultActionsURLGitHub,
diff --git a/modules/setting/cron_test.go b/modules/setting/cron_test.go
index 39a228068a..53996b5de9 100644
--- a/modules/setting/cron_test.go
+++ b/modules/setting/cron_test.go
@@ -41,3 +41,56 @@ EXTEND = true
assert.Equal(t, "white rabbit", extended.Second)
assert.True(t, extended.Extend)
}
+
+// Test_getCronSettings2 tests that getCronSettings can not handle two levels of embedding
+func Test_getCronSettings2(t *testing.T) {
+ type BaseStruct struct {
+ Enabled bool
+ RunAtStart bool
+ Schedule string
+ }
+
+ type Extended struct {
+ BaseStruct
+ Extend bool
+ }
+ type Extended2 struct {
+ Extended
+ Third string
+ }
+
+ iniStr := `
+[cron.test]
+ENABLED = TRUE
+RUN_AT_START = TRUE
+SCHEDULE = @every 1h
+EXTEND = true
+THIRD = white rabbit
+`
+ cfg, err := NewConfigProviderFromData(iniStr)
+ assert.NoError(t, err)
+
+ extended := &Extended2{
+ Extended: Extended{
+ BaseStruct: BaseStruct{
+ Enabled: false,
+ RunAtStart: false,
+ Schedule: "@every 72h",
+ },
+ Extend: false,
+ },
+ Third: "black rabbit",
+ }
+
+ _, err = getCronSettings(cfg, "test", extended)
+ assert.NoError(t, err)
+
+ // This confirms the first level of embedding works
+ assert.Equal(t, "white rabbit", extended.Third)
+ assert.True(t, extended.Extend)
+
+ // This confirms 2 levels of embedding doesn't work
+ assert.False(t, extended.Enabled)
+ assert.False(t, extended.RunAtStart)
+ assert.Equal(t, "@every 72h", extended.Schedule)
+}