Skip to content

fix(storage): generate JSON using pretty format #1387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joseivanlopez merged 1 commit into from
Jun 26, 2024
Merged

fix(storage): generate JSON using pretty format #1387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion service/lib/agama/dbus/storage/manager.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def apply_storage_config(serialized_config)
#
# @return [String]
def serialized_storage_config
@serialized_storage_config || generate_storage_config.to_json
@serialized_storage_config || JSON.pretty_generate(generate_storage_config)
end

def install
Expand Down
6 changes: 6 additions & 0 deletions service/package/rubygem-agama-yast.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 26 13:54:28 UTC 2024 - José Iván López González <jlopez@suse.com>

- Generate JSON storage settings using pretty format
(gh#openSUSE/agama#1387).

-------------------------------------------------------------------
Wed Jun 26 10:32:08 UTC 2024 - José Iván López González <jlopez@suse.com>

Expand Down
8 changes: 6 additions & 2 deletions service/test/agama/dbus/storage/manager_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,10 +522,14 @@
end

describe "#serialized_storage_config" do
def pretty_json(value)
JSON.pretty_generate(value)
end

context "if the storage config has not been set yet" do
context "and a proposal has not been calculated" do
it "returns serialized empty storage config" do
expect(subject.serialized_storage_config).to eq({}.to_json)
expect(subject.serialized_storage_config).to eq(pretty_json({}))
end
end

Expand All @@ -547,7 +551,7 @@
}
}

expect(subject.serialized_storage_config).to eq(expected_config.to_json)
expect(subject.serialized_storage_config).to eq(pretty_json(expected_config))
end
end
end
Expand Down