From 01d238c2c45f09991f32d9f8eb1ad140efbc4a6b Mon Sep 17 00:00:00 2001 From: Martin Vidner Date: Wed, 3 Sep 2014 09:51:58 +0200 Subject: [PATCH] test: RSpec 3 compatibility: avoid be_true, be_false. --- test/install_inf_convertor_test.rb | 18 +++++++++--------- test/lan_items_helpers_test.rb | 6 +++--- test/netcard_test.rb | 10 +++++----- test/routing_test.rb | 6 +++--- test/suse_firewall_4_network_test.rb | 20 ++++++++++---------- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/test/install_inf_convertor_test.rb b/test/install_inf_convertor_test.rb index 28e11317b..b3a2b1a34 100755 --- a/test/install_inf_convertor_test.rb +++ b/test/install_inf_convertor_test.rb @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/test/lan_items_helpers_test.rb b/test/lan_items_helpers_test.rb index b1724147c..1cf846465 100755 --- a/test/lan_items_helpers_test.rb +++ b/test/lan_items_helpers_test.rb @@ -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 diff --git a/test/netcard_test.rb b/test/netcard_test.rb index e5fc02fad..e788e5b06 100755 --- a/test/netcard_test.rb +++ b/test/netcard_test.rb @@ -199,7 +199,7 @@ @lan_items.DeleteItem - expect(@lan_items.FindAndSelect(item_name)).to be_false + expect(@lan_items.FindAndSelect(item_name)).to be false end end @@ -207,11 +207,11 @@ 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 @@ -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 diff --git a/test/routing_test.rb b/test/routing_test.rb index 1445441b7..b4db49d94 100755 --- a/test/routing_test.rb +++ b/test/routing_test.rb @@ -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 @@ -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 diff --git a/test/suse_firewall_4_network_test.rb b/test/suse_firewall_4_network_test.rb index a18c00b87..64de143c0 100755 --- a/test/suse_firewall_4_network_test.rb +++ b/test/suse_firewall_4_network_test.rb @@ -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 @@ -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 @@ -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