Skip to content

Commit

Permalink
Minor testing improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
dgdavid committed Dec 31, 2018
1 parent 37274eb commit b4064a0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
2 changes: 0 additions & 2 deletions src/lib/y2firewall/widgets/pages/startup.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ def contents

private

# This is a generic widget in SLE15; may not be appropriate.
# For SLE15-SP1, use CWM::ServiceWidget
def status_widget
@status_widget ||= ::CWM::ServiceWidget.new(system_service)
end
Expand Down
15 changes: 9 additions & 6 deletions test/lib/y2firewall/widgets/pages/startup_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,27 @@
# ------------------------------------------------------------------------------

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_widget) { ::CWM::ServiceWidget.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_widget)
allow(Y2Firewall::Firewalld).to receive(:instance).and_return(fw_instance)
allow(::CWM::ServiceWidget).to receive(:new).and_return(service_widget)
end

describe "#contents" do
it "shows the CWM::ServiceWidget for the #{Y2Firewall::Firewalld::SERVICE} service" do
it "includes the ::CWM::ServiceWidget content" do
expect(widget.contents).to include(service_widget)
end
end
Expand Down

0 comments on commit b4064a0

Please sign in to comment.