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

spec/system/admin/roles_spec.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin::Roles' do
+  context 'when user has administrator permissions' do
+    let(:user_role) { Fabricate(:user_role, permissions: UserRole::FLAGS[:administrator], position: 10) }
+
+    before { sign_in Fabricate(:user, role: user_role) }
+
+    it 'creates new user role' do
+      visit new_admin_role_path
+
+      fill_in 'user_role_name', with: 'Baz'
+      fill_in 'user_role_position', with: '1'
+      check 'user_role_permissions_as_keys_manage_reports'
+      check 'user_role_permissions_as_keys_manage_roles'
+
+      expect { click_on I18n.t('admin.roles.add_new') }
+        .to change(UserRole, :count)
+      expect(page)
+        .to have_title(I18n.t('admin.roles.title'))
+    end
+  end
+
+  context 'when user has permissions to manage roles' do
+    let(:user_role) { Fabricate(:user_role, permissions: UserRole::FLAGS[:manage_roles], position: 10) }
+
+    before { sign_in Fabricate(:user, role: user_role) }
+
+    it 'Creates user roles' do
+      visit admin_roles_path
+      expect(page)
+        .to have_title(I18n.t('admin.roles.title'))
+
+      click_on I18n.t('admin.roles.add_new')
+      expect(page)
+        .to have_title(I18n.t('admin.roles.add_new'))
+
+      # Position too high
+      fill_in 'user_role_name', with: 'Baz'
+      fill_in 'user_role_position', with: '100'
+      expect { click_on I18n.t('admin.roles.add_new') }
+        .to_not change(UserRole, :count)
+      expect(page)
+        .to have_content(I18n.t('activerecord.errors.models.user_role.attributes.position.elevated'))
+
+      # Valid submission
+      fill_in 'user_role_name', with: 'Baz'
+      fill_in 'user_role_position', with: '5' # Lower than user
+      check 'user_role_permissions_as_keys_manage_roles' # User has permission
+      expect { click_on I18n.t('admin.roles.add_new') }
+        .to change(UserRole, :count)
+      expect(page)
+        .to have_title(I18n.t('admin.roles.title'))
+    end
+
+    it 'Manages existing user roles' do
+      role = Fabricate :user_role, name: 'Baz'
+
+      visit edit_admin_role_path(role)
+      expect(page)
+        .to have_title(I18n.t('admin.roles.edit', name: 'Baz'))
+
+      # Update role attribute
+      fill_in 'user_role_position', with: '5' # Lower than user
+      expect { click_on submit_button }
+        .to(change { role.reload.position })
+
+      # Destroy the role
+      visit edit_admin_role_path(role)
+      expect { click_on I18n.t('admin.roles.delete') }
+        .to change(UserRole, :count).by(-1)
+      expect(page)
+        .to have_title(I18n.t('admin.roles.title'))
+    end
+  end
+end

spec/system/admin/users/roles_spec.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Users Roles' do
+  let(:current_role) { UserRole.create(name: 'Foo', permissions: UserRole::FLAGS[:manage_roles], position: 10) }
+  let(:current_user) { Fabricate(:user, role: current_role) }
+
+  let(:previous_role) { nil }
+  let(:user) { Fabricate(:user, role: previous_role) }
+
+  before do
+    sign_in current_user, scope: :user
+  end
+
+  describe 'Managing user roles' do
+    let!(:too_high_role) { UserRole.create(name: 'TooHigh', permissions: UserRole::FLAGS[:administrator], position: 100) }
+    let!(:usable_role) { UserRole.create(name: 'Usable', permissions: UserRole::FLAGS[:manage_roles], position: 1) }
+
+    it 'selects and updates user roles' do
+      visit admin_user_role_path(user)
+      expect(page)
+        .to have_title I18n.t('admin.accounts.change_role.title', username: user.account.username)
+
+      # Fails to assign not allowed role
+      select too_high_role.name, from: 'user_role_id'
+      expect { click_on submit_button }
+        .to_not(change { user.reload.role_id })
+      expect(page)
+        .to have_title I18n.t('admin.accounts.change_role.title', username: user.account.username)
+
+      # Assigns allowed role
+      select usable_role.name, from: 'user_role_id'
+      expect { click_on submit_button }
+        .to(change { user.reload.role_id }.to(usable_role.id))
+    end
+  end
+end

spec/system/statuses_spec.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Status page' do
+  let(:status) { Fabricate :status }
+
+  it 'visits the status page and renders the web app' do
+    visit short_account_status_path(account_username: status.account.username, id: status.id)
+
+    expect(page)
+      .to have_css('noscript', text: /Mastodon/)
+      .and have_css('body', class: 'app-body')
+  end
+end