summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-09-19 11:22:51 +0000
committerRémy Coutable <remy@rymai.me>2016-09-19 11:22:51 +0000
commitc20e4267e89c1fa84b3eeb9f63e17677388c25e3 (patch)
treebc1eac011692f0ade7fa9d802f63be9d29fa449a /spec/features
parent6a9d87b523b2db9561d70fce1c19584c90b289a8 (diff)
parent4939911e96297aa6ed9fb60f635d7d16a360876f (diff)
downloadgitlab-ce-c20e4267e89c1fa84b3eeb9f63e17677388c25e3.tar.gz
Merge branch 'review-apps' into 'master'
Add support for dynamic environments Implements proposal described in https://gitlab.com/gitlab-org/gitlab-ce/issues/21971. Specifically: - it adds a `.gitlab-ci.yml` configuration, - it allows environment name to have slashes, - it allows environment names to use CI predefined variables, - it allows to specify URL from `.gitlab-ci.yml`, - it allows the URL to use CI predefined variables, - it introduces `environment_type` to allow to easily group environments in the future See merge request !6323
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/environments_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/environments_spec.rb b/spec/features/environments_spec.rb
index fcd41b38413..4309a726917 100644
--- a/spec/features/environments_spec.rb
+++ b/spec/features/environments_spec.rb
@@ -150,7 +150,7 @@ feature 'Environments', feature: true do
context 'for invalid name' do
before do
- fill_in('Name', with: 'name with spaces')
+ fill_in('Name', with: 'name,with,commas')
click_on 'Save'
end