Merge pull request #18131 from jerryk55/fix_merged_uri

Fix Exception due to missing #merged_uri parameters in FileDepot parent class

(cherry picked from commit 2357413)

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1643106

app/models/file_depot.rb

@@ -33,7 +33,7 @@ def upload_file(file)
     @file = file
   end
 
-  def merged_uri
+  def merged_uri(_uri, _api_port)
     uri
   end
 end

spec/models/file_depot_ftp_spec.rb

@@ -4,7 +4,8 @@
   end
 
   let(:connection)     { double("FtpConnection") }
-  let(:file_depot_ftp) { FileDepotFtp.new(:uri => "ftp://server.example.com/uploads") }
+  let(:uri)            { "ftp://server.example.com/uploads" }
+  let(:file_depot_ftp) { FileDepotFtp.new(:uri => uri) }
   let(:log_file)       { LogFile.new(:resource => @miq_server, :local_file => "/tmp/file.txt") }
   let(:ftp_mock) do
     Class.new do
@@ -115,4 +116,14 @@ def putbinaryfile(local_path, remote_path)
       file_depot_ftp.upload_file(log_file)
     end
   end
+
+  context "#merged_uri" do
+    before do
+      file_depot_ftp.uri = uri
+    end
+
+    it "should return the uri attribute from the file depot object and ignore the parameter" do
+      expect(file_depot_ftp.merged_uri(nil, nil)).to eq uri
+    end
+  end
 end

spec/models/file_depot_nfs_spec.rb

@@ -0,0 +1,23 @@
+describe FileDepotNfs do
+  let(:uri)            { "nfs://foo.com/directory" }
+  let(:swift_uri)      { "swift://foo_bucket/doo_directory" }
+  let(:file_depot_nfs) { FileDepotNfs.new(:uri => uri) }
+
+  it "should return a valid prefix" do
+    expect(FileDepotNfs.uri_prefix).to eq "nfs"
+  end
+
+  describe "#merged_uri" do
+    before do
+      file_depot_nfs.uri = uri
+    end
+
+    it "should return the uri set on the depot object and ignore the uri parameter" do
+      expect(file_depot_nfs.merged_uri(swift_uri, nil)).to eq uri
+    end
+
+    it "should return the uri set on the depot object and ignore an empty uri parameter" do
+      expect(file_depot_nfs.merged_uri(nil, nil)).to eq uri
+    end
+  end
+end