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
b8826ce7
Commit
b8826ce7
authored
Jan 05, 2018
by
Mayra Cabrera
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes cluster feature broken specs
parent
744e1db3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
app/views/projects/clusters/_integration_form.html.haml
app/views/projects/clusters/_integration_form.html.haml
+1
-1
spec/ee/spec/features/projects/clusters_spec.rb
spec/ee/spec/features/projects/clusters_spec.rb
+7
-3
No files found.
app/views/projects/clusters/_integration_form.html.haml
View file @
b8826ce7
=
form_for
@cluster
,
url:
namespace_project_cluster_path
(
@project
.
namespace
,
@project
,
@cluster
),
as: :cluster
do
|
field
|
=
form_for
@cluster
,
url:
namespace_project_cluster_path
(
@project
.
namespace
,
@project
,
@cluster
),
as: :cluster
,
html:
{
class:
'cluster_integration_form'
}
do
|
field
|
=
form_errors
(
@cluster
)
.form-group.append-bottom-20
%h5
=
s_
(
'ClusterIntegration|Integration status'
)
...
...
spec/ee/spec/features/projects/clusters_spec.rb
View file @
b8826ce7
...
...
@@ -46,7 +46,9 @@ feature 'EE Clusters' do
before
do
click_link
'default-cluster'
fill_in
'cluster_environment_scope'
,
with:
'production/*'
click_button
'Save changes'
within
'.cluster_integration_form'
do
click_button
'Save changes'
end
end
it
'user sees a cluster details page'
do
...
...
@@ -104,7 +106,7 @@ feature 'EE Clusters' do
end
it
'user sees a cluster details page'
do
expect
(
page
).
to
have_content
(
'
Enable cluster integration
'
)
expect
(
page
).
to
have_content
(
'
Cluster integration is enabled for this project
'
)
expect
(
page
.
find_field
(
'cluster[environment_scope]'
).
value
).
to
eq
(
'staging/*'
)
end
end
...
...
@@ -113,7 +115,9 @@ feature 'EE Clusters' do
before
do
click_link
'default-cluster'
fill_in
'cluster_environment_scope'
,
with:
'production/*'
click_button
'Save changes'
within
".cluster_integration_form"
do
click_button
'Save changes'
end
end
it
'user sees a cluster details page'
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