CI build status not per environment
This commit is contained in:
		
							parent
							
								
									b497b0ce3f
								
							
						
					
					
						commit
						03ea019465
					
				|  | @ -1,6 +1,5 @@ | |||
| - if @pipeline | ||||
|   .mr-widget-heading | ||||
|     - @merge_request.environments.each do |environments| | ||||
|     - %w[success success_with_warnings skipped canceled failed running pending].each do |status| | ||||
|       .ci_widget{ class: "ci-#{status}", style: ("display:none" unless @pipeline.status == status) } | ||||
|         = ci_icon_for_status(status) | ||||
|  | @ -48,9 +47,8 @@ | |||
|   .mr-widget-heading | ||||
|     .ci_widget{ class: "ci-success" } | ||||
|       = ci_icon_for_status("success") | ||||
|       %span | ||||
|         Released to #{environment.name} | ||||
|         = succeed '.' do | ||||
|           = time_ago_with_tooltip(environment.created_at, placement: 'bottom') | ||||
|         - if environment.external_url | ||||
|           = link_to icon('external-link'), environment.external_url | ||||
|       %span.hidden-sm | ||||
|         Released to #{environment.name}. | ||||
|         - external_url = environment.external_url | ||||
|         - if external_url | ||||
|           = link_to icon('external-link', text: "View on #{external_url.gsub(/\A.*?:\/\//, '')}"), external_url | ||||
|  |  | |||
|  | @ -20,7 +20,8 @@ describe Deployment, models: true do | |||
|     let(:project)     { create(:project) } | ||||
|     let(:environment) { create(:environment, project: project) } | ||||
|     let(:deployment) do | ||||
|       create(:deployment, environment: environment, sha: '5f923865dde3436854e9ceb9cdb7815618d4e849') | ||||
|       create(:deployment, environment: environment, | ||||
|                           sha: '5f923865dde3436854e9ceb9cdb7815618d4e849') | ||||
|     end | ||||
| 
 | ||||
|     context 'when there is no project commit' do | ||||
|  |  | |||
|  | @ -677,7 +677,10 @@ describe MergeRequest, models: true do | |||
|   describe "#environments" do | ||||
|     let(:project)       { create(:project) } | ||||
| 
 | ||||
|     let!(:deployment)   { create(:deployment, environment: environment, sha: '5f923865dde3436854e9ceb9cdb7815618d4e849') } | ||||
|     let!(:deployment) do | ||||
|       create(:deployment, environment: environment, | ||||
|                           sha: '5f923865dde3436854e9ceb9cdb7815618d4e849') | ||||
|     end | ||||
| 
 | ||||
|     let!(:environment)  { create(:environment, project: project) } | ||||
|     let!(:environment1) { create(:environment, project: project) } | ||||
|  |  | |||
|  | @ -19,7 +19,7 @@ describe 'projects/merge_requests/widget/_heading' do | |||
|     end | ||||
| 
 | ||||
|     it 'displays that the environment is deployed' do | ||||
|       expect(rendered).to match('Released to') | ||||
|       expect(rendered).to match("Released to #{environment.name}") | ||||
|     end | ||||
|   end | ||||
| end | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue