Merge remote-tracking branch 'parent/main' into upstream-20240830

spec/controllers/admin/resets_controller_spec.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Admin::ResetsController do
-  render_views
-
-  subject { post :create, params: { account_id: account.id } }
-
-  let(:account) { Fabricate(:account) }
-
-  before do
-    sign_in Fabricate(:user, role: UserRole.find_by(name: 'Admin')), scope: :user
-  end
-
-  describe 'POST #create', :inline_jobs do
-    it 'redirects to admin accounts page' do
-      emails = capture_emails { subject }
-
-      expect(emails.size)
-        .to eq(2)
-      expect(emails).to have_attributes(
-        first: have_attributes(
-          to: include(account.user.email),
-          subject: I18n.t('devise.mailer.password_change.subject')
-        ),
-        last: have_attributes(
-          to: include(account.user.email),
-          subject: I18n.t('devise.mailer.reset_password_instructions.subject')
-        )
-      )
-      expect(response).to redirect_to(admin_account_path(account.id))
-    end
-  end
-end

spec/controllers/media_controller_spec.rb

@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe MediaController do
-  render_views
-
-  describe '#show' do
-    it 'raises when shortcode cant be found' do
-      get :show, params: { id: 'missing' }
-
-      expect(response).to have_http_status(404)
-    end
-
-    context 'when the media attachment has a shortcode' do
-      it 'redirects to the file url when attached to a status' do
-        status = Fabricate(:status)
-        media_attachment = Fabricate(:media_attachment, status: status, shortcode: 'OI6IgDzG-nYTqvDQ994')
-        get :show, params: { id: media_attachment.to_param }
-
-        expect(response).to redirect_to(media_attachment.file.url(:original))
-      end
-
-      it 'responds with missing when there is not an attached status' do
-        media_attachment = Fabricate(:media_attachment, status: nil, shortcode: 'OI6IgDzG-nYTqvDQ994')
-        get :show, params: { id: media_attachment.to_param }
-
-        expect(response).to have_http_status(404)
-      end
-
-      it 'raises when not permitted to view' do
-        status = Fabricate(:status, visibility: :direct)
-        media_attachment = Fabricate(:media_attachment, status: status, shortcode: 'OI6IgDzG-nYTqvDQ994')
-        get :show, params: { id: media_attachment.to_param }
-
-        expect(response).to have_http_status(404)
-      end
-    end
-
-    context 'when the media attachment has no shortcode' do
-      it 'redirects to the file url when attached to a status' do
-        status = Fabricate(:status)
-        media_attachment = Fabricate(:media_attachment, status: status)
-        get :show, params: { id: media_attachment.to_param }
-
-        expect(response).to redirect_to(media_attachment.file.url(:original))
-      end
-
-      it 'responds with missing when there is not an attached status' do
-        media_attachment = Fabricate(:media_attachment, status: nil)
-        get :show, params: { id: media_attachment.to_param }
-
-        expect(response).to have_http_status(404)
-      end
-
-      it 'raises when not permitted to view' do
-        status = Fabricate(:status, visibility: :direct)
-        media_attachment = Fabricate(:media_attachment, status: status)
-        get :show, params: { id: media_attachment.to_param }
-
-        expect(response).to have_http_status(404)
-      end
-    end
-  end
-end

spec/requests/api/v2_alpha/notifications_spec.rb

@@ -35,6 +35,17 @@ RSpec.describe 'Notifications' do
       end
     end
 
+    context 'with grouped_types parameter' do
+      let(:params) { { grouped_types: %w(reblog) } }
+
+      it 'returns expected notifications count' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json[:count]).to eq 5
+      end
+    end
+
     context 'with a read marker' do
       before do
         id = user.account.notifications.browserable.order(id: :desc).offset(2).first.id
@@ -114,6 +125,38 @@ RSpec.describe 'Notifications' do
       end
     end
 
+    context 'with grouped_types param' do
+      let(:params) { { grouped_types: %w(reblog) } }
+
+      it 'returns everything, but does not group favourites' do
+        subject
+
+        expect(response).to have_http_status(200)
+        expect(body_as_json[:notification_groups]).to contain_exactly(
+          a_hash_including(
+            type: 'reblog',
+            sample_account_ids: [bob.account_id.to_s]
+          ),
+          a_hash_including(
+            type: 'mention',
+            sample_account_ids: [bob.account_id.to_s]
+          ),
+          a_hash_including(
+            type: 'favourite',
+            sample_account_ids: [bob.account_id.to_s]
+          ),
+          a_hash_including(
+            type: 'favourite',
+            sample_account_ids: [tom.account_id.to_s]
+          ),
+          a_hash_including(
+            type: 'follow',
+            sample_account_ids: [bob.account_id.to_s]
+          )
+        )
+      end
+    end
+
     context 'with exclude_types param' do
       let(:params) { { exclude_types: %w(mention) } }
 

spec/requests/media_spec.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Media' do
+  describe 'GET /media/:id' do
+    context 'when the media attachment does not exist' do
+      it 'responds with not found' do
+        get '/media/missing'
+
+        expect(response)
+          .to have_http_status(404)
+      end
+    end
+
+    context 'when the media attachment has a shortcode' do
+      let(:media_attachment) { Fabricate :media_attachment, status: status, shortcode: 'OI6IgDzG-nYTqvDQ994' }
+
+      context 'when attached to a status' do
+        let(:status) { Fabricate :status }
+
+        it 'redirects to file url' do
+          get medium_path(id: media_attachment.shortcode)
+
+          expect(response)
+            .to redirect_to(media_attachment.file.url(:original))
+        end
+      end
+
+      context 'when not attached to a status' do
+        let(:status) { nil }
+
+        it 'responds with not found' do
+          get medium_path(id: media_attachment.shortcode)
+
+          expect(response)
+            .to have_http_status(404)
+        end
+      end
+
+      context 'when attached to non-public status' do
+        let(:status) { Fabricate :status, visibility: :direct }
+
+        it 'responds with not found' do
+          get medium_path(id: media_attachment.shortcode)
+
+          expect(response)
+            .to have_http_status(404)
+        end
+      end
+    end
+
+    context 'when the media attachment does not have a shortcode' do
+      let(:media_attachment) { Fabricate :media_attachment, status: status, shortcode: nil }
+
+      context 'when attached to a status' do
+        let(:status) { Fabricate :status }
+
+        it 'redirects to file url' do
+          get medium_path(id: media_attachment.id)
+
+          expect(response)
+            .to redirect_to(media_attachment.file.url(:original))
+        end
+      end
+
+      context 'when not attached to a status' do
+        let(:status) { nil }
+
+        it 'responds with not found' do
+          get medium_path(id: media_attachment.id)
+
+          expect(response)
+            .to have_http_status(404)
+        end
+      end
+
+      context 'when attached to non-public status' do
+        let(:status) { Fabricate :status, visibility: :direct }
+
+        it 'responds with not found' do
+          get medium_path(id: media_attachment.id)
+
+          expect(response)
+            .to have_http_status(404)
+        end
+      end
+    end
+  end
+end

spec/system/admin/reset_spec.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Admin::Reset' do
+  it 'Resets password for account user' do
+    account = Fabricate :account
+    sign_in admin_user
+    visit admin_account_path(account.id)
+
+    emails = capture_emails do
+      expect { submit_reset }
+        .to change(Admin::ActionLog.where(target: account.user), :count).by(1)
+    end
+
+    expect(emails.first)
+      .to be_present
+      .and(deliver_to(account.user.email))
+      .and(have_subject(password_change_subject))
+
+    expect(emails.last)
+      .to be_present
+      .and(deliver_to(account.user.email))
+      .and(have_subject(reset_instructions_subject))
+
+    expect(page)
+      .to have_content(account.username)
+  end
+
+  def admin_user
+    Fabricate(:user, role: UserRole.find_by(name: 'Admin'))
+  end
+
+  def submit_reset
+    click_on I18n.t('admin.accounts.reset_password')
+  end
+
+  def password_change_subject
+    I18n.t('devise.mailer.password_change.subject')
+  end
+
+  def reset_instructions_subject
+    I18n.t('devise.mailer.reset_password_instructions.subject')
+  end
+end