Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream

spec/controllers/invites_controller_spec.rb

@@ -69,19 +69,16 @@ describe InvitesController do
     end
   end
 
-  describe 'DELETE #create' do
+  describe 'DELETE #destroy' do
+    subject { delete :destroy, params: { id: invite.id } }
+
     let(:invite) { Fabricate(:invite, user: user, expires_at: nil) }
 
-    before do
-      delete :destroy, params: { id: invite.id }
-    end
-
-    it 'redirects' do
-      expect(response).to redirect_to invites_path
-    end
-
-    it 'expires invite' do
-      expect(invite.reload).to be_expired
+    it 'expires invite and redirects' do
+      expect { subject }
+        .to(change { invite.reload.expired? }.to(true))
+      expect(response)
+        .to redirect_to invites_path
     end
   end
 end