diff --git a/library/general/test/data/ay_profile.xml b/library/general/test/data/ay_profile.xml deleted file mode 100644 index 17fda3434..000000000 --- a/library/general/test/data/ay_profile.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - true - 10 - true - - - true - 20 - true - - - true - 40 - true - - - diff --git a/library/general/test/data/ay_profile.yml b/library/general/test/data/ay_profile.yml new file mode 100644 index 000000000..f820b049f --- /dev/null +++ b/library/general/test/data/ay_profile.yml @@ -0,0 +1,13 @@ +--- +"errors": + log: true + show: true + timeout: 10 +"warnings": + log: true + show: true + timeout: 20 +"yesno_messages": + log: true + show: true + timeout: 40 \ No newline at end of file diff --git a/library/general/test/report_test.rb b/library/general/test/report_test.rb index 3084c2ff8..6355d2f19 100755 --- a/library/general/test/report_test.rb +++ b/library/general/test/report_test.rb @@ -5,7 +5,6 @@ Yast.import "Report" Yast.import "Mode" -Yast.import "Profile" describe Yast::Report do before { subject.ClearAll } @@ -127,7 +126,7 @@ describe ".Settings" do DATA_PATH = File.join(File.dirname(__FILE__), 'data') - let(:ay_profile) { File.join(DATA_PATH, 'ay_profile.xml') } + let(:ay_profile) { File.join(DATA_PATH, 'ay_profile.yml') } let(:default_normal) { File.join(DATA_PATH, 'default_normal_installation.yml') } let(:default_ay) { File.join(DATA_PATH, 'default_ay_installation.yml') } let(:result_ay) { File.join(DATA_PATH, 'ay_installation.yml') } @@ -143,7 +142,6 @@ context "while AutoYaST installation" do before(:each) do - Yast::Profile.ReadXML(ay_profile) Yast::Mode.SetMode("autoinstallation") subject.main() end @@ -159,7 +157,8 @@ end it "set flags via AutoYaST profile" do result_map = YAML.load_file(result_ay) - subject.Import(Yast::Profile.current["report"]) + ay_map = YAML.load_file(ay_profile) + subject.Import(ay_map) expect(subject.Export()).to match(result_map) end end