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
246e0658
Commit
246e0658
authored
Mar 17, 2021
by
Thong Kuah
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename class that is too similar to js-cluster-integrations-form
parent
04bdae20
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
11 deletions
+11
-11
app/assets/javascripts/clusters/forms/show/index.js
app/assets/javascripts/clusters/forms/show/index.js
+1
-1
app/views/clusters/clusters/_gitlab_integration_form.html.haml
...iews/clusters/clusters/_gitlab_integration_form.html.haml
+2
-2
spec/features/clusters/cluster_detail_page_spec.rb
spec/features/clusters/cluster_detail_page_spec.rb
+3
-3
spec/features/groups/clusters/user_spec.rb
spec/features/groups/clusters/user_spec.rb
+1
-1
spec/features/projects/clusters/gcp_spec.rb
spec/features/projects/clusters/gcp_spec.rb
+1
-1
spec/features/projects/clusters/user_spec.rb
spec/features/projects/clusters/user_spec.rb
+1
-1
spec/features/projects/clusters_spec.rb
spec/features/projects/clusters_spec.rb
+2
-2
No files found.
app/assets/javascripts/clusters/forms/show/index.js
View file @
246e0658
...
...
@@ -3,7 +3,7 @@ import IntegrationForm from '../components/integration_form.vue';
import
{
createStore
}
from
'
../stores
'
;
export
default
()
=>
{
const
entryPoint
=
document
.
querySelector
(
'
#js-cluster-
integration
-form
'
);
const
entryPoint
=
document
.
querySelector
(
'
#js-cluster-
details
-form
'
);
if
(
!
entryPoint
)
{
return
;
...
...
app/views/clusters/clusters/_gitlab_integration_form.html.haml
View file @
246e0658
=
form_for
@cluster
,
url:
clusterable
.
cluster_path
(
@cluster
),
as: :cluster
,
html:
{
class:
'js-cluster-
integration
-form'
}
do
|
field
|
=
form_for
@cluster
,
url:
clusterable
.
cluster_path
(
@cluster
),
as: :cluster
,
html:
{
class:
'js-cluster-
details
-form'
}
do
|
field
|
=
form_errors
(
@cluster
)
#js-cluster-
integration
-form
{
data:
js_cluster_form_data
(
@cluster
,
can?
(
current_user
,
:update_cluster
,
@cluster
))
}
#js-cluster-
details
-form
{
data:
js_cluster_form_data
(
@cluster
,
can?
(
current_user
,
:update_cluster
,
@cluster
))
}
spec/features/clusters/cluster_detail_page_spec.rb
View file @
246e0658
...
...
@@ -23,7 +23,7 @@ RSpec.describe 'Clusterable > Show page' do
it
'allow the user to set domain'
,
:js
do
visit
cluster_path
within
'.js-cluster-
integration
-form'
do
within
'.js-cluster-
details
-form'
do
fill_in
(
'cluster_base_domain'
,
with:
'test.com'
)
click_on
'Save changes'
end
...
...
@@ -39,7 +39,7 @@ RSpec.describe 'Clusterable > Show page' do
end
it
'shows help text with the domain as an alternative to custom domain'
,
:js
do
within
'.js-cluster-
integration
-form'
do
within
'.js-cluster-
details
-form'
do
expect
(
find
(
cluster_ingress_help_text_selector
).
text
).
to
include
(
'192.168.1.100'
)
end
end
...
...
@@ -49,7 +49,7 @@ RSpec.describe 'Clusterable > Show page' do
it
'alternative to custom domain is not shown'
do
visit
cluster_path
within
'.js-cluster-
integration
-form'
do
within
'.js-cluster-
details
-form'
do
expect
(
page
).
not_to
have_selector
(
cluster_ingress_help_text_selector
)
end
end
...
...
spec/features/groups/clusters/user_spec.rb
View file @
246e0658
...
...
@@ -97,7 +97,7 @@ RSpec.describe 'User Cluster', :js do
context
'when user disables the cluster'
do
before
do
page
.
find
(
:css
,
'.js-cluster-enable-toggle-area .js-project-feature-toggle'
).
click
page
.
within
(
'.js-cluster-
integration
-form'
)
{
click_button
'Save changes'
}
page
.
within
(
'.js-cluster-
details
-form'
)
{
click_button
'Save changes'
}
end
it
'user sees the successful message'
do
...
...
spec/features/projects/clusters/gcp_spec.rb
View file @
246e0658
...
...
@@ -119,7 +119,7 @@ RSpec.describe 'Gcp Cluster', :js do
context
'when user disables the cluster'
do
before
do
page
.
find
(
:css
,
'.js-cluster-enable-toggle-area .js-project-feature-toggle'
).
click
page
.
within
(
'.js-cluster-
integration
-form'
)
{
click_button
'Save changes'
}
page
.
within
(
'.js-cluster-
details
-form'
)
{
click_button
'Save changes'
}
end
it
'user sees the successful message'
do
...
...
spec/features/projects/clusters/user_spec.rb
View file @
246e0658
...
...
@@ -84,7 +84,7 @@ RSpec.describe 'User Cluster', :js do
context
'when user disables the cluster'
do
before
do
page
.
find
(
:css
,
'.js-cluster-enable-toggle-area .js-project-feature-toggle'
).
click
page
.
within
(
'.js-cluster-
integration
-form'
)
{
click_button
'Save changes'
}
page
.
within
(
'.js-cluster-
details
-form'
)
{
click_button
'Save changes'
}
end
it
'user sees the successful message'
do
...
...
spec/features/projects/clusters_spec.rb
View file @
246e0658
...
...
@@ -58,7 +58,7 @@ RSpec.describe 'Clusters', :js do
before
do
click_link
'default-cluster'
fill_in
'cluster_environment_scope'
,
with:
'production/*'
within
'.js-cluster-
integration
-form'
do
within
'.js-cluster-
details
-form'
do
click_button
'Save changes'
end
end
...
...
@@ -149,7 +149,7 @@ RSpec.describe 'Clusters', :js do
before
do
click_link
'default-cluster'
fill_in
'cluster_environment_scope'
,
with:
'production/*'
within
".js-cluster-
integration
-form"
do
within
".js-cluster-
details
-form"
do
click_button
'Save changes'
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