Skip to content

Commit 7952854

Browse files
get that noise outta here
1 parent 657ced7 commit 7952854

File tree

1 file changed

+77
-23
lines changed

1 file changed

+77
-23
lines changed

crates/djls-conf/src/lib.rs

Lines changed: 77 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,14 @@ mod tests {
9696
fn test_load_no_files() {
9797
let dir = tempdir().unwrap();
9898
let settings = Settings::new(dir.path()).unwrap();
99-
// Should load defaults
99+
// Add assertions for future default fields here
100100
assert_eq!(
101101
settings,
102102
Settings {
103103
debug: false,
104104
venv_path: None
105105
}
106106
);
107-
// Add assertions for future default fields here
108107
}
109108
}
110109

@@ -120,7 +119,7 @@ mod tests {
120119
settings,
121120
Settings {
122121
debug: true,
123-
..Default::default() // Use default for venv_path and future fields
122+
..Default::default()
124123
}
125124
);
126125
}
@@ -151,8 +150,13 @@ mod tests {
151150
let dir = tempdir().unwrap();
152151
fs::write(dir.path().join(".djls.toml"), "debug = true").unwrap();
153152
let settings = Settings::new(dir.path()).unwrap();
154-
// Change this assertion:
155-
assert_eq!(settings, Settings { debug: true, ..Default::default() });
153+
assert_eq!(
154+
settings,
155+
Settings {
156+
debug: true,
157+
..Default::default()
158+
}
159+
);
156160
}
157161

158162
#[test]
@@ -162,8 +166,13 @@ mod tests {
162166
let content = "[tool.djls]\ndebug = true\n";
163167
fs::write(dir.path().join("pyproject.toml"), content).unwrap();
164168
let settings = Settings::new(dir.path()).unwrap();
165-
// Change this assertion:
166-
assert_eq!(settings, Settings { debug: true, ..Default::default() });
169+
assert_eq!(
170+
settings,
171+
Settings {
172+
debug: true,
173+
..Default::default()
174+
}
175+
);
167176
}
168177
}
169178

@@ -176,8 +185,14 @@ mod tests {
176185
fs::write(dir.path().join(".djls.toml"), "debug = false").unwrap();
177186
fs::write(dir.path().join("djls.toml"), "debug = true").unwrap();
178187
let settings = Settings::new(dir.path()).unwrap();
179-
// Change this assertion:
180-
assert_eq!(settings, Settings { debug: true, ..Default::default() }); // djls.toml wins
188+
// djls.toml wins
189+
assert_eq!(
190+
settings,
191+
Settings {
192+
debug: true,
193+
..Default::default()
194+
}
195+
);
181196
}
182197

183198
#[test]
@@ -187,8 +202,14 @@ mod tests {
187202
fs::write(dir.path().join("pyproject.toml"), pyproject_content).unwrap();
188203
fs::write(dir.path().join(".djls.toml"), "debug = true").unwrap();
189204
let settings = Settings::new(dir.path()).unwrap();
190-
// Change this assertion:
191-
assert_eq!(settings, Settings { debug: true, ..Default::default() }); // .djls.toml wins
205+
// .djls.toml wins
206+
assert_eq!(
207+
settings,
208+
Settings {
209+
debug: true,
210+
..Default::default()
211+
}
212+
);
192213
}
193214

194215
#[test]
@@ -199,8 +220,14 @@ mod tests {
199220
fs::write(dir.path().join(".djls.toml"), "debug = false").unwrap();
200221
fs::write(dir.path().join("djls.toml"), "debug = true").unwrap();
201222
let settings = Settings::new(dir.path()).unwrap();
202-
// Change this assertion:
203-
assert_eq!(settings, Settings { debug: true, ..Default::default() }); // djls.toml wins
223+
// djls.toml wins
224+
assert_eq!(
225+
settings,
226+
Settings {
227+
debug: true,
228+
..Default::default()
229+
}
230+
);
204231
}
205232

206233
#[test]
@@ -214,8 +241,14 @@ mod tests {
214241

215242
let settings =
216243
Settings::load_from_paths(project_dir.path(), Some(&user_conf_path)).unwrap();
217-
// Change this assertion:
218-
assert_eq!(settings, Settings { debug: false, ..Default::default() }); // pyproject.toml overrides user
244+
// pyproject.toml overrides user
245+
assert_eq!(
246+
settings,
247+
Settings {
248+
debug: false,
249+
..Default::default()
250+
}
251+
);
219252
}
220253

221254
#[test]
@@ -228,8 +261,14 @@ mod tests {
228261

229262
let settings =
230263
Settings::load_from_paths(project_dir.path(), Some(&user_conf_path)).unwrap();
231-
// Change this assertion:
232-
assert_eq!(settings, Settings { debug: false, ..Default::default() }); // djls.toml overrides user
264+
// djls.toml overrides user
265+
assert_eq!(
266+
settings,
267+
Settings {
268+
debug: false,
269+
..Default::default()
270+
}
271+
);
233272
}
234273
}
235274

@@ -245,8 +284,13 @@ mod tests {
245284

246285
let settings =
247286
Settings::load_from_paths(project_dir.path(), Some(&user_conf_path)).unwrap();
248-
// Change this assertion:
249-
assert_eq!(settings, Settings { debug: true, ..Default::default() });
287+
assert_eq!(
288+
settings,
289+
Settings {
290+
debug: true,
291+
..Default::default()
292+
}
293+
);
250294
}
251295

252296
#[test]
@@ -260,8 +304,13 @@ mod tests {
260304
// Should load project settings fine, ignoring non-existent user config
261305
let settings =
262306
Settings::load_from_paths(project_dir.path(), Some(&user_conf_path)).unwrap();
263-
// Change this assertion:
264-
assert_eq!(settings, Settings { debug: true, ..Default::default() });
307+
assert_eq!(
308+
settings,
309+
Settings {
310+
debug: true,
311+
..Default::default()
312+
}
313+
);
265314
}
266315

267316
#[test]
@@ -272,8 +321,13 @@ mod tests {
272321

273322
// Call helper with None for user path
274323
let settings = Settings::load_from_paths(project_dir.path(), None).unwrap();
275-
// Change this assertion:
276-
assert_eq!(settings, Settings { debug: true, ..Default::default() });
324+
assert_eq!(
325+
settings,
326+
Settings {
327+
debug: true,
328+
..Default::default()
329+
}
330+
);
277331
}
278332
}
279333

0 commit comments

Comments
 (0)