Skip to content

Commit

Permalink
module Profile removed
Browse files Browse the repository at this point in the history
  • Loading branch information
schubi2 committed Aug 25, 2016
1 parent 8ec9e99 commit 35f432a
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 25 deletions.
21 changes: 0 additions & 21 deletions library/general/test/data/ay_profile.xml

This file was deleted.

13 changes: 13 additions & 0 deletions library/general/test/data/ay_profile.yml
Original file line number Diff line number Diff line change
@@ -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
7 changes: 3 additions & 4 deletions library/general/test/report_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

Yast.import "Report"
Yast.import "Mode"
Yast.import "Profile"

describe Yast::Report do
before { subject.ClearAll }
Expand Down Expand Up @@ -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') }
Expand All @@ -143,7 +142,6 @@

context "while AutoYaST installation" do
before(:each) do
Yast::Profile.ReadXML(ay_profile)
Yast::Mode.SetMode("autoinstallation")
subject.main()
end
Expand All @@ -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
Expand Down

0 comments on commit 35f432a

Please sign in to comment.