Merge branch 'main' into mccalluc-work-activity-more-oo

app/controllers/works_controller.rb

@@ -78,7 +78,7 @@ def show
         @can_curate = current_user.can_admin?(@collection)
         @work.mark_new_notifications_as_read(current_user.id)
       end
-      format.json { render json: @work.resource }
+      format.json { render json: @work.to_json }
     end
   end
 

spec/controllers/works_controller_spec.rb

@@ -30,11 +30,15 @@
       expect(response.content_type).to eq "application/rss+xml; charset=utf-8"
     end
 
-    it "renders the resource json" do
+    it "renders the work json" do
       sign_in user
       stub_s3
       get :show, params: { id: work.id, format: "json" }
       expect(response.content_type).to eq "application/json; charset=utf-8"
+      work_json = JSON.parse(response.body)
+      expect(work_json["resource"]).to_not be nil
+      expect(work_json["files"]).to_not be nil
+      expect(work_json["collection"]).to_not be nil
     end
 
     it "renders the new submission wizard' step 0" do

spec/system/rss_spec.rb

@@ -63,7 +63,7 @@
 
     # Fetching the JSON for an approved work doesn't require authentication
     visit "/works/#{work1.id}.json"
-    expect(JSON.parse(page.body)["titles"][0]["title"]).to eq work1.title
+    expect(JSON.parse(page.body)["resource"]["titles"][0]["title"]).to eq work1.title
 
     # Fetching the JSON for a work that is not yet approved doesn't work
     visit "/works/#{work3.id}.json"