Merge branch 'main' into main

app/views/admin/trends/tags/_tag.html.haml

@@ -13,7 +13,7 @@
 
       - if tag.trendable?
         ·
-        %abbr{ title: t('admin.trends.tags.current_score', score: tag.trend.score) }= t('admin.trends.tags.trending_rank', rank: tag.trend.rank + 1)
+        %abbr{ title: t('admin.trends.tags.current_score', score: tag.trend.score) }= t('admin.trends.tags.trending_rank', rank: tag.trend.rank)
 
         - if tag.decaying?
           ·

spec/controllers/admin/relationships_controller_spec.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Admin::RelationshipsController do
-  render_views
-
-  let(:user) { Fabricate(:admin_user) }
-
-  before do
-    sign_in user, scope: :user
-  end
-
-  describe 'GET #index' do
-    let(:account) { Fabricate(:account) }
-
-    it 'returns http success' do
-      get :index, params: { account_id: account.id }
-
-      expect(response).to have_http_status(:success)
-    end
-  end
-end

spec/system/admin/relationships_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Relationships' do
+  before { sign_in(admin_user) }
+
+  describe 'Viewing account relationships page' do
+    let(:account) { Fabricate(:account) }
+
+    it 'shows page with relationships for account' do
+      visit admin_account_relationships_path(account.id)
+
+      expect(page)
+        .to have_title(I18n.t('admin.relationships.title', acct: account.pretty_acct))
+    end
+  end
+end