Merge cc27b71 into 1351dfa

package/yast2-ftp-server.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct  3 10:45:18 UTC 2019 - Josef Reidinger <jreidinger@suse.com>
+
+- Fix autoyast client (bsc#1149932)
+- 4.2.2
+
 -------------------------------------------------------------------
 Fri Jul 19 10:42:01 UTC 2019 - José Iván López González <jlopez@suse.com>
 

package/yast2-ftp-server.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-ftp-server
-Version:        4.2.1
+Version:        4.2.2
 Release:        0
 Summary:        YaST2 - FTP configuration
 License:        GPL-2.0-only

src/lib/y2ftp/clients/ftp_server_auto.rb

@@ -19,7 +19,7 @@
 
 require "yast"
 
-Yast.import "Yast::FtpServer"
+Yast.import "FtpServer"
 
 module Y2Ftp
   module Clients

test/y2ftp/clients/ftp_server_auto_test.rb

@@ -0,0 +1,40 @@
+#! /usr/bin/env rspec
+
+# Copyright (c) [2019] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require_relative "../../spec_helper.rb"
+require "y2ftp/clients/ftp_server_auto"
+
+describe Y2Ftp::Clients::FtpServerAuto do
+  subject { described_class.new }
+
+  describe "#run" do
+    context "Summary argument" do
+      before do
+        allow(Yast::WFM).to receive(:Args).with(no_args).and_return(["Summary"])
+        allow(Yast::WFM).to receive(:Args).with(0).and_return("Summary")
+      end
+
+      it "returns string" do
+        expect(subject.run).to be_a(::String)
+      end
+    end
+  end
+end