Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZ.J. van de Weg <zegerjan@gitlab.com>2016-08-09 16:11:14 +0300
committerZ.J. van de Weg <zegerjan@gitlab.com>2016-08-12 11:43:04 +0300
commit07fc2f852a0b4136b6d97c1d9773819c47e7e8e7 (patch)
treeb80f5200b1d7398eadc9b7ae029873f3cc6ad93a /spec/views
parent03ea01946524a74773b24430c81804c2724b84b6 (diff)
Method names changed to #includes_commit?
Diffstat (limited to 'spec/views')
-rw-r--r--spec/views/projects/merge_requests/_heading.html.haml_spec.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/spec/views/projects/merge_requests/_heading.html.haml_spec.rb b/spec/views/projects/merge_requests/_heading.html.haml_spec.rb
index 0302f14e660..733b2dfa7ff 100644
--- a/spec/views/projects/merge_requests/_heading.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/_heading.html.haml_spec.rb
@@ -8,18 +8,19 @@ describe 'projects/merge_requests/widget/_heading' do
let(:merge_request) { create(:merge_request, :merged) }
let(:environment) { create(:environment, project: project) }
let!(:deployment) do
- create(:deployment, environment: environment,
- sha: 'a5391128b0ef5d21df5dd23d98557f4ef12fae20')
+ create(:deployment, environment: environment, sha: project.commit('master').id)
end
before do
assign(:merge_request, merge_request)
+ assign(:project, project)
render
end
it 'displays that the environment is deployed' do
- expect(rendered).to match("Released to #{environment.name}")
+ expect(rendered).to match("Deployed to")
+ expect(rendered).to match("#{environment.name}")
end
end
end