Simplify tests using let :architecture

yast · Mar 18, 2019 · f8195d2 · f8195d2
1 parent c1bfdfe
commit f8195d2
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 31 deletions.
diff --git a/test/y2storage/autoinst_profile/drive_section_test.rb b/test/y2storage/autoinst_profile/drive_section_test.rb
@@ -409,10 +409,9 @@ def lvm_vg(name)
     end
 
     context "given a bcache" do
-      before do
-        allow(Yast::Arch).to receive(:x86_64).and_return("x86_64")
-        fake_scenario("btrfs_bcache.xml")
-      end
+      let(:architecture) { :x86_64 }
+
+      before { fake_scenario("btrfs_bcache.xml") }
 
       it "initializes #type to :CT_BCACHE" do
         expect(described_class.new_from_storage(device("bcache0")).type).to eq :CT_BCACHE

diff --git a/test/y2storage/autoinst_profile/partition_section_test.rb b/test/y2storage/autoinst_profile/partition_section_test.rb
@@ -30,12 +30,9 @@
   subject(:section) { described_class.new }
 
   let(:scenario) { "autoyast_drive_examples" }
-  let(:arch) { "x86_64" }
+  let(:architecture) { :x86_64 }
 
-  before do
-    allow(Yast::Arch).to receive(:architecture).and_return(arch)
-    fake_scenario(scenario)
-  end
+  before { fake_scenario(scenario) }
 
   include_examples "autoinst section"
 
@@ -102,10 +99,6 @@ def section_for(name)
         let(:scenario) { "btrfs_bcache.xml" }
         let(:dev) { device("vdb") }
 
-        before do
-          allow(Yast::Arch).to receive(:x86_64).and_return("x86_64")
-        end
-
         it "initializes #bcache_backing_for" do
           section = described_class.new_from_storage(dev)
           expect(section.bcache_backing_for).to eq("/dev/bcache0")
@@ -116,10 +109,6 @@ def section_for(name)
         let(:scenario) { "btrfs_bcache.xml" }
         let(:dev) { device("vda3") }
 
-        before do
-          allow(Yast::Arch).to receive(:x86_64).and_return("x86_64")
-        end
-
         it "initializes #bcache_caching_for" do
           section = described_class.new_from_storage(dev)
           expect(section.bcache_caching_for).to eq(["/dev/bcache0"])

diff --git a/test/y2storage/autoinst_proposal_bcache_test.rb b/test/y2storage/autoinst_proposal_bcache_test.rb
@@ -33,10 +33,10 @@
   end
 
   let(:issues_list) { Y2Storage::AutoinstIssues::List.new }
+  let(:architecture) { :x86_64 }
 
   before do
     allow(Yast::Mode).to receive(:auto).and_return(true)
-    allow(Yast::Arch).to receive(:architecture).and_return("x86_64")
   end
 
   describe "#propose" do

diff --git a/test/y2storage/proposal/autoinst_bcache_planner_test.rb b/test/y2storage/proposal/autoinst_bcache_planner_test.rb
@@ -26,18 +26,15 @@
 require "y2storage/autoinst_issues/list"
 require "y2storage/autoinst_profile/drive_section"
 
-Yast.import "Arch"
-
 describe Y2Storage::Proposal::AutoinstBcachePlanner do
   using Y2Storage::Refinements::SizeCasts
 
   subject(:planner) { described_class.new(fake_devicegraph, issues_list) }
   let(:scenario) { "bcache1.xml" }
   let(:issues_list) { Y2Storage::AutoinstIssues::List.new }
-  let(:arch) { "x86_64" }
+  let(:architecture) { :x86_64 }
 
   before do
-    allow(Yast::Arch).to receive(:architecture).and_return(arch)
     fake_scenario(scenario)
   end
 

diff --git a/test/y2storage/proposal/autoinst_devices_creator_test.rb b/test/y2storage/proposal/autoinst_devices_creator_test.rb
@@ -25,8 +25,6 @@
 require "y2storage/proposal/autoinst_devices_creator"
 require "y2storage/planned"
 
-Yast.import "Arch"
-
 describe Y2Storage::Proposal::AutoinstDevicesCreator do
   using Y2Storage::Refinements::SizeCasts
 
@@ -51,11 +49,9 @@
   end
 
   let(:planned_devices) { Y2Storage::Planned::DevicesCollection.new([disk]) }
+  let(:architecture) { :x86_64 }
 
-  before do
-    allow(Yast::Arch).to receive(:architecture).and_return("x86_64")
-    fake_scenario(scenario)
-  end
+  before { fake_scenario(scenario) }
 
   subject(:creator) do
     described_class.new(Y2Storage::StorageManager.instance.probed)

diff --git a/test/y2storage/proposal/bcache_creator_test.rb b/test/y2storage/proposal/bcache_creator_test.rb
@@ -23,15 +23,12 @@
 require_relative "../spec_helper"
 require "y2storage"
 
-Yast.import "Arch"
-
 describe Y2Storage::Proposal::BcacheCreator do
   using Y2Storage::Refinements::SizeCasts
 
   subject(:creator) { described_class.new(fake_devicegraph) }
 
   before do
-    allow(Yast::Arch).to receive(:architecture).and_return("x86_64")
     fake_scenario(scenario)
   end
 
@@ -52,6 +49,7 @@
       mount_point: "/", type: Y2Storage::Filesystems::Type::BTRFS, min_size: 1.GiB, max_size: 1.GiB
     )
   end
+  let(:architecture) { :x86_64 }
 
   describe "#create_bcache" do
     it "creates a new bcache device" do