Merge pull request #374 from tulibraries/IMT-180-optimize-folder-asset-rendering-spec

IMT-180 Optimize folder asset rendering spec

Author: sensei100

spec/requests/volumes/file_tree_spec.rb

@@ -5,6 +5,8 @@
 RSpec.describe "Volumes file tree endpoints", type: :request do
   let!(:volume) { create(:volume) }
   let!(:user)   { create(:user, email: "tester@temple.edu") }
+  let!(:assignee) { create(:user, name: "Assigned User", email: "assigned@example.com") }
+  let!(:migration_status) { create(:migration_status, :default) }
 
   before { sign_in user }
 
@@ -34,8 +36,13 @@
     create(:isilon_asset, parent_folder: folder_c,
            isilon_name: "scan_beta_001.tif",
            isilon_path: "#{folder_c.full_path}/scan_beta_001.tif",
+           migration_status: migration_status,
+           assigned_to: assignee,
+           notes: "asset notes",
            aspace_collection: aspace_collection,
-           contentdm_collection: contentdm_collection)
+           contentdm_collection: contentdm_collection,
+           preservica_reference_id: "pres-123",
+           aspace_linking_status: true)
   end
 
   def parsed
@@ -77,6 +84,29 @@ def parsed
       match = json.find { |h| h["id"] == folder.id }
       expect(match["descendant_assets_count"]).to eq(3)
     end
+
+    it "omits asset-only rendering fields from folder payloads" do
+      get file_tree_volume_path(volume, format: :json)
+
+      expect(response).to have_http_status(:ok)
+
+      match = parsed.find { |h| h["id"] == root.id }
+      expect(match).to include(
+        "folder" => true,
+        "assigned_to" => "Unassigned",
+        "key" => root.id.to_s,
+        "notes" => nil
+      )
+      expect(match.keys).not_to include(
+        "migration_status",
+        "migration_status_id",
+        "contentdm_collection_id",
+        "aspace_collection_id",
+        "preservica_reference_id",
+        "aspace_linking_status",
+        "url"
+      )
+    end
   end
 
   describe "GET /volumes/:id/file_tree_assets" do
@@ -95,8 +125,16 @@ def parsed
       expect(keys).to include("a-#{asset.id}")
       match = body.find { |h| h["key"] == "a-#{asset.id}" }
       expect(match["path"]).to eq([ root.id, folder_a.id, folder_b.id, folder_c.id ])
+      expect(match["assigned_to"]).to eq(assignee.name)
+      expect(match["assigned_to_id"]).to eq(assignee.id)
+      expect(match["migration_status"]).to eq(migration_status.name)
+      expect(match["migration_status_id"]).to eq(migration_status.id)
+      expect(match["notes"]).to eq("asset notes")
       expect(match["aspace_collection_id"]).to eq(aspace_collection.id)
       expect(match["contentdm_collection_id"]).to eq(contentdm_collection.id)
+      expect(match["preservica_reference_id"]).to eq("pres-123")
+      expect(match["aspace_linking_status"]).to eq("t")
+      expect(match["url"]).to end_with("/admin/isilon_assets/#{asset.id}")
     end
   end
 

spec/system/folder_asset_rendering_spec.rb

@@ -2,70 +2,51 @@
 
 RSpec.describe "Wunderbaum folder vs asset rendering", type: :system do
   let!(:volume) { create(:volume, name: "TestVol") }
-
   let!(:root_folder) do
     create(
       :isilon_folder,
       volume: volume,
       parent_folder: nil,
-      full_path: "RootFolder"
+      full_path: "/TestVol/RootFolder"
     )
   end
-
   let!(:asset) do
     create(
       :isilon_asset,
       parent_folder: root_folder,
       isilon_name: "my_asset.txt"
     )
   end
-
   let!(:user) { create(:user, email: "tester@temple.edu") }
 
   before do
     driven_by :cuprite
     sign_in user
-    visit volume_path(volume)
   end
 
   it "renders only allowed interactions for folders" do
-    folder_row = page
-      .all(".wb-row", visible: true)
-      .find { |row| row.has_css?(".wb-expander") }
-
-    expect(folder_row).to be_present
-
-    expect(folder_row).to have_css("[data-colid='assigned_to']")
-    expect(folder_row).to have_css("[data-colid='notes']")
-    expect(folder_row).to have_css(".wb-select-like[data-colid='assigned_to']")
+    visit volume_path(volume)
 
-    expect(folder_row).not_to have_css("[data-colid='migration_status']")
-    expect(folder_row).not_to have_css("[data-colid='contentdm_collection_id']")
-    expect(folder_row).not_to have_css("[data-colid='aspace_collection_id']")
-    expect(folder_row).not_to have_css("[data-colid='aspace_linking_status']")
-  end
+    folder_row = find(
+      :xpath,
+      "//div[contains(@class,'wb-row')][.//span[contains(@class,'wb-title')][normalize-space(text())='RootFolder']]",
+      wait: 10
+    )
 
-  it "renders all applicable columns for assets" do
-    folder_row = page
-      .all(".wb-row", visible: true)
-      .find { |row| row.has_css?(".wb-expander") }
+    expect(folder_row).to have_css("[data-colid='assigned_to'].wb-select-like", text: "Unassigned")
+    expect(folder_row).not_to have_css("a.asset-link")
+    expect(folder_row).not_to have_css("input[type='checkbox']")
 
     folder_row.find(".wb-expander").click
 
-    expect(page).to have_css(".wb-row", text: "my_asset.txt")
-
-    asset_row = page
-      .all(".wb-row", visible: true)
-      .find { |row| row.has_css?("a.asset-link") }
-
-    expect(asset_row).to be_present
+    asset_row = find(
+      :xpath,
+      "//div[contains(@class,'wb-row')][.//a[contains(@class,'asset-link')][normalize-space(text())='my_asset.txt']]",
+      wait: 10
+    )
 
+    expect(asset_row).to have_css("a.asset-link", text: "my_asset.txt")
     expect(asset_row).to have_css("input[name='notes']")
-    expect(asset_row).to have_css("[data-colid='assigned_to']")
-    expect(asset_row).to have_css("[data-colid='migration_status']")
-    expect(asset_row).to have_css("[data-colid='contentdm_collection_id']")
-    expect(asset_row).to have_css("[data-colid='aspace_collection_id']")
-    expect(asset_row).to have_css("[data-colid='preservica_reference_id']")
     expect(asset_row).to have_css("input[type='checkbox']")
   end
 end