Fixes for testsuite - appended several testsuites into Makefile.am

cherry picked from 44c2df6 Picked just the fix to make firewall_stage1_proposal_test work Conflicts test/Makefile.am
yast · Jul 2, 2015 · 9b8e7a8 · 9b8e7a8
1 parent 47fe4d8
commit 9b8e7a8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/clients/firewall_stage1_proposal.rb b/src/clients/firewall_stage1_proposal.rb
@@ -76,7 +76,9 @@ def main
         # Don't override users settings
         SuSEFirewall4Network.prepare_proposal unless SuSEFirewallProposal.GetChangedByUser
 
-        adjust_configuration
+        # this method is not easily mockable in rspec and currently is out of scope
+        # for testing in firewall_stage1_proposal_test.rb
+        adjust_configuration if !Mode.test
 
         script_return = {
           "preformatted_proposal" => preformatted_proposal,

diff --git a/test/firewall_stage1_proposal_test.rb b/test/firewall_stage1_proposal_test.rb
@@ -17,6 +17,13 @@ module Yast
         # Ensure a fixed proposal
         SuSEFirewallProposal.SetChangedByUser(true)
         SuSEFirewall4Network.SetSshEnabled1stStage(true)
+
+        allow(SuSEFirewallServices)
+          .to receive(:all_services)
+          .and_return(SuSEFirewall4NetworkClass::SSH_SERVICES.zip([]).to_h)
+        allow(Mode)
+          .to receive(:test)
+          .and_return(true)
       end
 
       let(:proposal) do