Skip to content

Commit

Permalink
test: RSpec 3 compatibility: avoid be_true, be_false.
Browse files Browse the repository at this point in the history
  • Loading branch information
mvidner committed Sep 3, 2014
1 parent 6223540 commit 01d238c
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 30 deletions.
18 changes: 9 additions & 9 deletions test/install_inf_convertor_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

describe "#write_dhcp_timeout" do
it "returns false" do
expect(@install_inf_convertor.send(:write_dhcp_timeout)).to be_false
expect(@install_inf_convertor.send(:write_dhcp_timeout)).to be false
end
end

Expand All @@ -34,31 +34,31 @@

describe "#write_hostname" do
it "returns false" do
expect(@install_inf_convertor.send(:write_hostname)).to be_false
expect(@install_inf_convertor.send(:write_hostname)).to be false
end
end

describe "#write_dns" do
it "returns false" do
expect(@install_inf_convertor.send(:write_dns)).to be_false
expect(@install_inf_convertor.send(:write_dns)).to be false
end
end

describe "#write_proxy" do
it "returns false" do
expect(@install_inf_convertor.send(:write_proxy)).to be_false
expect(@install_inf_convertor.send(:write_proxy)).to be false
end
end

describe "#write_nis_domain" do
it "returns false" do
expect(@install_inf_convertor.send(:write_nis_domain)).to be_false
expect(@install_inf_convertor.send(:write_nis_domain)).to be false
end
end

describe "#write_connect_wait" do
it "returns false" do
expect(@install_inf_convertor.send(:write_connect_wait)).to be_false
expect(@install_inf_convertor.send(:write_connect_wait)).to be false
end
end

Expand Down Expand Up @@ -226,7 +226,7 @@
end
expect(Yast::Proxy).to receive(:Write).and_return(true)

expect(Yast::InstallInfConvertor.instance.send(:write_proxy)).to be_true
expect(Yast::InstallInfConvertor.instance.send(:write_proxy)).to be true
end

it "writes proxy credentials separately" do
Expand All @@ -251,7 +251,7 @@
end
expect(Yast::Proxy).to receive(:Write).and_return(true)

expect(Yast::InstallInfConvertor.instance.send(:write_proxy)).to be_true
expect(Yast::InstallInfConvertor.instance.send(:write_proxy)).to be true
end

it "does not write proxy configuration if not defined in install.inf" do
Expand All @@ -261,7 +261,7 @@
expect(Yast::Proxy).to receive(:Read).never
expect(Yast::Proxy).to receive(:Write).never

expect(Yast::InstallInfConvertor.instance.send(:write_proxy)).to be_false
expect(Yast::InstallInfConvertor.instance.send(:write_proxy)).to be false
end
end

Expand Down
6 changes: 3 additions & 3 deletions test/lan_items_helpers_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
it "succeeds when item has configuration" do
Yast::LanItems.stub(:GetLanItem) { { "ifcfg" => "enp0s3" } }

expect(Yast::LanItems.IsItemConfigured(0)).to be_true
expect(Yast::LanItems.IsItemConfigured(0)).to be true
end

it "fails when item doesn't exist" do
Yast::LanItems.stub(:GetLanItem) { {} }

expect(Yast::LanItems.IsItemConfigured(0)).to be_false
expect(Yast::LanItems.IsItemConfigured(0)).to be false
end

it "fails when item's configuration doesn't exist" do
Yast::LanItems.stub(:GetLanItem) { { "ifcfg" => nil } }

expect(Yast::LanItems.IsItemConfigured(0)).to be_false
expect(Yast::LanItems.IsItemConfigured(0)).to be false
end
end

Expand Down
10 changes: 5 additions & 5 deletions test/netcard_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -199,19 +199,19 @@

@lan_items.DeleteItem

expect(@lan_items.FindAndSelect(item_name)).to be_false
expect(@lan_items.FindAndSelect(item_name)).to be false
end
end

it "removes only the configuration if the item has hwinfo" do
before_size = @lan_items.Items.size
item_name = "enp0s3"

expect(@lan_items.FindAndSelect(item_name)).to be_true
expect(@lan_items.FindAndSelect(item_name)).to be true

@lan_items.DeleteItem

expect(@lan_items.FindAndSelect(item_name)).to be_false
expect(@lan_items.FindAndSelect(item_name)).to be false
expect(@lan_items.Items.size).to eql before_size
end
end
Expand Down Expand Up @@ -244,10 +244,10 @@
end

it "finds configured device" do
expect(@lan_items.FindAndSelect("enp0s3")).to be_true
expect(@lan_items.FindAndSelect("enp0s3")).to be true
end

it "fails to find unconfigured device" do
expect(@lan_items.FindAndSelect("nonexistent")).to be_false
expect(@lan_items.FindAndSelect("nonexistent")).to be false
end
end
6 changes: 3 additions & 3 deletions test/routing_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,11 @@ def fw_independent_write_expects
describe "#Import" do

it "Returns true for non nil settings" do
expect(Routing.Import({})).to be_true
expect(Routing.Import({})).to be true
end

it "Returns true for nil settings" do
expect(Routing.Import(nil)).to be_true
expect(Routing.Import(nil)).to be true
end
end

Expand Down Expand Up @@ -298,7 +298,7 @@ def fw_independent_write_expects
it "loads configuration from system" do
NetworkInterfaces.as_null_object

expect(Routing.Read).to be_true
expect(Routing.Read).to be true
end
end
end
Expand Down
20 changes: 10 additions & 10 deletions test/suse_firewall_4_network_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ module Yast
describe "#SetSshdEnabled" do
it "sets whether sshd service should be started and caches the information in ServicesProposal" do
SuSEFirewall4Network.SetSshdEnabled(true)
expect(SuSEFirewall4Network.EnabledSshd).to be_true
expect(ServicesProposal.enabled_services.include?('sshd')).to be_true
expect(ServicesProposal.disabled_services.include?('sshd')).to be_false
expect(SuSEFirewall4Network.EnabledSshd).to be true
expect(ServicesProposal.enabled_services.include?('sshd')).to be true
expect(ServicesProposal.disabled_services.include?('sshd')).to be false

SuSEFirewall4Network.SetSshdEnabled(false)
expect(SuSEFirewall4Network.EnabledSshd).to be_false
expect(ServicesProposal.enabled_services.include?('sshd')).to be_false
expect(ServicesProposal.disabled_services.include?('sshd')).to be_true
expect(SuSEFirewall4Network.EnabledSshd).to be false
expect(ServicesProposal.enabled_services.include?('sshd')).to be false
expect(ServicesProposal.disabled_services.include?('sshd')).to be true
end
end

Expand All @@ -46,8 +46,8 @@ module Yast

it "proposes firewall and ssh port according to control file" do
SuSEFirewall4Network.prepare_proposal
expect(SuSEFirewall4Network.Enabled1stStage).to be_true
expect(SuSEFirewall4Network.EnabledSsh1stStage).to be_false
expect(SuSEFirewall4Network.Enabled1stStage).to be true
expect(SuSEFirewall4Network.EnabledSsh1stStage).to be false
end
end

Expand All @@ -58,8 +58,8 @@ module Yast

it "proposes disabled firewall and proposes ssh port according to control file" do
SuSEFirewall4Network.prepare_proposal
expect(SuSEFirewall4Network.Enabled1stStage).to be_false
expect(SuSEFirewall4Network.EnabledSsh1stStage).to be_false
expect(SuSEFirewall4Network.Enabled1stStage).to be false
expect(SuSEFirewall4Network.EnabledSsh1stStage).to be false
end
end
end
Expand Down

0 comments on commit 01d238c

Please sign in to comment.