Merge pull request ManageIQ#12026 from himdel/bz1380707-storage

StorageController#show - set x_node for the right tree, when called with an id

app/controllers/storage_controller.rb

@@ -30,8 +30,7 @@ def show_new(id = nil)
   def show(record = nil)
     return if perfmenu_click?
     @display = params[:display] || "main" unless control_selected?
-    @record = @storage = find_record( Storage, record || params[:id])
-    # @storage = @record = identify_record(params[:id])
+    @record = @storage = find_record(Storage, record || params[:id])
     return if record_no_longer_exists?(@storage)
 
     if !@explorer && @display == "main"
@@ -59,7 +58,6 @@ def show(record = nil)
     end
 
     @gtl_url = "/show"
-    #   drop_breadcrumb({:name=>ui_lookup(:tables=>"storages"), :url=>"/storage/show_list?page=#{@current_page}&refresh=y"}, true)
 
     case @display
     when "all_miq_templates", "all_vms"
@@ -406,7 +404,8 @@ def explorer
       nodetype, id = params[:id].split("-")
       # treebuilder initializes x_node to root first time in locals_for_render,
       # need to set this here to force & activate node when link is clicked outside of explorer.
-      @reselect_node = self.x_node = "#{nodetype}-#{to_cid(id)}"
+      self.x_active_tree = :storage_tree
+      self.x_node = @reselect_node = "#{nodetype}-#{to_cid(id)}"
     end
 
     build_accordions_and_trees

spec/controllers/storage_controller_spec.rb

@@ -205,6 +205,19 @@
         flash_messages = assigns(:flash_array)
         expect(flash_messages.first[:message]).to_not include("Datastores no longer exists")
       end
+
+      it 'can render datastore details' do
+        tree_node_id = TreeBuilder.build_node_id(storage)
+        session[:sandboxes] = {} # no prior data in @sb
+        session[:exp_parms] = {:controller => 'storage',
+                               :action     => 'show',
+                               :id         => tree_node_id}
+
+        get :explorer
+        expect(response.status).to eq(200)
+        expect(response.body).to_not be_empty
+        expect(response).to render_template('shared/summary/_textual')
+      end
     end
 
     context "#tree_select" do