Skip to content

Commit a90b669

Browse files
committed
fix: config tests
1 parent 81218d5 commit a90b669

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

config/config_test.go

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,26 @@ func prepareSeshConfig(t *testing.T) string {
3232

3333
err = os.WriteFile(tempConfigPath, []byte(fmt.Sprintf(`
3434
import = ["%s"]
35-
default_startup_script = "default"
35+
[default_session]
36+
startup_script = "default"
3637
37-
[[startup_scripts]]
38-
session_path = "~/dev/first_session"
39-
script_path = "~/.config/sesh/scripts/first_script"
38+
[[session]]
39+
path = "~/dev/first_session"
40+
startup_script = "~/.config/sesh/scripts/first_script"
4041
41-
[[startup_scripts]]
42-
session_path = "~/dev/second_session"
43-
script_path = "~/.config/sesh/scripts/second_script"
42+
[[session]]
43+
path = "~/dev/second_session"
44+
startup_script = "~/.config/sesh/scripts/second_script"
4445
`, secondTempConfigPath),
4546
), fs.ModePerm)
4647
if err != nil {
4748
t.Fatal(err)
4849
}
4950

5051
err = os.WriteFile(secondTempConfigPath, []byte(`
51-
[[startup_scripts]]
52-
session_path = "~/dev/third_session"
53-
script_path = "~/.config/sesh/scripts/third_script"
52+
[[session]]
53+
path = "~/dev/third_session"
54+
startup_script = "~/.config/sesh/scripts/third_script"
5455
`), fs.ModePerm)
5556
if err != nil {
5657
t.Fatal(err)
@@ -69,8 +70,8 @@ func TestParseConfigFile(t *testing.T) {
6970
fetcher := &mockConfigDirectoryFetcher{dir: userConfigPath}
7071
config := config.ParseConfigFile(fetcher)
7172

72-
if config.DefaultStartupScript != "default" {
73-
t.Errorf("Expected %s, got %s", "default", config.DefaultStartupScript)
73+
if config.DefaultSessionConfig.StartupScript != "default" {
74+
t.Errorf("Expected %s, got %s", "default", config.DefaultSessionConfig.StartupScript)
7475
}
7576

7677
if len(config.ImportPaths) != 1 {
@@ -80,26 +81,26 @@ func TestParseConfigFile(t *testing.T) {
8081
t.Errorf("Expected %s, got %s", path.Join(userConfigPath, "sesh", "sesh2.toml"), config.ImportPaths[0])
8182
}
8283

83-
if len(config.StartupScripts) != 3 {
84-
t.Errorf("Expected %d, got %d", 3, len(config.StartupScripts))
84+
if len(config.SessionConfigs) != 3 {
85+
t.Errorf("Expected %d, got %d", 3, len(config.SessionConfigs))
8586
}
86-
if config.StartupScripts[0].SessionPath != "~/dev/first_session" {
87-
t.Errorf("Expected %s, got %s", "~/dev/first_session", config.StartupScripts[0].SessionPath)
87+
if config.SessionConfigs[0].Path != "~/dev/first_session" {
88+
t.Errorf("Expected %s, got %s", "~/dev/first_session", config.SessionConfigs[0].Path)
8889
}
89-
if config.StartupScripts[0].ScriptPath != "~/.config/sesh/scripts/first_script" {
90-
t.Errorf("Expected %s, got %s", "~/.config/sesh/scripts/first_script", config.StartupScripts[0].ScriptPath)
90+
if config.SessionConfigs[0].StartupScript != "~/.config/sesh/scripts/first_script" {
91+
t.Errorf("Expected %s, got %s", "~/.config/sesh/scripts/first_script", config.SessionConfigs[0].StartupScript)
9192
}
92-
if config.StartupScripts[1].SessionPath != "~/dev/second_session" {
93-
t.Errorf("Expected %s, got %s", "~/dev/second_session", config.StartupScripts[1].SessionPath)
93+
if config.SessionConfigs[1].Path != "~/dev/second_session" {
94+
t.Errorf("Expected %s, got %s", "~/dev/second_session", config.SessionConfigs[1].Path)
9495
}
95-
if config.StartupScripts[1].ScriptPath != "~/.config/sesh/scripts/second_script" {
96-
t.Errorf("Expected %s, got %s", "~/.config/sesh/scripts/second_script", config.StartupScripts[1].ScriptPath)
96+
if config.SessionConfigs[1].StartupScript != "~/.config/sesh/scripts/second_script" {
97+
t.Errorf("Expected %s, got %s", "~/.config/sesh/scripts/second_script", config.SessionConfigs[1].StartupScript)
9798
}
98-
if config.StartupScripts[2].SessionPath != "~/dev/third_session" {
99-
t.Errorf("Expected %s, got %s", "~/dev/third_session", config.StartupScripts[2].SessionPath)
99+
if config.SessionConfigs[2].Path != "~/dev/third_session" {
100+
t.Errorf("Expected %s, got %s", "~/dev/third_session", config.SessionConfigs[2].Path)
100101
}
101-
if config.StartupScripts[2].ScriptPath != "~/.config/sesh/scripts/third_script" {
102-
t.Errorf("Expected %s, got %s", "~/.config/sesh/scripts/third_script", config.StartupScripts[2].ScriptPath)
102+
if config.SessionConfigs[2].StartupScript != "~/.config/sesh/scripts/third_script" {
103+
t.Errorf("Expected %s, got %s", "~/.config/sesh/scripts/third_script", config.SessionConfigs[2].StartupScript)
103104
}
104105
})
105106
}
@@ -158,7 +159,7 @@ func prepareSeshConfigForBench(b *testing.B, extended_configs_count int) string
158159

159160
func BenchmarkParseConfigFile(b *testing.B) {
160161
b.Skip("Skipping benchmark because it will be failing on CI")
161-
var table = []struct {
162+
table := []struct {
162163
input int
163164
}{
164165
{input: 1},
@@ -169,7 +170,6 @@ func BenchmarkParseConfigFile(b *testing.B) {
169170
}
170171

171172
for _, test := range table {
172-
173173
b.Run(fmt.Sprintf("ParseConfigFile_%d", test.input), func(b *testing.B) {
174174
userConfigPath := prepareSeshConfigForBench(b, test.input)
175175
defer os.Remove(userConfigPath)

0 commit comments

Comments
 (0)