Skip to content

Commit 9114905

Browse files
Use serde_json instead of json to get browser-ui-test version
1 parent a7aaef1 commit 9114905

File tree

3 files changed

+12
-20
lines changed

3 files changed

+12
-20
lines changed

Cargo.lock

Lines changed: 0 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ ammonia = { version = "4.0.0", optional = true }
5959

6060
[dev-dependencies]
6161
assert_cmd = "2.0.11"
62-
json = "0.12.4"
6362
predicates = "3.0.3"
6463
select = "0.6.0"
6564
semver = "1.0.17"

tests/gui/runner.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use serde_json::Value;
12
use std::collections::HashSet;
23
use std::env::current_dir;
34
use std::fs::{read_dir, read_to_string, remove_dir_all};
@@ -28,18 +29,17 @@ fn get_available_browser_ui_test_version() -> Option<String> {
2829

2930
fn expected_browser_ui_test_version() -> String {
3031
let content = read_to_string("package.json").expect("failed to read `package.json`");
31-
let json = json::parse(&content).expect("invalid JSON");
32-
if let json::JsonValue::Object(obj) = json {
33-
if let Some(json::JsonValue::Object(deps)) = obj.get("dependencies") {
34-
if let Some(version) = deps
35-
.get("browser-ui-test")
36-
.and_then(|version| version.as_str())
37-
{
38-
return version.trim().to_string();
39-
}
40-
}
41-
}
42-
panic!("failed to retrieved `browser-ui-test` version");
32+
let v: Value = serde_json::from_str(&content).expect("failed to parse `package.json`");
33+
let Some(dependencies) = v.get("dependencies") else {
34+
panic!("Missing `dependencies` key in `package.json`");
35+
};
36+
let Some(browser_ui_test) = dependencies.get("browser-ui-test") else {
37+
panic!("Missing `browser-ui-test` key in \"dependencies\" object in `package.json`");
38+
};
39+
let Value::String(version) = browser_ui_test else {
40+
panic!("`browser-ui-test` version is not a string");
41+
};
42+
version.trim().to_string()
4343
}
4444

4545
fn main() {

0 commit comments

Comments
 (0)