spec/models/generic_work_spec.rb in sufia-7.0.0.beta3 vs spec/models/generic_work_spec.rb in sufia-7.0.0.beta4

@@ -34,22 +34,19 @@
       expect(work.proxy_depositor).to eq proxy_depositor.user_key
     end
   end
 
   describe "trophies" do
-    before do
-      u = create(:user)
-      @w = described_class.create!(title: ['demoname']) do |gw|
-        gw.apply_depositor_metadata(u)
-      end
-      @t = Trophy.create(user_id: u.id, work_id: @w.id)
-    end
+    let(:user) { create(:user) }
+    let(:w) { create(:work, user: user) }
+    let!(:t) { Trophy.create(user_id: user.id, work_id: w.id) }
+
     it "has a trophy" do
-      expect(Trophy.where(work_id: @w.id).count).to eq 1
+      expect(Trophy.where(work_id: w.id).count).to eq 1
     end
     it "removes all trophies when work is deleted" do
-      @w.destroy
-      expect(Trophy.where(work_id: @w.id).count).to eq 0
+      w.destroy
+      expect(Trophy.where(work_id: w.id).count).to eq 0
     end
   end
 
   describe "metadata" do
     it "has descriptive metadata" do