diff --git a/service/lib/agama/dbus/storage/manager.rb b/service/lib/agama/dbus/storage/manager.rb index 9034066bd7..6019320ef5 100644 --- a/service/lib/agama/dbus/storage/manager.rb +++ b/service/lib/agama/dbus/storage/manager.rb @@ -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 diff --git a/service/package/rubygem-agama-yast.changes b/service/package/rubygem-agama-yast.changes index 0d58f88f74..8d358c5ca1 100644 --- a/service/package/rubygem-agama-yast.changes +++ b/service/package/rubygem-agama-yast.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 26 13:54:28 UTC 2024 - José Iván López González + +- 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 diff --git a/service/test/agama/dbus/storage/manager_test.rb b/service/test/agama/dbus/storage/manager_test.rb index b0d79d6ff3..16a8896b03 100644 --- a/service/test/agama/dbus/storage/manager_test.rb +++ b/service/test/agama/dbus/storage/manager_test.rb @@ -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 @@ -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