Merge commit from fork
This commit is contained in:
parent
0b1b98c4f2
commit
0f79e29188
@ -26,7 +26,7 @@ class SeveredRelationshipsController < ApplicationController
|
|||||||
private
|
private
|
||||||
|
|
||||||
def set_event
|
def set_event
|
||||||
@event = AccountRelationshipSeveranceEvent.find(params[:id])
|
@event = AccountRelationshipSeveranceEvent.where(account: current_account).find(params[:id])
|
||||||
end
|
end
|
||||||
|
|
||||||
def following_data
|
def following_data
|
||||||
|
|||||||
@ -3,9 +3,10 @@
|
|||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe 'Severed Relationships' do
|
RSpec.describe 'Severed Relationships' do
|
||||||
let(:account_rs_event) { Fabricate :account_relationship_severance_event }
|
let(:account_rs_event) { Fabricate(:account_relationship_severance_event) }
|
||||||
|
let(:user) { account_rs_event.account.user }
|
||||||
|
|
||||||
before { sign_in Fabricate(:user) }
|
before { sign_in user }
|
||||||
|
|
||||||
describe 'GET /severed_relationships/:id/following' do
|
describe 'GET /severed_relationships/:id/following' do
|
||||||
it 'returns a CSV file with correct data' do
|
it 'returns a CSV file with correct data' do
|
||||||
@ -22,6 +23,17 @@ RSpec.describe 'Severed Relationships' do
|
|||||||
expect(response.body)
|
expect(response.body)
|
||||||
.to include('Account address')
|
.to include('Account address')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'when the user is not the subject of the event' do
|
||||||
|
let(:user) { Fabricate(:user) }
|
||||||
|
|
||||||
|
it 'returns a 404' do
|
||||||
|
get following_severed_relationship_path(account_rs_event, format: :csv)
|
||||||
|
|
||||||
|
expect(response)
|
||||||
|
.to have_http_status(404)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'GET /severed_relationships/:id/followers' do
|
describe 'GET /severed_relationships/:id/followers' do
|
||||||
@ -39,5 +51,16 @@ RSpec.describe 'Severed Relationships' do
|
|||||||
expect(response.body)
|
expect(response.body)
|
||||||
.to include('Account address')
|
.to include('Account address')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'when the user is not the subject of the event' do
|
||||||
|
let(:user) { Fabricate(:user) }
|
||||||
|
|
||||||
|
it 'returns a 404' do
|
||||||
|
get followers_severed_relationship_path(account_rs_event, format: :csv)
|
||||||
|
|
||||||
|
expect(response)
|
||||||
|
.to have_http_status(404)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user