Update from code review

yast · Sep 20, 2018 · 6b82ddb · 6b82ddb
1 parent 53a5cf5
commit 6b82ddb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/lib/y2firewall/widgets/interfaces_table.rb b/src/lib/y2firewall/widgets/interfaces_table.rb
@@ -52,7 +52,7 @@ def opt
       # @macro seeAbstractWidget
       def init
         interface = Y2Firewall::UIState.instance.row_id
-        if interface && interfaces.map(&:name).include?(interface.to_s)
+        if interface && interfaces.map(&:id).include?(interface)
           self.value = interface
         end
         change_zone_button.interface = selected_interface
@@ -71,7 +71,7 @@ def header
       def items
         interfaces.map do |iface|
           [
-            iface.name.to_sym,
+            iface.id,
             iface.name,
             iface.zone ? iface.zone.name : DEFAULT_ZONE_NAME,
             iface.device_name
@@ -88,7 +88,7 @@ def handle(event)
       end
 
       def selected_interface
-        interfaces.find { |i| i.name == value.to_s }
+        interfaces.find { |i| i.id == value }
       end
 
     private

diff --git a/test/lib/y2firewall/widgets/interfaces_table_test.rb b/test/lib/y2firewall/widgets/interfaces_table_test.rb
@@ -33,13 +33,15 @@
 
   let(:eth0) do
     instance_double(
-      Y2Firewall::Firewalld::Interface, name: "eth0", device_name: DEVICE_NAME, zone: public_zone
+      Y2Firewall::Firewalld::Interface, id: :eth0, name: "eth0",
+      device_name: DEVICE_NAME, zone: public_zone
     )
   end
 
   let(:eth1) do
     instance_double(
-      Y2Firewall::Firewalld::Interface, name: "eth1", device_name: DEVICE_NAME, zone: nil
+      Y2Firewall::Firewalld::Interface, id: :eth1, name: "eth1",
+      device_name: DEVICE_NAME, zone: nil
     )
   end