Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
42a9c143
Commit
42a9c143
authored
Feb 20, 2020
by
Etienne Baqué
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added feature spec for forward_deployment_enabled
parent
a77076e0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
1 deletion
+29
-1
app/models/project_ci_cd_setting.rb
app/models/project_ci_cd_setting.rb
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+6
-0
spec/features/projects/settings/pipelines_settings_spec.rb
spec/features/projects/settings/pipelines_settings_spec.rb
+22
-0
No files found.
app/models/project_ci_cd_setting.rb
View file @
42a9c143
...
...
@@ -31,7 +31,7 @@ class ProjectCiCdSetting < ApplicationRecord
end
def
forward_deployment_enabled?
super
&&
::
Feature
.
enabled?
(
:forward_deployment_enabled
,
project
)
super
&&
::
Feature
.
enabled?
(
:forward_deployment_enabled
,
project
,
default_enabled:
true
)
end
private
...
...
locale/gitlab.pot
View file @
42a9c143
...
...
@@ -7013,6 +7013,9 @@ msgstr ""
msgid "Downvotes"
msgstr ""
msgid "Drop older active deployments"
msgstr ""
msgid "Due date"
msgstr ""
...
...
@@ -22043,6 +22046,9 @@ msgstr ""
msgid "What are you searching for?"
msgstr ""
msgid "When a deployment is successful, allow older but still pending deployment(s) to be skipped"
msgstr ""
msgid "When a runner is locked, it cannot be assigned to other projects"
msgstr ""
...
...
spec/features/projects/settings/pipelines_settings_spec.rb
View file @
42a9c143
...
...
@@ -61,6 +61,28 @@ describe "Projects > Settings > Pipelines settings" do
expect
(
checkbox
).
to
be_checked
end
it
'updates forward_deployment_enabled'
do
visit
project_settings_ci_cd_path
(
project
)
checkbox
=
find_field
(
'project_forward_deployment_enabled'
)
expect
(
checkbox
).
to
be_checked
checkbox
.
set
(
false
)
page
.
within
'#js-general-pipeline-settings'
do
click_on
'Save changes'
end
expect
(
page
.
status_code
).
to
eq
(
200
)
page
.
within
'#js-general-pipeline-settings'
do
expect
(
page
).
to
have_button
(
'Save changes'
,
disabled:
false
)
end
checkbox
=
find_field
(
'project_forward_deployment_enabled'
)
expect
(
checkbox
).
not_to
be_checked
end
describe
'Auto DevOps'
do
context
'when auto devops is turned on instance-wide'
do
before
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment