From 4d5e59dc6c45fa9b6bce6f46208ed425f68875bd Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 26 Aug 2022 22:43:46 +0200 Subject: [PATCH 1/2] fix test for package dialog --- library/packages/test/package_test.rb | 39 +++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/library/packages/test/package_test.rb b/library/packages/test/package_test.rb index 3a6c4970d..e68ce78e5 100644 --- a/library/packages/test/package_test.rb +++ b/library/packages/test/package_test.rb @@ -25,6 +25,11 @@ describe Yast::Package do subject { Yast::Package } + before do + # reset cache + subject.instance_variable_set(:@transactional, nil) + end + describe "#CheckAndInstallPackages" do let(:installed) { false } @@ -361,6 +366,35 @@ allow(Yast::Mode).to receive(:commandline).and_return(commandline) allow(Yast::CommandLine).to receive(:Interactive).and_return(interactive) allow(Yast::Popup).to receive(:AnyQuestionRichText).and_return(confirm) + + allow(Yast::SCR).to receive(:Read).and_return( + [{ + "file" => "/", + "freq" => 0, + "mntops" => "rw,relatime", + "passno" => 0, + "spec" => "/dev/nvme0n1p2", + "vfstype" => "ext4" + }] + ) + end + + context "when run on transactional system" do + it "shows popup and abort" do + allow(Yast::SCR).to receive(:Read).and_return( + [{ + "file" => "/", + "freq" => 0, + "mntops" => "ro,relatime", + "passno" => 0, + "spec" => "/dev/nvme0n1p2", + "vfstype" => "ext4" + }] + ) + + expect(Yast::Popup).to receive(:LongMessage) + expect{subject.PackageDialog(packages, true, nil)}.to raise_error(Yast::AbortException) + end end context "when installing packages" do @@ -560,11 +594,6 @@ end describe "#IsTransactionalSystem" do - before do - # reset cache - subject.instance_variable_set(:@transactional, nil) - end - it "returns false if system is not transactional" do allow(Yast::SCR).to receive(:Read).and_return( [{ From 6e6fc5a0eed0d39f57b37e39a3f190942b278a2b Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 26 Aug 2022 22:48:35 +0200 Subject: [PATCH 2/2] happy rubocop --- library/packages/test/package_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/packages/test/package_test.rb b/library/packages/test/package_test.rb index e68ce78e5..15ff2879c 100644 --- a/library/packages/test/package_test.rb +++ b/library/packages/test/package_test.rb @@ -393,7 +393,7 @@ ) expect(Yast::Popup).to receive(:LongMessage) - expect{subject.PackageDialog(packages, true, nil)}.to raise_error(Yast::AbortException) + expect { subject.PackageDialog(packages, true, nil) }.to raise_error(Yast::AbortException) end end