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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
c604c437
Commit
c604c437
authored
Jun 06, 2018
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix broken specs
parent
c99332a8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
app/views/projects/settings/ci_cd/_autodevops_form.html.haml
app/views/projects/settings/ci_cd/_autodevops_form.html.haml
+2
-2
spec/views/projects/settings/ci_cd/_autodevops_form.html.haml_spec.rb
...rojects/settings/ci_cd/_autodevops_form.html.haml_spec.rb
+4
-4
No files found.
app/views/projects/settings/ci_cd/_autodevops_form.html.haml
View file @
c604c437
...
...
@@ -7,7 +7,7 @@
-
message
=
auto_devops_warning_message
(
@project
)
-
ci_file_formatted
=
'<code>.gitlab-ci.yml</code>'
.
html_safe
-
if
message
%p
.settings-message.text-center
%p
.
auto-devops-warning-message.
settings-message.text-center
=
message
.
html_safe
=
f
.
fields_for
:auto_devops_attributes
,
@auto_devops
do
|
form
|
.card
...
...
@@ -28,7 +28,7 @@
.form-text.text-muted
=
s_
(
'CICD|Follow the instance default to either have Auto DevOps enabled or disabled when there is no project specific %{ci_file}.'
).
html_safe
%
{
ci_file:
ci_file_formatted
}
.card.js-extra-settings
{
class:
form
.
object
.
enabled
==
false
?
'hidden'
:
nil
}
.card.js-extra-settings
{
class:
form
.
object
&
.
enabled
==
false
?
'hidden'
:
nil
}
.card-body.bg-light
=
form
.
label
:domain
do
%strong
=
_
(
'Domain'
)
...
...
spec/views/projects/settings/ci_cd/_autodevops_form.html.haml_spec.rb
View file @
c604c437
...
...
@@ -12,7 +12,7 @@ describe 'projects/settings/ci_cd/_autodevops_form' do
it
'shows warning message'
do
render
expect
(
rendered
).
to
have_css
(
'.
settings
-message'
)
expect
(
rendered
).
to
have_css
(
'.
auto-devops-warning
-message'
)
expect
(
rendered
).
to
have_text
(
'Auto Review Apps and Auto Deploy need a domain name and a'
)
expect
(
rendered
).
to
have_link
(
'Kubernetes cluster'
)
end
...
...
@@ -26,7 +26,7 @@ describe 'projects/settings/ci_cd/_autodevops_form' do
it
'shows warning message'
do
render
expect
(
rendered
).
to
have_css
(
'.
settings
-message'
)
expect
(
rendered
).
to
have_css
(
'.
auto-devops-warning
-message'
)
expect
(
rendered
).
to
have_text
(
'Auto Review Apps and Auto Deploy need a'
)
expect
(
rendered
).
to
have_link
(
'Kubernetes cluster'
)
end
...
...
@@ -42,7 +42,7 @@ describe 'projects/settings/ci_cd/_autodevops_form' do
it
'shows warning message'
do
render
expect
(
rendered
).
to
have_css
(
'.
settings
-message'
)
expect
(
rendered
).
to
have_css
(
'.
auto-devops-warning
-message'
)
expect
(
rendered
).
to
have_text
(
'Auto Review Apps and Auto Deploy need a domain name to work correctly.'
)
end
end
...
...
@@ -55,7 +55,7 @@ describe 'projects/settings/ci_cd/_autodevops_form' do
it
'does not show warning message'
do
render
expect
(
rendered
).
not_to
have_css
(
'.
settings
-message'
)
expect
(
rendered
).
not_to
have_css
(
'.
auto-devops-warning
-message'
)
end
end
end
...
...
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