From 98287a119a947b0270601dc2b08ae5f5b6aa5a23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?=
 <teclator@gmail.com>
Date: Tue, 4 Sep 2018 09:40:15 +0100
Subject: [PATCH] Fixed mocking in CWMFirewall interfaces

---
 library/network/test/Makefile.am              |  6 +-----
 .../test/cwm_firewall_interfaces_test.rb      | 21 ++++++++++++++++---
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/library/network/test/Makefile.am b/library/network/test/Makefile.am
index 6f92c513e..429aa9f43 100644
--- a/library/network/test/Makefile.am
+++ b/library/network/test/Makefile.am
@@ -2,11 +2,7 @@ TESTS = \
   load_ipv6_cfg_test.rb \
   network_interfaces_test.rb \
   network_interfaces_helpers_test.rb \
-  network_service_test.rb \
-  susefirewall_proposal_test.rb \
-  susefirewall_services_test.rb \
-  susefirewall_test.rb \
-  susefirewalld_test.rb
+  network_service_test.rb
 
 TEST_EXTENSIONS = .rb
 RB_LOG_COMPILER = rspec
diff --git a/library/network/test/cwm_firewall_interfaces_test.rb b/library/network/test/cwm_firewall_interfaces_test.rb
index d109da819..7dbe09c14 100755
--- a/library/network/test/cwm_firewall_interfaces_test.rb
+++ b/library/network/test/cwm_firewall_interfaces_test.rb
@@ -199,6 +199,18 @@
   end
 
   describe "#Selected2Opened" do
+    let(:known_interfaces) do
+      [
+        { "id" => "eth0", "name" => "Ethernet 1", "zone" => "external" },
+        { "id" => "eth1", "name" => "Ethernet 2", "zone" => "public" },
+        { "id" => "eth2", "name" => "Ethernet 3", "zone" => "dmz" }
+      ]
+    end
+
+    before do
+      allow(subject).to receive(:known_interfaces).and_return(known_interfaces)
+    end
+
     context "given a list of selected interfaces" do
       let(:zone) do
         instance_double("Y2Firewall::Firewalld::Zone", interfaces: ["eth0", "eth1"], name: "public")
@@ -206,7 +218,7 @@
 
       before do
         allow(subject).to receive(:interface_zone).with("eth0").and_return("public")
-        allow_any_instance_of(Y2Firewall::Firewalld).to receive(:find_zone).and_return(zone)
+        allow(firewalld).to receive(:find_zone).and_return(zone)
       end
 
       it "returns all the interfaces that belongs to same zone of the given interfaces" do
@@ -223,10 +235,12 @@
         { "id" => "eth2", "name" => "Ethernet 3", "zone" => nil }
       ]
     end
+
     let(:external_zone) do
       instance_double("Y2Firewall::Firewalld::Zone", name: "external",
                       interfaces: ["eth0"], services: [])
     end
+
     let(:public_zone) do
       instance_double("Y2Firewall::Firewalld::Zone", name: "public",
                       interfaces: ["eth1"], services: ["dns"])
@@ -235,8 +249,9 @@
     let(:zones) { [external_zone, public_zone] }
 
     before do
-      allow(subject).to receive(:known_interfaces).and_return(known_interfaces)
-      allow_any_instance_of(Y2Firewall::Firewalld).to receive(:zones).and_return(zones)
+      expect(subject).to receive(:known_interfaces).and_return(known_interfaces)
+      expect(subject).to receive(:allowed_interfaces).and_return(["eth0", "eth1"])
+      allow(firewalld).to receive(:zones).and_return(zones)
       allow(subject).to receive(:default_zone).and_return(public_zone)
       allow(subject).to receive(:configuration_changed).and_return(true)
       allow(subject).to receive(:allowed_interfaces).and_return(["eth0", "eth1", "eth2"])