Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.
		
			
				
	
	
		
			41 lines
		
	
	
	
		
			1 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			41 lines
		
	
	
	
		
			1 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| require 'rails_helper'
 | |
| 
 | |
| RSpec.describe Api::V1::MutesController, type: :controller do
 | |
|   render_views
 | |
| 
 | |
|   let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
 | |
|   let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:mutes') }
 | |
| 
 | |
|   before do
 | |
|     Fabricate(:mute, account: user.account, hide_notifications: false)
 | |
|     allow(controller).to receive(:doorkeeper_token) { token }
 | |
|   end
 | |
| 
 | |
|   describe 'GET #index' do
 | |
|     it 'returns http success' do
 | |
|       get :index, params: { limit: 1 }
 | |
| 
 | |
|       expect(response).to have_http_status(200)
 | |
|     end
 | |
|   end
 | |
| 
 | |
|   describe 'GET #details' do
 | |
|     before do
 | |
|       get :details, params: { limit: 1 }
 | |
|     end
 | |
| 
 | |
|     let(:mutes) { JSON.parse(response.body) }
 | |
| 
 | |
|     it 'returns http success' do
 | |
|       expect(response).to have_http_status(:success)
 | |
|     end
 | |
| 
 | |
|     it 'returns one mute' do
 | |
|       expect(mutes.size).to be(1)
 | |
|     end
 | |
| 
 | |
|     it 'returns whether the mute hides notifications' do
 | |
|       expect(mutes.first["hide_notifications"]).to be(false)
 | |
|     end 
 | |
|   end
 | |
| end
 |