replace allow_any_instance

agama-project · Oct 30, 2023 · f563c2f · f563c2f
1 parent c3932bc
commit f563c2f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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