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:
authortiagonbotelho <tiagonbotelho@hotmail.com>2016-11-23 16:37:42 +0300
committertiagonbotelho <tiagonbotelho@hotmail.com>2016-11-24 15:00:29 +0300
commit2f5637d6e39efa4b1a1cd2acdffa478e903ecd98 (patch)
tree4b6e1d7f3a1aa6dbc8c8d5ee713860f345744227 /spec/views
parent02c6cbf53f4799bc888db7767c2d9a5e04a30002 (diff)
renames some of the specs and adds changelog entry
Diffstat (limited to 'spec/views')
-rw-r--r--spec/views/projects/builds/show.html.haml_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/views/projects/builds/show.html.haml_spec.rb b/spec/views/projects/builds/show.html.haml_spec.rb
index 869dcb417e6..745d0c745bd 100644
--- a/spec/views/projects/builds/show.html.haml_spec.rb
+++ b/spec/views/projects/builds/show.html.haml_spec.rb
@@ -88,7 +88,7 @@ describe 'projects/builds/show', :view do
create(:ci_build, :running, environment: 'staging', pipeline: pipeline)
end
- context 'and environment does exist' do
+ context 'when environment exists' do
let!(:environment) do
create(:environment, name: 'staging', project: project)
end
@@ -101,7 +101,7 @@ describe 'projects/builds/show', :view do
'.environment-information', text: expected_text)
end
- context 'and has deployment' do
+ context 'when it has deployment' do
let!(:deployment) do
create(:deployment, environment: environment)
end
@@ -118,7 +118,7 @@ describe 'projects/builds/show', :view do
end
end
- context 'and environment does not exist' do
+ context 'when environment does not exist' do
it 'shows deployment message' do
expected_text = 'This build is creating a deployment to staging'
render