Change /api/v1/statuses/:id/history to always return at least one item (#25510)
This commit is contained in:
		
							parent
							
								
									05f9e39b32
								
							
						
					
					
						commit
						a5b6f6da80
					
				
					 2 changed files with 6 additions and 1 deletions
				
			
		| 
						 | 
					@ -8,11 +8,15 @@ class Api::V1::Statuses::HistoriesController < Api::BaseController
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  def show
 | 
					  def show
 | 
				
			||||||
    cache_if_unauthenticated!
 | 
					    cache_if_unauthenticated!
 | 
				
			||||||
    render json: @status.edits.includes(:account, status: [:account]), each_serializer: REST::StatusEditSerializer
 | 
					    render json: status_edits, each_serializer: REST::StatusEditSerializer
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  private
 | 
					  private
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  def status_edits
 | 
				
			||||||
 | 
					    @status.edits.includes(:account, status: [:account]).to_a.presence || [@status.build_snapshot(at_time: @status.edited_at || @status.created_at)]
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  def set_status
 | 
					  def set_status
 | 
				
			||||||
    @status = Status.find(params[:status_id])
 | 
					    @status = Status.find(params[:status_id])
 | 
				
			||||||
    authorize @status, :show?
 | 
					    authorize @status, :show?
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -23,6 +23,7 @@ describe Api::V1::Statuses::HistoriesController do
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      it 'returns http success' do
 | 
					      it 'returns http success' do
 | 
				
			||||||
        expect(response).to have_http_status(200)
 | 
					        expect(response).to have_http_status(200)
 | 
				
			||||||
 | 
					        expect(body_as_json.size).to_not be 0
 | 
				
			||||||
      end
 | 
					      end
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue