diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb
index 2e9f73bb834..70818610c2e 100644
--- a/app/controllers/invites_controller.rb
+++ b/app/controllers/invites_controller.rb
@@ -9,7 +9,7 @@ class InvitesController < ApplicationController
before_action :set_pack
def index
- authorize :invite, :index?
+ authorize :invite, :create?
@invites = invites
@invite = Invite.new(expires_in: 1.day.to_i)
diff --git a/app/controllers/settings/applications_controller.rb b/app/controllers/settings/applications_controller.rb
index 35a6f7f9e75..03c890a506d 100644
--- a/app/controllers/settings/applications_controller.rb
+++ b/app/controllers/settings/applications_controller.rb
@@ -6,7 +6,7 @@ class Settings::ApplicationsController < Settings::BaseController
before_action :prepare_scopes, only: [:create, :update]
def index
- @applications = current_user.applications.page(params[:page])
+ @applications = current_user.applications.order(id: :desc).page(params[:page])
end
def new
diff --git a/app/javascript/mastodon/actions/columns.js b/app/javascript/mastodon/actions/columns.js
index bcb0cdf9837..f550e6c48d5 100644
--- a/app/javascript/mastodon/actions/columns.js
+++ b/app/javascript/mastodon/actions/columns.js
@@ -1,8 +1,9 @@
import { saveSettings } from './settings';
-export const COLUMN_ADD = 'COLUMN_ADD';
-export const COLUMN_REMOVE = 'COLUMN_REMOVE';
-export const COLUMN_MOVE = 'COLUMN_MOVE';
+export const COLUMN_ADD = 'COLUMN_ADD';
+export const COLUMN_REMOVE = 'COLUMN_REMOVE';
+export const COLUMN_MOVE = 'COLUMN_MOVE';
+export const COLUMN_PARAMS_CHANGE = 'COLUMN_PARAMS_CHANGE';
export function addColumn(id, params) {
return dispatch => {
@@ -38,3 +39,15 @@ export function moveColumn(uuid, direction) {
dispatch(saveSettings());
};
};
+
+export function changeColumnParams(uuid, params) {
+ return dispatch => {
+ dispatch({
+ type: COLUMN_PARAMS_CHANGE,
+ uuid,
+ params,
+ });
+
+ dispatch(saveSettings());
+ };
+}
diff --git a/app/javascript/mastodon/features/community_timeline/components/section_headline.js b/app/javascript/mastodon/features/community_timeline/components/section_headline.js
new file mode 100644
index 00000000000..c7176d04b80
--- /dev/null
+++ b/app/javascript/mastodon/features/community_timeline/components/section_headline.js
@@ -0,0 +1,59 @@
+import PropTypes from 'prop-types';
+import React, { Component, Fragment } from 'react';
+import { FormattedMessage } from 'react-intl';
+import { NavLink } from 'react-router-dom';
+
+export default class SectionHeadline extends Component {
+
+ static propTypes = {
+ timelineId: PropTypes.string.isRequired,
+ to: PropTypes.string.isRequired,
+ pinned: PropTypes.bool.isRequired,
+ onlyMedia: PropTypes.bool.isRequired,
+ onClick: PropTypes.func,
+ };
+
+ shouldComponentUpdate (nextProps) {
+ return (
+ this.props.onlyMedia !== nextProps.onlyMedia ||
+ this.props.pinned !== nextProps.pinned ||
+ this.props.to !== nextProps.to ||
+ this.props.timelineId !== nextProps.timelineId
+ );
+ }
+
+ handleClick = e => {
+ const { onClick } = this.props;
+
+ if (typeof onClick === 'function') {
+ e.preventDefault();
+
+ onClick.call(this, e);
+ }
+ }
+
+ render () {
+ const { timelineId, to, pinned, onlyMedia } = this.props;
+
+ return (
+
+ {pinned ? (
+
+
+
+
+
+
+
+
+ ) : (
+
+
+
+
+ )}
+
-
-
-
- ) : (
-
-
-
-
- );
+ // pending
+ //
+ // const headline = (
+ //
+ // );
return (
@@ -111,7 +128,7 @@ export default class CommunityTimeline extends React.PureComponent {
{
- this._restoreCaret = null;
this.props.onSuggestionSelected(tokenStart, token, value);
}
@@ -104,31 +104,21 @@ export default class ComposeForm extends ImmutablePureComponent {
this.props.onChangeSpoilerText(e.target.value);
}
- componentWillReceiveProps (nextProps) {
- // If this is the update where we've finished uploading,
- // save the last caret position so we can restore it below!
- if (!nextProps.is_uploading && this.props.is_uploading) {
- this._restoreCaret = this.autosuggestTextarea.textarea.selectionStart;
- }
- }
-
componentDidUpdate (prevProps) {
// This statement does several things:
// - If we're beginning a reply, and,
// - Replying to zero or one users, places the cursor at the end of the textbox.
// - Replying to more than one user, selects any usernames past the first;
// this provides a convenient shortcut to drop everyone else from the conversation.
- // - If we've just finished uploading an image, and have a saved caret position,
- // restores the cursor to that position after the text changes!
- if (this.props.focusDate !== prevProps.focusDate || (prevProps.is_uploading && !this.props.is_uploading && typeof this._restoreCaret === 'number')) {
+ if (this.props.focusDate !== prevProps.focusDate) {
let selectionEnd, selectionStart;
if (this.props.preselectDate !== prevProps.preselectDate) {
selectionEnd = this.props.text.length;
selectionStart = this.props.text.search(/\s/) + 1;
- } else if (typeof this._restoreCaret === 'number') {
- selectionStart = this._restoreCaret;
- selectionEnd = this._restoreCaret;
+ } else if (typeof this.props.caretPosition === 'number') {
+ selectionStart = this.props.caretPosition;
+ selectionEnd = this.props.caretPosition;
} else {
selectionEnd = this.props.text.length;
selectionStart = selectionEnd;
@@ -148,10 +138,8 @@ export default class ComposeForm extends ImmutablePureComponent {
handleEmojiPick = (data) => {
const { text } = this.props;
const position = this.autosuggestTextarea.textarea.selectionStart;
- const emojiChar = data.native;
const needsSpace = data.custom && position > 0 && !allowedAroundShortCode.includes(text[position - 1]);
- this._restoreCaret = position + emojiChar.length + 1 + (needsSpace ? 1 : 0);
this.props.onPickEmoji(position, data, needsSpace);
}
diff --git a/app/javascript/mastodon/features/compose/containers/compose_form_container.js b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
index c3aa580ee30..3822dd711fe 100644
--- a/app/javascript/mastodon/features/compose/containers/compose_form_container.js
+++ b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
@@ -19,6 +19,7 @@ const mapStateToProps = state => ({
spoiler_text: state.getIn(['compose', 'spoiler_text']),
privacy: state.getIn(['compose', 'privacy']),
focusDate: state.getIn(['compose', 'focusDate']),
+ caretPosition: state.getIn(['compose', 'caretPosition']),
preselectDate: state.getIn(['compose', 'preselectDate']),
is_submitting: state.getIn(['compose', 'is_submitting']),
is_uploading: state.getIn(['compose', 'is_uploading']),
diff --git a/app/javascript/mastodon/features/public_timeline/index.js b/app/javascript/mastodon/features/public_timeline/index.js
index da59b7167c9..2fce4d58110 100644
--- a/app/javascript/mastodon/features/public_timeline/index.js
+++ b/app/javascript/mastodon/features/public_timeline/index.js
@@ -1,14 +1,14 @@
import React from 'react';
import { connect } from 'react-redux';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import { NavLink, Link } from 'react-router-dom';
import PropTypes from 'prop-types';
import StatusListContainer from '../ui/containers/status_list_container';
import Column from '../../components/column';
import ColumnHeader from '../../components/column_header';
import { expandPublicTimeline } from '../../actions/timelines';
-import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
+import { addColumn, removeColumn, moveColumn, changeColumnParams } from '../../actions/columns';
import ColumnSettingsContainer from './containers/column_settings_container';
+// import SectionHeadline from '../community_timeline/components/section_headline';
import { connectPublicStream } from '../../actions/streaming';
const messages = defineMessages({
@@ -62,6 +62,16 @@ export default class PublicTimeline extends React.PureComponent {
this.disconnect = dispatch(connectPublicStream({ onlyMedia }));
}
+ componentDidUpdate (prevProps) {
+ if (prevProps.onlyMedia !== this.props.onlyMedia) {
+ const { dispatch, onlyMedia } = this.props;
+
+ this.disconnect();
+ dispatch(expandPublicTimeline({ onlyMedia }));
+ this.disconnect = dispatch(connectPublicStream({ onlyMedia }));
+ }
+ }
+
componentWillUnmount () {
if (this.disconnect) {
this.disconnect();
@@ -79,21 +89,28 @@ export default class PublicTimeline extends React.PureComponent {
dispatch(expandPublicTimeline({ maxId, onlyMedia }));
}
+ handleHeadlineLinkClick = e => {
+ const { columnId, dispatch } = this.props;
+ const onlyMedia = /\/media$/.test(e.currentTarget.href);
+
+ dispatch(changeColumnParams(columnId, { other: { onlyMedia } }));
+ }
+
render () {
const { intl, columnId, hasUnread, multiColumn, onlyMedia } = this.props;
const pinned = !!columnId;
- const headline = pinned ? (
-
-
-
-
- ) : (
-
-
-
-
- );
+ // pending
+ //
+ // const headline = (
+ //
+ // );
return (
@@ -111,7 +128,7 @@ export default class PublicTimeline extends React.PureComponent {
list.push(media));
map.set('is_uploading', false);
map.set('resetFileKey', Math.floor((Math.random() * 0x10000)));
- map.set('focusDate', new Date());
map.set('idempotencyKey', uuid());
if (prevSize === 0 && (state.get('default_sensitive') || state.get('spoiler'))) {
@@ -119,6 +119,7 @@ const insertSuggestion = (state, position, token, completion) => {
map.set('suggestion_token', null);
map.update('suggestions', ImmutableList(), list => list.clear());
map.set('focusDate', new Date());
+ map.set('caretPosition', position + completion.length + 1);
map.set('idempotencyKey', uuid());
});
};
@@ -142,6 +143,7 @@ const insertEmoji = (state, position, emojiData, needsSpace) => {
return state.merge({
text: `${oldText.slice(0, position)}${emoji} ${oldText.slice(position)}`,
focusDate: new Date(),
+ caretPosition: position + emoji.length + 1,
idempotencyKey: uuid(),
});
};
@@ -216,6 +218,7 @@ export default function compose(state = initialState, action) {
map.set('text', statusToTextMentions(state, action.status));
map.set('privacy', privacyPreference(action.status.get('visibility'), state.get('default_privacy')));
map.set('focusDate', new Date());
+ map.set('caretPosition', null);
map.set('preselectDate', new Date());
map.set('idempotencyKey', uuid());
@@ -259,6 +262,7 @@ export default function compose(state = initialState, action) {
return state.withMutations(map => {
map.update('text', text => [text.trim(), `@${action.account.get('acct')} `].filter((str) => str.length !== 0).join(' '));
map.set('focusDate', new Date());
+ map.set('caretPosition', null);
map.set('idempotencyKey', uuid());
});
case COMPOSE_DIRECT:
@@ -266,6 +270,7 @@ export default function compose(state = initialState, action) {
map.update('text', text => [text.trim(), `@${action.account.get('acct')} `].filter((str) => str.length !== 0).join(' '));
map.set('privacy', 'direct');
map.set('focusDate', new Date());
+ map.set('caretPosition', null);
map.set('idempotencyKey', uuid());
});
case COMPOSE_SUGGESTIONS_CLEAR:
diff --git a/app/javascript/mastodon/reducers/settings.js b/app/javascript/mastodon/reducers/settings.js
index 9ec52a7fafe..de8865e4333 100644
--- a/app/javascript/mastodon/reducers/settings.js
+++ b/app/javascript/mastodon/reducers/settings.js
@@ -1,5 +1,5 @@
import { SETTING_CHANGE, SETTING_SAVE } from '../actions/settings';
-import { COLUMN_ADD, COLUMN_REMOVE, COLUMN_MOVE } from '../actions/columns';
+import { COLUMN_ADD, COLUMN_REMOVE, COLUMN_MOVE, COLUMN_PARAMS_CHANGE } from '../actions/columns';
import { STORE_HYDRATE } from '../actions/store';
import { EMOJI_USE } from '../actions/emojis';
import { LIST_DELETE_SUCCESS, LIST_FETCH_FAIL } from '../actions/lists';
@@ -89,6 +89,17 @@ const moveColumn = (state, uuid, direction) => {
.set('saved', false);
};
+const changeColumnParams = (state, uuid, params) => {
+ const columns = state.get('columns');
+ const index = columns.findIndex(item => item.get('uuid') === uuid);
+
+ const newColumns = columns.update(index, column => column.update('params', () => fromJS(params)));
+
+ return state
+ .set('columns', newColumns)
+ .set('saved', false);
+};
+
const updateFrequentEmojis = (state, emoji) => state.update('frequentlyUsedEmojis', ImmutableMap(), map => map.update(emoji.id, 0, count => count + 1)).set('saved', false);
const filterDeadListColumns = (state, listId) => state.update('columns', columns => columns.filterNot(column => column.get('id') === 'LIST' && column.get('params').get('id') === listId));
@@ -111,6 +122,8 @@ export default function settings(state = initialState, action) {
.set('saved', false);
case COLUMN_MOVE:
return moveColumn(state, action.uuid, action.direction);
+ case COLUMN_PARAMS_CHANGE:
+ return changeColumnParams(state, action.uuid, action.params);
case EMOJI_USE:
return updateFrequentEmojis(state, action.emoji);
case SETTING_SAVE:
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 2967c2d68ae..f067898bc15 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1984,6 +1984,7 @@ a.account__display-name {
padding: 15px;
margin: 0;
z-index: 3;
+ outline: 0;
&:hover {
text-decoration: underline;
diff --git a/app/serializers/web/notification_serializer.rb b/app/serializers/web/notification_serializer.rb
index f3c4ffc477c..43ba4d92a26 100644
--- a/app/serializers/web/notification_serializer.rb
+++ b/app/serializers/web/notification_serializer.rb
@@ -33,6 +33,7 @@ class Web::NotificationSerializer < ActiveModel::Serializer
end
def body
- truncate(strip_tags(object.target_status&.spoiler_text&.presence || object.target_status&.text || object.from_account.note), length: 140)
+ str = truncate(strip_tags(object.target_status&.spoiler_text&.presence || object.target_status&.text || object.from_account.note), length: 140)
+ HTMLEntities.new.decode(str.to_str) # Do not encode entities, since this value will not be used in HTML
end
end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a14b5b9d6b3..68d5f835841 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -283,7 +283,7 @@ en:
create_and_resolve: Resolve with note
create_and_unresolve: Reopen with note
delete: Delete
- placeholder: Describe what actions have been taken, or any other updates to this report…
+ placeholder: Describe what actions have been taken, or any other related updates...
reopen: Reopen report
report: 'Report #%{id}'
report_contents: Contents
@@ -559,7 +559,7 @@ en:
subject:
one: "1 new notification since your last visit \U0001F418"
other: "%{count} new notifications since your last visit \U0001F418"
- title: In your absence…
+ title: In your absence...
favourite:
body: 'Your status was favourited by %{name}:'
subject: "%{name} favourited your status"
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 0f4565bbcfb..89aefc1cd97 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -795,6 +795,7 @@ ru:
themes:
contrast: Высококонтрастная
default: Mastodon
+ mastodon-light: Mastodon (светлая)
time:
formats:
default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index b12538b3568..5b3b25ab13e 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -13,7 +13,7 @@ zh-CN:
note: 还能输入 %{count} 个字符
setting_hide_network: 你关注的人和关注你的人将不会在你的个人资料页上展示
setting_noindex: 此设置会影响到你的公开个人资料以及嘟文页面
- setting_theme: 此设置会影响到你从任意设备登录时 Mastodon 的显示样式
+ setting_theme: 此设置会影响到所有已登录设备上 Mastodon 的显示样式
imports:
data: 请上传从其他 Mastodon 实例导出的 CSV 文件
sessions:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index f7fc1a7a92d..357575a3b3a 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -26,9 +26,9 @@ zh-CN:
within_reach_title: 始终触手可及
generic_description: "%{domain} 是这个庞大网络中的一台服务器"
hosted_on: 一个在 %{domain} 上运行的 Mastodon 实例
- learn_more: 详细了解
+ learn_more: 了解详情
other_instances: 其他实例
- source_code: 源码
+ source_code: 源代码
status_count_after: 条嘟文
status_count_before: 他们共嘟出了
user_count_after: 位用户
@@ -281,7 +281,7 @@ zh-CN:
create_and_resolve: 添加记录并标记为“已处理”
create_and_unresolve: 添加记录并重开
delete: 删除
- placeholder: 描述已经执行的操作，或其他任何与此条举报相关的跟进情况
+ placeholder: 描述已经执行的操作，或其他任何相关的跟进情况
reopen: 重开举报
report: '举报 #%{id}'
report_contents: 内容
@@ -405,6 +405,9 @@ zh-CN:
migrate_account_html: 如果你希望引导他人关注另一个帐户，请点击这里进行设置。
or: 或者
or_log_in_with: 或通过其他方式登录
+ providers:
+ cas: CAS
+ saml: SAML
register: 注册
register_elsewhere: 前往其他实例注册
resend_confirmation: 重新发送确认邮件
@@ -460,7 +463,7 @@ zh-CN:
archive_takeout:
date: 日期
download: 下载你的存档
- hint_html: 你可以请求一份包含你的嘟文和已上传的媒体文件的存档。导出的数据为 ActivityPub 格式，因而可以通过相应的软件读取。每次可以请求存档的间隔至少为 7 天。
+ hint_html: 你可以请求一份帐户数据存档，其中包含你的嘟文和已上传的媒体文件。导出的数据为 ActivityPub 格式，因而可以被兼容的软件读取。每次允许请求存档的间隔至少为 7 天。
in_progress: 正在准备你的存档……
request: 请求你的存档
size: 大小
@@ -574,7 +577,9 @@ zh-CN:
trillion: T
unit: ''
pagination:
+ newer: 更新
next: 下一页
+ older: 更早
prev: 上一页
truncate: "…"
preferences:
@@ -599,12 +604,14 @@ zh-CN:
blackberry: Blackberry
chrome: Chrome
edge: Microsoft Edge
+ electron: Electron
firefox: Firefox
generic: 未知浏览器
ie: Internet Explorer
micro_messenger: 微信
nokia: Nokia S40 Ovi 浏览器
opera: Opera
+ otter: Otter
phantom_js: PhantomJS
qq: QQ浏览器
safari: Safari
@@ -632,7 +639,7 @@ zh-CN:
title: 会话
settings:
authorized_apps: 已授权的应用
- back: 回到 Mastodon
+ back: 返回 Mastodon
delete: 删除帐户
development: 开发
edit_profile: 更改个人资料
@@ -681,6 +688,7 @@ zh-CN:
themes:
contrast: 高对比度
default: Mastodon
+ mastodon-light: Mastodon（亮色主题）
time:
formats:
default: "%Y年%-m月%d日 %H:%M"
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 73f7105af1b..9a7d49674c8 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -21,7 +21,7 @@ module Mastodon
end
def flags
- 'rc5'
+ ''
end
def to_a
diff --git a/spec/controllers/admin/report_notes_controller_spec.rb b/spec/controllers/admin/report_notes_controller_spec.rb
new file mode 100644
index 00000000000..2c32303fb39
--- /dev/null
+++ b/spec/controllers/admin/report_notes_controller_spec.rb
@@ -0,0 +1,91 @@
+require 'rails_helper'
+
+describe Admin::ReportNotesController do
+ render_views
+
+ let(:user) { Fabricate(:user, admin: true) }
+
+ before do
+ sign_in user, scope: :user
+ end
+
+ describe 'POST #create' do
+ subject { post :create, params: params }
+
+ let(:report) { Fabricate(:report, action_taken: action_taken, action_taken_by_account_id: account_id) }
+
+ context 'when parameter is valid' do
+
+ context 'when report is unsolved' do
+ let(:action_taken) { false }
+ let(:account_id) { nil }
+
+ context 'when create_and_resolve flag is on' do
+ let(:params) { { report_note: { content: 'test content', report_id: report.id }, create_and_resolve: nil } }
+
+ it 'creates a report note and resolves report' do
+ expect{ subject }.to change{ ReportNote.count }.by(1)
+ expect(report.reload).to be_action_taken
+ expect(subject).to redirect_to admin_reports_path
+ end
+ end
+
+ context 'when create_and_resolve flag is false' do
+ let(:params) { { report_note: { content: 'test content', report_id: report.id } } }
+
+ it 'creates a report note and does not resolve report' do
+ expect{ subject }.to change{ ReportNote.count }.by(1)
+ expect(report.reload).not_to be_action_taken
+ expect(subject).to redirect_to admin_report_path(report)
+ end
+ end
+ end
+
+ context 'when report is resolved' do
+ let(:action_taken) { true }
+ let(:account_id) { user.account.id }
+
+ context 'when create_and_unresolve flag is on' do
+ let(:params) { { report_note: { content: 'test content', report_id: report.id }, create_and_unresolve: nil } }
+
+ it 'creates a report note and unresolves report' do
+ expect{ subject }.to change{ ReportNote.count }.by(1)
+ expect(report.reload).not_to be_action_taken
+ expect(subject).to redirect_to admin_report_path(report)
+ end
+ end
+
+ context 'when create_and_unresolve flag is false' do
+ let(:params) { { report_note: { content: 'test content', report_id: report.id } } }
+
+ it 'creates a report note and does not unresolve report' do
+ expect{ subject }.to change{ ReportNote.count }.by(1)
+ expect(report.reload).to be_action_taken
+ expect(subject).to redirect_to admin_report_path(report)
+ end
+ end
+ end
+ end
+
+ context 'when parameter is invalid' do
+ let(:params) { { report_note: { content: '', report_id: report.id } } }
+ let(:action_taken) { false }
+ let(:account_id) { nil }
+
+ it 'renders admin/reports/show' do
+ expect(subject).to render_template 'admin/reports/show'
+ end
+ end
+ end
+
+ describe 'DELETE #destroy' do
+ subject { delete :destroy, params: { id: report_note.id } }
+
+ let!(:report_note) { Fabricate(:report_note) }
+
+ it 'deletes note' do
+ expect{ subject }.to change{ ReportNote.count }.by(-1)
+ expect(subject).to redirect_to admin_report_path(report_note.report)
+ end
+ end
+end
diff --git a/spec/controllers/invites_controller_spec.rb b/spec/controllers/invites_controller_spec.rb
index c5c6cb651a8..9f5ab67c303 100644
--- a/spec/controllers/invites_controller_spec.rb
+++ b/spec/controllers/invites_controller_spec.rb
@@ -7,15 +7,21 @@ describe InvitesController do
sign_in user
end
+ around do |example|
+ min_invite_role = Setting.min_invite_role
+ example.run
+ Setting.min_invite_role = min_invite_role
+ end
+
describe 'GET #index' do
subject { get :index }
+ let(:user) { Fabricate(:user, moderator: false, admin: false) }
let!(:invite) { Fabricate(:invite, user: user) }
context 'when user is a staff' do
- let(:user) { Fabricate(:user, moderator: true, admin: false) }
-
it 'renders index page' do
+ Setting.min_invite_role = 'user'
expect(subject).to render_template :index
expect(assigns(:invites)).to include invite
expect(assigns(:invites).count).to eq 1
@@ -23,9 +29,8 @@ describe InvitesController do
end
context 'when user is not a staff' do
- let(:user) { Fabricate(:user, moderator: false, admin: false) }
-
it 'returns 403' do
+ Setting.min_invite_role = 'modelator'
expect(subject).to have_http_status 403
end
end
diff --git a/spec/fabricators/report_note_fabricator.rb b/spec/fabricators/report_note_fabricator.rb
new file mode 100644
index 00000000000..e139efffbc4
--- /dev/null
+++ b/spec/fabricators/report_note_fabricator.rb
@@ -0,0 +1,5 @@
+Fabricator(:report_note) do
+ report
+ account { Fabricate(:account) }
+ content "Test Content"
+end