Hello community, here is the log from the commit of package yast2-firewall for openSUSE:Factory checked in at 2019-01-05 14:40:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-firewall (Old) and /work/SRC/openSUSE:Factory/.yast2-firewall.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-firewall" Sat Jan 5 14:40:24 2019 rev:72 rq:662401 version:4.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-firewall/yast2-firewall.changes 2018-12-31 09:41:51.374439305 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-firewall.new.28833/yast2-firewall.changes 2019-01-05 14:40:31.388573715 +0100 @@ -1,0 +2,7 @@ +Thu Dec 20 11:19:51 UTC 2018 - [email protected] + +- Startup dialog: Replace the old UI::ServiceStatus by the new + CWM::ServiceWidget (bsc#1114807) +- 4.1.3 + +------------------------------------------------------------------- Old: ---- yast2-firewall-4.1.2.tar.bz2 New: ---- yast2-firewall-4.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firewall.spec ++++++ --- /var/tmp/diff_new_pack.BxTyjd/_old 2019-01-05 14:40:31.800573364 +0100 +++ /var/tmp/diff_new_pack.BxTyjd/_new 2019-01-05 14:40:31.800573364 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-firewall # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-firewall -Version: 4.1.2 +Version: 4.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-firewall-4.1.2.tar.bz2 -> yast2-firewall-4.1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-4.1.2/package/yast2-firewall.changes new/yast2-firewall-4.1.3/package/yast2-firewall.changes --- old/yast2-firewall-4.1.2/package/yast2-firewall.changes 2018-11-30 16:36:40.000000000 +0100 +++ new/yast2-firewall-4.1.3/package/yast2-firewall.changes 2019-01-02 10:52:29.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Dec 20 11:19:51 UTC 2018 - [email protected] + +- Startup dialog: Replace the old UI::ServiceStatus by the new + CWM::ServiceWidget (bsc#1114807) +- 4.1.3 + +------------------------------------------------------------------- Fri Nov 30 15:13:02 UTC 2018 - [email protected] - Add ability to add/edit/remove zone (fate#324662) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-4.1.2/package/yast2-firewall.spec new/yast2-firewall-4.1.3/package/yast2-firewall.spec --- old/yast2-firewall-4.1.2/package/yast2-firewall.spec 2018-11-30 16:36:40.000000000 +0100 +++ new/yast2-firewall-4.1.3/package/yast2-firewall.spec 2019-01-02 10:52:29.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-firewall -Version: 4.1.2 +Version: 4.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-4.1.2/src/lib/y2firewall/widgets/pages/startup.rb new/yast2-firewall-4.1.3/src/lib/y2firewall/widgets/pages/startup.rb --- old/yast2-firewall-4.1.2/src/lib/y2firewall/widgets/pages/startup.rb 2018-11-30 16:36:40.000000000 +0100 +++ new/yast2-firewall-4.1.3/src/lib/y2firewall/widgets/pages/startup.rb 2019-01-02 10:52:29.000000000 +0100 @@ -21,8 +21,8 @@ require "yast" require "cwm/page" +require "cwm/service_widget" require "y2firewall/firewalld" -require "ui/service_status" module Y2Firewall module Widgets @@ -44,35 +44,15 @@ # @macro seeCustomWidget def contents VBox( - status_widget.widget, + status_widget, VStretch() ) end - # @return [Symbol, nil] returns :swap_mode if the service is started - # or stopped and returns nil othwerwise - def handle(input) - result = status_widget.handle_input(input["ID"]) - return :swap_mode if result == :start || result == :stop - - nil - end - - def store - system_service.start_mode = status_widget.enabled_flag? ? :on_boot : :manual - system_service.reload if status_widget.reload_flag? - end - - def help - status_widget.help - end - private - # This is a generic widget in SLE15; may not be appropriate. - # For SLE15-SP1, use CWM::ServiceWidget def status_widget - @status_widget ||= ::UI::ServiceStatus.new(system_service.service) + @status_widget ||= ::CWM::ServiceWidget.new(system_service) end # Convenience method to obtain the firewall system service diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firewall-4.1.2/test/lib/y2firewall/widgets/pages/startup_test.rb new/yast2-firewall-4.1.3/test/lib/y2firewall/widgets/pages/startup_test.rb --- old/yast2-firewall-4.1.2/test/lib/y2firewall/widgets/pages/startup_test.rb 2018-11-30 16:36:40.000000000 +0100 +++ new/yast2-firewall-4.1.3/test/lib/y2firewall/widgets/pages/startup_test.rb 2019-01-02 10:52:29.000000000 +0100 @@ -20,57 +20,28 @@ # ------------------------------------------------------------------------------ require_relative "../../../../test_helper.rb" + require "cwm/rspec" +require "cwm/service_widget" require "y2firewall/widgets/pages/startup" describe Y2Firewall::Widgets::Pages::Startup do - include_examples "CWM::Page" subject(:widget) { described_class.new(double("fake pager")) } - let(:firewalld) { Y2Firewall::Firewalld.instance } - let(:system_service) { Yast2::SystemService.build(Y2Firewall::Firewalld::SERVICE) } - let(:service_status) { ::UI::ServiceStatus.new(system_service.service) } + include_examples "CWM::Page" + + let(:service) { double("firewalld") } + let(:service_widget) { double("ServiceWidget") } + let(:fw_instance) { double("fw_instance", system_service: service) } before do - allow(widget).to receive(:status_widget).and_return(service_status) + allow(Y2Firewall::Firewalld).to receive(:instance).and_return(fw_instance) + allow(::CWM::ServiceWidget).to receive(:new).and_return(service_widget) end - describe "#store" do - let(:enabled) { false } - let(:reload) { true } - - before do - allow(firewalld).to receive(:system_service).and_return(system_service) - allow(service_status).to receive(:enabled_flag?).and_return(enabled) - allow(service_status).to receive(:reload_flag?).and_return(reload) - end - - context "when the service status enable flag is selected" do - let(:enabled) { true } - - it "marks the service to be enabled on boot" do - expect(system_service).to receive(:start_mode=).with(:on_boot) - - widget.store - end - end - - context "when the service status enable flag is not selected" do - it "marks the service to be enabled manually" do - expect(system_service).to receive(:start_mode=).with(:manual) - - widget.store - end - end - - context "when the service status reload flag is choosen" do - let(:reload) { true } - - it "marks the service to be reloaded after write" do - expect(system_service).to receive(:reload) - - widget.store - end + describe "#contents" do + it "includes the ::CWM::ServiceWidget content" do + expect(widget.contents).to include(service_widget) end end end
