From f563c2fe1729e4cb8ac88130acf97386c21dbece Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Mon, 30 Oct 2023 22:29:26 +0100
Subject: [PATCH] replace allow_any_instance

---
 service/test/agama/config_test.rb           | 16 ++++++----------
 service/test/agama/software/manager_test.rb |  2 +-
 service/test/test_helper.rb                 |  3 ++-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/service/test/agama/config_test.rb b/service/test/agama/config_test.rb
index b278be7ebb..ca6273a822 100644
--- a/service/test/agama/config_test.rb
+++ b/service/test/agama/config_test.rb
@@ -25,10 +25,6 @@
 describe Agama::Config do
   let(:config) { described_class.new("web" => { "ssl" => "SOMETHING" }) }
 
-  before do
-    allow_any_instance_of(Agama::ProductReader).to receive(:load_products).and_return([])
-  end
-
   describe ".load" do
     before do
       described_class.reset
@@ -91,7 +87,7 @@
 
   describe "#products" do
     it "returns products available for current hardware" do
-      allow_any_instance_of(Agama::ProductReader).to receive(:load_products).and_return(
+      allow(Agama::ProductReader).to receive(:new).and_return(double(load_products:
         [
           {
             "id"    => "test",
@@ -102,7 +98,7 @@
             "archs" => "s390x"
           }
         ]
-      )
+      ))
       expect(Yast2::ArchFilter).to receive(:from_string).twice.and_return(double(match?: true),
         double(match?: false))
       expect(subject.products.size).to eq 1
@@ -112,7 +108,7 @@
   describe "#multi_product?" do
     context "when more than one product is defined" do
       before do
-        allow_any_instance_of(Agama::ProductReader).to receive(:load_products).and_call_original
+        allow(Agama::ProductReader).to receive(:new).and_call_original
       end
 
       it "returns true" do
@@ -122,10 +118,10 @@
 
     context "when just one product is defined" do
       before do
-        allow_any_instance_of(Agama::ProductReader).to receive(:load_products).and_call_original
+        allow(Agama::ProductReader).to receive(:new).and_call_original
         products = Agama::ProductReader.new.load_products
-        allow_any_instance_of(Agama::ProductReader).to receive(:load_products)
-          .and_return([products.first])
+        allow(Agama::ProductReader).to receive(:new)
+          .and_return(double(load_products: [products.first]))
       end
 
       it "returns false" do
diff --git a/service/test/agama/software/manager_test.rb b/service/test/agama/software/manager_test.rb
index 5ef1cfc099..a932423199 100644
--- a/service/test/agama/software/manager_test.rb
+++ b/service/test/agama/software/manager_test.rb
@@ -81,7 +81,7 @@
     allow(Agama::DBus::Clients::Questions).to receive(:new).and_return(questions_client)
     allow(Agama::Software::RepositoriesManager).to receive(:new).and_return(repositories)
     allow(Agama::Software::Proposal).to receive(:new).and_return(proposal)
-    allow_any_instance_of(Agama::ProductReader).to receive(:load_products).and_call_original
+    allow(Agama::ProductReader).to receive(:new).and_call_original
   end
 
   describe "#probe" do
diff --git a/service/test/test_helper.rb b/service/test/test_helper.rb
index 1b611f9acd..4340322ca0 100644
--- a/service/test/test_helper.rb
+++ b/service/test/test_helper.rb
@@ -46,7 +46,8 @@ def require(path)
 
 RSpec.configure do |c|
   c.before do
-    allow_any_instance_of(Agama::ProductReader).to receive(:load_products).and_return([])
+    allow(Agama::ProductReader).to receive(:new)
+      .and_return(double(load_products: []))
   end
 end