summaryrefslogtreecommitdiff
path: root/spec/features/merge_requests
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2016-10-11 11:03:11 +0100
committerFilipa Lacerda <filipa@gitlab.com>2016-10-11 12:53:09 +0100
commit7d12683de51721e75b314b29272f4f024f7f0655 (patch)
tree2cdd1cc6c3c15d34b8064afd6bfd85d613a2910f /spec/features/merge_requests
parent594c320851afbf4c8dd1c78600a0195f12d6ce41 (diff)
downloadgitlab-ce-7d12683de51721e75b314b29272f4f024f7f0655.tar.gz
Fixes broken tests
Diffstat (limited to 'spec/features/merge_requests')
-rw-r--r--spec/features/merge_requests/merge_when_build_succeeds_spec.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/spec/features/merge_requests/merge_when_build_succeeds_spec.rb b/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
index 60bc07bd1a0..2c1a45af596 100644
--- a/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
+++ b/spec/features/merge_requests/merge_when_build_succeeds_spec.rb
@@ -79,6 +79,15 @@ feature 'Merge When Build Succeeds', feature: true, js: true do
end
end
+ context 'Has Environment' do
+ let(:environment) { create(:environment, project: project) }
+
+ it 'does show link to close the environment' do
+ # TODO add test to verify if the button is visible when this condition
+ # is met: if environment.closeable?
+ end
+ end
+
def visit_merge_request(merge_request)
visit namespace_project_merge_request_path(merge_request.project.namespace, merge_request.project, merge_request)
end